dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync compare macros, some event_scripts.s doc, begin map_scripts constants

Browse Source
This commit is contained in:
GriffinR
2020-01-08 18:09:24 -05:00
parent 26f7ba4823
commit 31d31d3260
194 changed files with 1933 additions and 1942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_control_avatar.s
+2 -2
View File
@@ -1641,11 +1641,11 @@ _0806D570:
lsrs r0, 24
cmp r0, 0x1
bne _0806D5A4
ldr r0, _0806D5A0 @ =EventScript_1A6AC8
ldr r0, _0806D5A0 @ =EventScript_UseSurf
b _0806D5E2
.align 2, 0
_0806D59C: .4byte 0x00000824
_0806D5A0: .4byte EventScript_1A6AC8
_0806D5A0: .4byte EventScript_UseSurf
_0806D5A4:
adds r0, r4, 0
bl MetatileBehavior_IsWaterfall
asm/macros/event.inc
+7 -9
View File
@@ -234,14 +234,12 @@
.endm
@ Generic compare macro which attempts to deduce argument types based on their values
@ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers
.macro compare arg1, arg2
.if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8)
compare_var_to_var \arg1, \arg2
.elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF)
compare_var_to_value \arg1, \arg2
@ Any values between 0x4000 to 0x40FF and 0x8000 to 0x8014 are considered event variable identifiers
.macro compare var:req, arg:req
.if ((\arg >= VARS_START && \arg <= VARS_END) || (\arg >= SPECIAL_VARS_START && \arg <= SPECIAL_VARS_END))
compare_var_to_var \var, \arg
.else
.error "Invalid arguments for 'compare'"
compare_var_to_value \var, \arg
.endif
.endm
@@ -1424,7 +1422,7 @@
.endm
.macro case condition, dest
compare_var_to_value 0x8000, \condition
compare_var_to_value VAR_0x8000, \condition
goto_if_eq \dest
.endm
@@ -1461,5 +1459,5 @@
.macro set_gym_trainers gym:req
setvar VAR_0x8008, \gym
call EventScript_1A6B18
call EventScript_SetGymTrainers
.endm
data/event_scripts.s
+736 -736
View File
File diff suppressed because it is too large Load Diff
data/maps/BirthIsland_Exterior/scripts.inc
+5 -5
View File
@@ -38,7 +38,7 @@ BirthIsland_Exterior_MapScript2_165253:: @ 8165253
EventScript_16525D:: @ 816525D
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 2
return
@@ -47,7 +47,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271
lock
faceplayer
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
special Special_DeoxysSound
@@ -96,11 +96,11 @@ EventScript_1652C0:: @ 81652C0
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16533A
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_165348
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_165348
setflag FLAG_FOUGHT_DEOXYS
release
data/maps/CeladonCity_Condominiums_1F/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
msgbox gUnknown_81960C9
setflag FLAG_GOT_TEA
giveitem ITEM_TEA
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
msgbox gUnknown_8196109
release
data/maps/CeladonCity_Condominiums_3F/scripts.inc
+2 -2
View File
@@ -17,7 +17,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
lock
faceplayer
specialvar VAR_RESULT, HasAllKantoMons
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16C412
msgbox gUnknown_8196356
release
@@ -32,7 +32,7 @@ EventScript_16C418:: @ 816C418
waitmessage
delay 60
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special Special_ShowDiploma
waitstate
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+5 -5
View File
@@ -10,11 +10,11 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
faceplayer
setvar VAR_0x4001, SPECIES_EEVEE
givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C4A6
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16C4DA
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
release
end
@@ -27,7 +27,7 @@ EventScript_16C4A6:: @ 816C4A6
waitfanfare
getspeciesname 0, SPECIES_EEVEE
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C514
call EventScript_1A8C27
call EventScript_1A74EB
@@ -42,7 +42,7 @@ EventScript_16C4DA:: @ 816C4DA
waitfanfare
getspeciesname 0, SPECIES_EEVEE
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C509
call EventScript_1A8C33
goto EventScript_16C509
data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+2 -2
View File
@@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
@@ -43,7 +43,7 @@ Items_16BB38:: @ 816BB38
CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+2 -2
View File
@@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
@@ -41,7 +41,7 @@ Items_16BC84:: @ 816BC84
CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+5 -5
View File
@@ -61,7 +61,7 @@ EventScript_16C1F3:: @ 816C1F3
EventScript_16C246:: @ 816C246
setvar VAR_0x8006, 4
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
compare_var_to_value VAR_ELEVATOR_FLOOR, 4
compare VAR_ELEVATOR_FLOOR, 4
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 4
@@ -71,7 +71,7 @@ EventScript_16C246:: @ 816C246
EventScript_16C26E:: @ 816C26E
setvar VAR_0x8006, 5
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
compare_var_to_value VAR_ELEVATOR_FLOOR, 5
compare VAR_ELEVATOR_FLOOR, 5
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 5
@@ -81,7 +81,7 @@ EventScript_16C26E:: @ 816C26E
EventScript_16C296:: @ 816C296
setvar VAR_0x8006, 6
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
compare_var_to_value VAR_ELEVATOR_FLOOR, 6
compare VAR_ELEVATOR_FLOOR, 6
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 6
@@ -91,7 +91,7 @@ EventScript_16C296:: @ 816C296
EventScript_16C2BE:: @ 816C2BE
setvar VAR_0x8006, 7
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
compare_var_to_value VAR_ELEVATOR_FLOOR, 7
compare VAR_ELEVATOR_FLOOR, 7
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 7
@@ -101,7 +101,7 @@ EventScript_16C2BE:: @ 816C2BE
EventScript_16C2E6:: @ 816C2E6
setvar VAR_0x8006, 8
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
compare_var_to_value VAR_ELEVATOR_FLOOR, 8
compare VAR_ELEVATOR_FLOOR, 8
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 8
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+15 -15
View File
@@ -3,13 +3,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
faceplayer
call EventScript_16BCF6
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
goto_if eq, EventScript_16C00E
goto EventScript_16BD3E
end
@@ -17,13 +17,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
EventScript_16BCF6:: @ 816BCF6
setvar VAR_0x4001, 0
checkitem ITEM_FRESH_WATER, 1
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD2C
checkitem ITEM_SODA_POP, 1
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD32
checkitem ITEM_LEMONADE, 1
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD38
return
@@ -41,7 +41,7 @@ EventScript_16BD38:: @ 816BD38
EventScript_16BD3E:: @ 816BD3E
msgbox gUnknown_8195D22, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C00C
textcolor 3
message Text_195D5F
@@ -150,7 +150,7 @@ EventScript_16BF7C:: @ 816BF7C
getitemname 1, VAR_0x8009
removeitem VAR_0x8008, 1
checkitemspace VAR_0x8009, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C002
additem VAR_0x8009, 1
textcolor 3
@@ -160,11 +160,11 @@ EventScript_16BF7C:: @ 816BF7C
waitfanfare
giveitem VAR_0x8009, 1, 8
call EventScript_1A6675
compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER
compare VAR_0x8008, ITEM_FRESH_WATER
call_if eq, EventScript_16BFDE
compare_var_to_value VAR_0x8008, ITEM_SODA_POP
compare VAR_0x8008, ITEM_SODA_POP
call_if eq, EventScript_16BFEA
compare_var_to_value VAR_0x8008, ITEM_LEMONADE
compare VAR_0x8008, ITEM_LEMONADE
call_if eq, EventScript_16BFF6
release
end
@@ -261,16 +261,16 @@ EventScript_16C0C4:: @ 816C0C4
return
EventScript_16C0CB:: @ 816C0CB
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C131
checkitemspace VAR_0x4000, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C13F
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16C0B6
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16C0BD
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_16C0C4
updatemoneybox 0, 0, 0
getitemname 0, VAR_0x4000
data/maps/CeladonCity_GameCorner/scripts.inc
+13 -13
View File
@@ -21,7 +21,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
@@ -41,18 +41,18 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
EventScript_16C6E6:: @ 816C6E6
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16C790
compare_var_to_value VAR_0x8009, 0
compare VAR_0x8009, 0
goto_if eq, EventScript_16C734
compare_var_to_value VAR_0x8009, 1
compare VAR_0x8009, 1
goto_if eq, EventScript_16C706
end
EventScript_16C706:: @ 816C706
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9500
compare VAR_0x4001, 9500
goto_if ge, EventScript_16C79E
checkmoney 10000, 0
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C7AC
givecoins 500
takemoney 10000, 0
@@ -61,10 +61,10 @@ EventScript_16C706:: @ 816C706
EventScript_16C734:: @ 816C734
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9950
compare VAR_0x4001, 9950
goto_if ge, EventScript_16C79E
checkmoney 1000, 0
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C7AC
givecoins 50
takemoney 1000, 0
@@ -135,7 +135,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9990
compare VAR_0x4001, 9990
goto_if ge, EventScript_16C82B
givecoins 10
textcolor 3
@@ -199,7 +199,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9980
compare VAR_0x4001, 9980
goto_if ge, EventScript_16C8E2
givecoins 20
textcolor 3
@@ -229,7 +229,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9980
compare VAR_0x4001, 9980
goto_if ge, EventScript_16C942
givecoins 20
textcolor 3
@@ -264,7 +264,7 @@ EventScript_16C96C:: @ 816C96C
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16CAA0
msgbox gUnknown_8196F46, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C96A
setfieldeffectarg 0, 255
setfieldeffectarg 1, 10
@@ -434,9 +434,9 @@ CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
EventScript_16CB10:: @ 816CB10
msgbox gUnknown_8196E9B
closemessage
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_16CB34
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if ne, EventScript_16CB3F
removeobject 11
release
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+14 -14
View File
@@ -15,7 +15,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
@@ -109,10 +109,10 @@ EventScript_16CC55:: @ 816CC55
EventScript_16CC65:: @ 816CC65
getspeciesname 0, VAR_0x4001
msgbox gUnknown_819709D, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16CC10
checkcoins VAR_RESULT
compare_var_to_var VAR_RESULT, VAR_0x4002
compare VAR_RESULT, VAR_0x4002
goto_if lt, EventScript_16CDA5
textcolor 3
switch VAR_0x4001
@@ -179,11 +179,11 @@ EventScript_16CD3D:: @ 816CD3D
end
EventScript_16CD52:: @ 816CD52
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16CDB3
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16CDE0
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_16CD74
end
@@ -222,7 +222,7 @@ EventScript_16CDB3:: @ 816CDB3
waitmessage
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16CD83
goto EventScript_16CC10
end
@@ -236,7 +236,7 @@ EventScript_16CDE0:: @ 816CDE0
waitmessage
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16CE12
call EventScript_1A8C33
goto EventScript_16CE12
@@ -253,7 +253,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
@@ -311,7 +311,7 @@ EventScript_16CEF5:: @ 816CEF5
EventScript_16CF09:: @ 816CF09
msgbox gUnknown_81970B2, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16CC10
goto EventScript_16CF3F
end
@@ -319,7 +319,7 @@ EventScript_16CF09:: @ 816CF09
EventScript_16CF22:: @ 816CF22
getitemname 0, VAR_0x4001
msgbox gUnknown_819709D, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16CC10
goto EventScript_16CF3F
end
@@ -327,10 +327,10 @@ EventScript_16CF22:: @ 816CF22
EventScript_16CF3F:: @ 816CF3F
getitemname 0, VAR_0x4001
checkcoins VAR_RESULT
compare_var_to_var VAR_RESULT, VAR_0x4002
compare VAR_RESULT, VAR_0x4002
goto_if lt, EventScript_16CDA5
checkitemspace VAR_0x4001, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16CF79
takecoins VAR_0x4002
updatecoinsbox 0, 5
@@ -351,7 +351,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
data/maps/CeladonCity_Gym/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ EventScript_16D0A0:: @ 816D0A0
EventScript_16D0C6:: @ 816D0C6
msgbox gUnknown_8197327
checkitemspace ITEM_TM19, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16D107
additem ITEM_TM19, 1
giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19
data/maps/CeladonCity_Restaurant/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
goto_if TRUE, EventScript_16D24B
msgbox gUnknown_81979C1
checkitemspace ITEM_COIN_CASE, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16D241
additem ITEM_COIN_CASE, 1
giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE
data/maps/CeruleanCave_B1F/scripts.inc
+5 -5
View File
@@ -10,7 +10,7 @@ CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9
EventScript_1624D3:: @ 81624D3
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
@@ -26,7 +26,7 @@ EventScript_1624F1:: @ 81624F1
CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
@@ -45,11 +45,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_162558
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_162561
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_162561
setflag FLAG_FOUGHT_MEWTWO
release
data/maps/CeruleanCity/scripts.inc
+17 -17
View File
@@ -43,21 +43,21 @@ EventScript_1664CC:: @ 81664CC
waitmovement 0
msgbox gUnknown_817EAD7
setvar VAR_LAST_TALKED, 8
compare_var_to_value VAR_STARTER_MON, 2
compare VAR_STARTER_MON, 2
call_if eq, EventScript_166582
compare_var_to_value VAR_STARTER_MON, 1
compare VAR_STARTER_MON, 1
call_if eq, EventScript_16658D
compare_var_to_value VAR_STARTER_MON, 0
compare VAR_STARTER_MON, 0
call_if eq, EventScript_166598
famechecker FAMECHECKER_BILL, 0
msgbox gUnknown_817EB95
closemessage
playbgm MUS_RIVAL2, 0
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_1665A3
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_1665A3
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_1665B5
msgbox gUnknown_817ECD4
setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
@@ -185,7 +185,7 @@ CeruleanCity_EventScript_166603:: @ 8166603
EventScript_16662E:: @ 816662E
msgbox gUnknown_817EE9C
checkitemspace ITEM_TM28, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_166677
additem ITEM_TM28, 1
giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28
@@ -283,11 +283,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F
lock
random 3
copyvar VAR_0x8008, VAR_RESULT
compare_var_to_value VAR_0x8008, 0
compare VAR_0x8008, 0
call_if eq, EventScript_1667B0
compare_var_to_value VAR_0x8008, 1
compare VAR_0x8008, 1
call_if eq, EventScript_1667B6
compare_var_to_value VAR_0x8008, 2
compare VAR_0x8008, 2
call_if eq, EventScript_1667BC
waitmessage
delay 40
@@ -295,11 +295,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F
applymovement 5, Movement_1A75D9
waitmovement 0
delay 30
compare_var_to_value VAR_0x8008, 0
compare VAR_0x8008, 0
call_if eq, EventScript_1667C2
compare_var_to_value VAR_0x8008, 1
compare VAR_0x8008, 1
call_if eq, EventScript_1667CB
compare_var_to_value VAR_0x8008, 2
compare VAR_0x8008, 2
call_if eq, EventScript_1667D4
release
end
@@ -332,13 +332,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD
lock
random 4
copyvar VAR_0x8008, VAR_RESULT
compare_var_to_value VAR_0x8008, 0
compare VAR_0x8008, 0
call_if eq, EventScript_166814
compare_var_to_value VAR_0x8008, 1
compare VAR_0x8008, 1
call_if eq, EventScript_16681D
compare_var_to_value VAR_0x8008, 2
compare VAR_0x8008, 2
call_if eq, EventScript_166826
compare_var_to_value VAR_0x8008, 3
compare VAR_0x8008, 3
call_if eq, EventScript_16682F
release
end
data/maps/CeruleanCity_Gym/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ EventScript_16AAD3:: @ 816AAD3
EventScript_16AAF9:: @ 816AAF9
msgbox gUnknown_81922F7
checkitemspace ITEM_TM03, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16AB3A
additem ITEM_TM03, 1
giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03
data/maps/CeruleanCity_House3/scripts.inc
+3 -3
View File
@@ -13,13 +13,13 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
checkflag FLAG_DID_ZYNX_TRADE
goto_if TRUE, EventScript_16AA23
msgbox gUnknown_81A59FE, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16AA0B
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_16AA0B
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16AA15
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
data/maps/CeruleanCity_House4/scripts.inc
+12 -12
View File
@@ -3,25 +3,25 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
copyvar VAR_0x8008, VAR_RESULT
compare_var_to_value VAR_0x8004, 0
compare VAR_0x8004, 0
goto_if eq, EventScript_CeruleanCity_House4_NoNews
compare_var_to_value VAR_0x8004, 1
compare VAR_0x8004, 1
goto_if eq, EventScript_CeruleanCity_House4_News1
compare_var_to_value VAR_0x8004, 2
compare VAR_0x8004, 2
goto_if eq, EventScript_CeruleanCity_House4_News2
compare_var_to_value VAR_0x8004, 3
compare VAR_0x8004, 3
goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread
compare_var_to_value VAR_0x8004, 4
compare VAR_0x8004, 4
goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1
compare_var_to_value VAR_0x8004, 5
compare VAR_0x8004, 5
goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if eq, EventScript_CeruleanCity_House4_NewsDone
end
@@ -34,7 +34,7 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192B43
giveitem VAR_0x8008
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16AE45
release
end
@@ -43,7 +43,7 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192C07
giveitem VAR_0x8008, 4
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16AE45
release
end
@@ -59,7 +59,7 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192D4B
giveitem VAR_0x8008
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16AE45
release
end
@@ -68,7 +68,7 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192DE3
giveitem VAR_0x8008, 4
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16AE45
release
end
data/maps/CeruleanCity_House5/scripts.inc
+7 -7
View File
@@ -7,14 +7,14 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
checkflag FLAG_GOT_POWDER_JAR
goto_if TRUE, EventScript_16AEB7
msgbox gUnknown_8192F67, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16AEAD
checkflag FLAG_SYS_GOT_BERRY_POUCH
goto_if FALSE, EventScript_16AEA3
msgbox gUnknown_8193003
setflag FLAG_GOT_POWDER_JAR
giveitem ITEM_POWDER_JAR
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
msgbox gUnknown_8193033
release
@@ -143,20 +143,20 @@ EventScript_16B048:: @ 816B048
EventScript_16B055:: @ 816B055
msgbox gUnknown_819331E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16AEC8
copyvar VAR_0x8004, VAR_0x8009
specialvar VAR_RESULT, sub_815EEB0
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16B0CC
giveitem VAR_0x8008
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16B0BF
copyvar VAR_0x8004, VAR_0x8009
special sub_815EF5C
special sub_815F070
msgbox gUnknown_819337A, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16AEC8
msgbox gUnknown_81933FB
special sub_815F114
@@ -177,7 +177,7 @@ EventScript_16B0CC:: @ 816B0CC
CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA
lockall
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_814EA7C
waitstate
data/maps/CeruleanCity_Mart/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7
CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/CinnabarIsland/scripts.inc
+6 -6
View File
@@ -6,11 +6,11 @@ CinnabarIsland_MapScripts:: @ 8166ED6
CinnabarIsland_MapScript1_166EE1:: @ 8166EE1
setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
call EventScript_166F5E
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1
call_if eq, EventScript_166F24
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3
call_if eq, EventScript_166F52
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
call_if eq, EventScript_166F0B
end
@@ -24,7 +24,7 @@ EventScript_166F0B:: @ 8166F0B
EventScript_166F24:: @ 8166F24
getplayerxy VAR_0x8004, VAR_0x8005
compare_var_to_value VAR_0x8004, 18
compare VAR_0x8004, 18
goto_if ge, EventScript_166F4A
setflag FLAG_TEMP_2
setobjectxyperm 3, 18, 12
@@ -108,9 +108,9 @@ EventScript_166FCD:: @ 8166FCD
call_if TRUE, EventScript_167053
msgbox gUnknown_8180C90
msgbox gUnknown_8180CAA, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_167068
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_167078
end
data/maps/CinnabarIsland_Gym/scripts.inc
+25 -25
View File
@@ -75,7 +75,7 @@ EventScript_16DA06:: @ 816DA06
EventScript_16DA34:: @ 816DA34
msgbox gUnknown_819969E
checkitemspace ITEM_TM38, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16DA75
additem ITEM_TM38, 1
giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38
@@ -227,9 +227,9 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4
EventScript_16DC00:: @ 816DC00
msgbox gUnknown_8199C9F
msgbox gUnknown_8199D5A, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16DC43
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16DC6A
end
@@ -275,9 +275,9 @@ EventScript_16DC6A:: @ 816DC6A
end
EventScript_16DC7A:: @ 816DC7A
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16DCB4
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16DCC6
textcolor 0
msgbox gUnknown_819983F
@@ -324,9 +324,9 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9
EventScript_16DCF5:: @ 816DCF5
msgbox gUnknown_8199C9F
msgbox gUnknown_8199D79, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16DD41
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16DD1C
end
@@ -354,9 +354,9 @@ EventScript_16DD41:: @ 816DD41
end
EventScript_16DD51:: @ 816DD51
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16DD8B
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16DD9D
textcolor 0
msgbox gUnknown_81998BD
@@ -412,9 +412,9 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7
EventScript_16DDD3:: @ 816DDD3
msgbox gUnknown_8199C9F
msgbox gUnknown_8199DA9, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16DE1F
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16DDFA
end
@@ -442,9 +442,9 @@ EventScript_16DE1F:: @ 816DE1F
end
EventScript_16DE2F:: @ 816DE2F
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16DE69
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16DE7B
textcolor 0
msgbox gUnknown_8199948
@@ -491,9 +491,9 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E
EventScript_16DEAA:: @ 816DEAA
msgbox gUnknown_8199C9F
msgbox gUnknown_8199DC6, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16DEF6
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16DED1
end
@@ -521,9 +521,9 @@ EventScript_16DEF6:: @ 816DEF6
end
EventScript_16DF06:: @ 816DF06
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16DF40
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16DF52
textcolor 0
msgbox gUnknown_81999B7
@@ -570,9 +570,9 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75
EventScript_16DF81:: @ 816DF81
msgbox gUnknown_8199C9F
msgbox gUnknown_8199E00, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16DFA8
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16DFCD
end
@@ -600,9 +600,9 @@ EventScript_16DFCD:: @ 816DFCD
end
EventScript_16DFDD:: @ 816DFDD
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16E017
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16E029
textcolor 0
msgbox gUnknown_8199A7F
@@ -649,9 +649,9 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C
EventScript_16E058:: @ 816E058
msgbox gUnknown_8199C9F
msgbox gUnknown_8199E36, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E0A4
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E07F
end
@@ -679,9 +679,9 @@ EventScript_16E0A4:: @ 816E0A4
end
EventScript_16E0B4:: @ 816E0B4
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16E0EE
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16E100
textcolor 0
msgbox gUnknown_8199AFC
data/maps/CinnabarIsland_Mart/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+4 -4
View File
@@ -30,7 +30,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
lock
faceplayer
msgbox gUnknown_819A725, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E9A5
msgbox gUnknown_819A785
closemessage
@@ -39,11 +39,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
setflag FLAG_SPECIAL_FLAG_0x4001
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
delay 20
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_16E96F
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_16E981
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_16E993
removeobject 7
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273
.byte 0
CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
call_if eq, EventScript_16E285
end
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+28 -28
View File
@@ -9,13 +9,13 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
checkflag FLAG_DID_SEELOR_TRADE
goto_if TRUE, EventScript_16E473
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E45B
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_16E45B
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16E465
call EventScript_1A8CD9
msgbox gUnknown_81A59DA
@@ -45,20 +45,20 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
setvar VAR_RESULT, 0
checkflag FLAG_REVIVED_AMBER
call_if TRUE, EventScript_16E8A1
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E897
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
goto_if eq, EventScript_16E736
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
goto_if eq, EventScript_16E72C
call EventScript_16E4EC
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E544
call EventScript_16E504
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E586
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E5C8
msgbox gUnknown_819A282
goto EventScript_16E53A
@@ -101,7 +101,7 @@ EventScript_16E544:: @ 816E544
message Text_19A282
waitmessage
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E5FA
multichoice 0, 0, MULTICHOICE_HELIX, FALSE
switch VAR_RESULT
@@ -114,7 +114,7 @@ EventScript_16E586:: @ 816E586
message Text_19A282
waitmessage
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E631
multichoice 0, 0, MULTICHOICE_DOME, FALSE
switch VAR_RESULT
@@ -155,7 +155,7 @@ EventScript_16E668:: @ 816E668
getspeciesname 0, SPECIES_OMANYTE
getitemname 1, ITEM_HELIX_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
@@ -170,7 +170,7 @@ EventScript_16E6A6:: @ 816E6A6
getspeciesname 0, SPECIES_KABUTO
getitemname 1, ITEM_DOME_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
@@ -185,7 +185,7 @@ EventScript_16E6E4:: @ 816E6E4
getspeciesname 0, SPECIES_AERODACTYL
getitemname 1, ITEM_OLD_AMBER
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
@@ -207,11 +207,11 @@ EventScript_16E72C:: @ 816E72C
end
EventScript_16E736:: @ 816E736
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
goto_if eq, EventScript_16E758
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
goto_if eq, EventScript_16E79D
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
goto_if eq, EventScript_16E7E2
end
@@ -220,12 +220,12 @@ EventScript_16E758:: @ 816E758
getspeciesname 0, SPECIES_OMANYTE
msgbox gUnknown_819A34F
givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_HELIX
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E85B
end
@@ -234,12 +234,12 @@ EventScript_16E79D:: @ 816E79D
getspeciesname 0, SPECIES_KABUTO
msgbox gUnknown_819A34F
givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_DOME
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E85B
end
@@ -248,12 +248,12 @@ EventScript_16E7E2:: @ 816E7E2
getspeciesname 0, SPECIES_AERODACTYL
msgbox gUnknown_819A34F
givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_AMBER
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E85B
end
@@ -265,7 +265,7 @@ EventScript_16E827:: @ 816E827
waitfanfare
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E895
call EventScript_1A8C27
call EventScript_1A74EB
@@ -280,7 +280,7 @@ EventScript_16E85B:: @ 816E85B
waitfanfare
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E88A
call EventScript_1A8C33
goto EventScript_16E88A
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+6 -6
View File
@@ -13,13 +13,13 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
checkflag FLAG_DID_ESPHERE_TRADE
goto_if TRUE, EventScript_16E334
msgbox gUnknown_81A59FE, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E31C
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_16E31C
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16E326
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
@@ -53,17 +53,17 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
checkflag FLAG_DID_TANGENY_TRADE
goto_if TRUE, EventScript_16E3D4
msgbox gUnknown_81A5AD6, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16E3BC
special Special_ChooseMonFromParty
waitstate
copyvar VAR_0x800A, VAR_0x8004
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_16E3BC
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare_var_to_var VAR_RESULT, VAR_0x8009
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16E3C6
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+1 -1
View File
@@ -26,7 +26,7 @@ EventScript_164C52:: @ 8164C52
waitmovement 0
msgbox gUnknown_817D062
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_164CB6
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086
msgbox gUnknown_817D0B2
data/maps/FiveIsland_MemorialPillar/scripts.inc
+5 -5
View File
@@ -27,7 +27,7 @@ EventScript_168A18:: @ 8168A18
EventScript_168A22:: @ 8168A22
msgbox gUnknown_818B282
giveitem ITEM_TM42
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_168AFE
call EventScript_168AE8
release
@@ -35,7 +35,7 @@ EventScript_168A22:: @ 8168A22
FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lockall
@@ -45,14 +45,14 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
goto_if TRUE, EventScript_168B0B
msgbox gUnknown_818B095
checkitem ITEM_LEMONADE, 1
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_168A86
releaseall
end
EventScript_168A86:: @ 8168A86
msgbox gUnknown_818B105, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_168A9B
releaseall
end
@@ -69,7 +69,7 @@ EventScript_168A9B:: @ 8168A9B
textcolor 0
msgbox gUnknown_818B171
giveitem ITEM_TM42
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_168AFE
call EventScript_168AE8
releaseall
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+9 -9
View File
@@ -3,16 +3,16 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD
FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
faceplayer
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_172043
compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
goto_if eq, EventScript_171F0B
compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
goto_if ne, EventScript_171F19
msgbox gUnknown_81A42A0
goto EventScript_171EFE
@@ -32,7 +32,7 @@ EventScript_171F0B:: @ 8171F0B
EventScript_171F19:: @ 8171F19
copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171F34
goto EventScript_171EFE
end
@@ -52,18 +52,18 @@ EventScript_171F34:: @ 8171F34
textcolor 0
msgbox gUnknown_81A4566
closemessage
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_171FCD
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_171FE9
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_171FFE
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_17201A
moveobjectoffscreen 2
msgbox gUnknown_81A458E
giveitem VAR_RESORT_GORGEOUS_REWARD
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_172025
setflag FLAG_TEMP_2
setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+11 -11
View File
@@ -78,7 +78,7 @@ FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014
EventScript_16402F:: @ 816402F
getplayerxy VAR_0x8004, VAR_0x8005
compare_var_to_value VAR_0x8004, 24
compare VAR_0x8004, 24
call_if le, EventScript_164065
msgbox gUnknown_817BA64
closemessage
@@ -112,36 +112,36 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
EventScript_1640A2:: @ 81640A2
getplayerxy VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, GetPlayerFacingDirection
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
call_if eq, EventScript_16412E
msgbox gUnknown_817B7AE
closemessage
compare_var_to_value VAR_0x8004, 24
compare VAR_0x8004, 24
call_if le, EventScript_164144
compare_var_to_value VAR_0x8004, 25
compare VAR_0x8004, 25
call_if eq, EventScript_16414F
compare_var_to_value VAR_0x8004, 26
compare VAR_0x8004, 26
call_if eq, EventScript_16415A
compare_var_to_value VAR_0x8004, 27
compare VAR_0x8004, 27
call_if eq, EventScript_16415A
playse SE_PIN
call EventScript_163F47
special DrawWholeMapView
waitse
compare_var_to_value VAR_0x8004, 24
compare VAR_0x8004, 24
call_if le, EventScript_164165
compare_var_to_value VAR_0x8004, 25
compare VAR_0x8004, 25
call_if eq, EventScript_164165
compare_var_to_value VAR_0x8004, 26
compare VAR_0x8004, 26
call_if eq, EventScript_164165
compare_var_to_value VAR_0x8004, 27
compare VAR_0x8004, 27
call_if eq, EventScript_164170
msgbox gUnknown_817B7FA
release
end
EventScript_16412E:: @ 816412E
compare_var_to_value VAR_0x8004, 27
compare VAR_0x8004, 27
goto_if eq, EventScript_1A77A9
applymovement 255, Movement_1A75EB
waitmovement 0
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+5 -5
View File
@@ -3,7 +3,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D
FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
@@ -14,7 +14,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
goto_if TRUE, EventScript_16892C
msgbox gUnknown_818A80D
specialvar VAR_RESULT, Special_GetLeadMonFriendship
compare_var_to_value VAR_RESULT, 6
compare VAR_RESULT, 6
goto_if eq, EventScript_1688AC
msgbox gUnknown_818A88F
release
@@ -33,7 +33,7 @@ EventScript_1688AC:: @ 81688AC
EventScript_1688BA:: @ 81688BA
countpokemon
compare_var_to_value VAR_RESULT, 6
compare VAR_RESULT, 6
goto_if eq, EventScript_16891F
setflag FLAG_GOT_TOGEPI_EGG
giveegg SPECIES_TOGEPI
@@ -50,12 +50,12 @@ EventScript_1688E3:: @ 81688E3
getspeciesname 1, SPECIES_TOGEPI
setvar VAR_0x8004, SPECIES_TOGEPI
specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_168895
getspeciesname 1, SPECIES_TOGETIC
setvar VAR_0x8004, SPECIES_TOGETIC
specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_168895
msgbox gUnknown_818A9C0
release
data/maps/FourIsland/scripts.inc
+8 -8
View File
@@ -5,7 +5,7 @@ FourIsland_MapScripts:: @ 8167CAE
FourIsland_MapScript1_167CB9:: @ 8167CB9
setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0
compare VAR_MAP_SCENE_FOUR_ISLAND, 0
call_if eq, EventScript_167CCD
call EventScript_167CD1
end
@@ -72,18 +72,18 @@ Movement_167D52:: @ 8167D52
FourIsland_EventScript_167D55:: @ 8167D55
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
faceplayer
special GetDaycareMonNicknames
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_167D9B
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_167E0C
compare_var_to_value VAR_RESULT, 3
compare VAR_RESULT, 3
goto_if eq, EventScript_167E19
msgbox gUnknown_81BF555
release
@@ -91,10 +91,10 @@ FourIsland_EventScript_167D55:: @ 8167D55
EventScript_167D9B:: @ 8167D9B
msgbox gUnknown_81BF5E3, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_167DD1
msgbox gUnknown_81BF7B6, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_167DD1
msgbox gUnknown_81BF6CF
clearflag FLAG_PENDING_DAYCARE_EGG
@@ -104,7 +104,7 @@ EventScript_167D9B:: @ 8167D9B
EventScript_167DD1:: @ 8167DD1
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare_var_to_value VAR_RESULT, 6
compare VAR_RESULT, 6
goto_if ne, EventScript_167DEB
msgbox gUnknown_81BF6F0
release
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82
.byte 0
FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88
compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
call_if eq, EventScript_163D94
end
data/maps/FourIsland_Mart/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD
FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/FourIsland_PokemonDayCare/scripts.inc
+22 -22
View File
@@ -3,19 +3,19 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F
FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171A2E
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_171A52
compare_var_to_value VAR_RESULT, 3
compare VAR_RESULT, 3
goto_if eq, EventScript_171B86
msgbox gUnknown_81BF7E4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171993
msgbox gUnknown_81BF916
release
@@ -23,16 +23,16 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
EventScript_171993:: @ 8171993
specialvar VAR_RESULT, CountPartyNonEggMons
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171A1A
msgbox gUnknown_81BF839
fadescreen 1
special ChooseSendDaycareMon
waitstate
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_1719F7
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_171A24
specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
waitse
@@ -42,7 +42,7 @@ EventScript_171993:: @ 8171993
special StoreSelectedPokemonInDaycare
incrementgamestat GAME_STAT_USED_DAYCARE
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_171A01
release
end
@@ -54,7 +54,7 @@ EventScript_1719F7:: @ 81719F7
EventScript_171A01:: @ 8171A01
msgbox gUnknown_81BF89F, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171993
goto EventScript_1719F7
end
@@ -80,7 +80,7 @@ EventScript_171A38:: @ 8171A38
EventScript_171A41:: @ 8171A41
specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if ne, EventScript_171A38
return
@@ -89,26 +89,26 @@ EventScript_171A52:: @ 8171A52
setvar VAR_0x8004, 0
call EventScript_171A41
msgbox gUnknown_81BF89F, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171993
msgbox gUnknown_81BFAE8, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171A90
goto EventScript_1719F7
end
EventScript_171A90:: @ 8171A90
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare_var_to_value VAR_RESULT, 6
compare VAR_RESULT, 6
goto_if eq, EventScript_171B67
specialvar VAR_RESULT, GetDaycareState
setvar VAR_0x8004, 0
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_171ACF
special ShowDaycareLevelMenu
waitstate
copyvar VAR_0x8004, VAR_RESULT
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1719F7
goto EventScript_171ACF
end
@@ -116,14 +116,14 @@ EventScript_171A90:: @ 8171A90
EventScript_171ACF:: @ 8171ACF
special GetDaycareCost
msgbox gUnknown_81BFA3B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171AEB
goto EventScript_1719F7
end
EventScript_171AEB:: @ 8171AEB
specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171B05
msgbox gUnknown_81BF932
release
@@ -143,14 +143,14 @@ EventScript_171B05:: @ 8171B05
call EventScript_1A6675
waitmoncry
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_171B4E
goto EventScript_1719F7
end
EventScript_171B4E:: @ 8171B4E
msgbox gUnknown_81BF94F, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171A90
goto EventScript_1719F7
end
@@ -192,7 +192,7 @@ EventScript_171B86:: @ 8171B86
setvar VAR_0x8004, 1
call EventScript_171A41
msgbox gUnknown_81BFAE8, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_171A90
msgbox gUnknown_81BF976
release
@@ -201,7 +201,7 @@ EventScript_171B86:: @ 8171B86
EventScript_171BBF:: @ 8171BBF
special ShowDaycareLevelMenu
waitstate
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1719F7
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, TakePokemonFromDaycare
data/maps/FuchsiaCity_Building1/scripts.inc
+4 -4
View File
@@ -9,9 +9,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH
goto_if TRUE, EventScript_16D780
msgbox gUnknown_8198DF9, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16D7E8
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_16D7F1
release
end
@@ -25,9 +25,9 @@ EventScript_16D780:: @ 816D780
msgbox gUnknown_8198EAA
call EventScript_1A6675
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_16D7D6
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16D7DF
additem ITEM_HM04, 1
giveitemfanfaremsg gUnknown_8199068, ITEM_HM04
data/maps/FuchsiaCity_Gym/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ EventScript_16D580:: @ 816D580
EventScript_16D5A6:: @ 816D5A6
msgbox gUnknown_819850E
checkitemspace ITEM_TM06, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16D5E7
additem ITEM_TM06, 1
giveitemfanfaremsg gUnknown_819858F, ITEM_TM06
data/maps/FuchsiaCity_House2/scripts.inc
+2 -2
View File
@@ -7,7 +7,7 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817
checkflag FLAG_GOT_GOOD_ROD
goto_if TRUE, EventScript_16D83F
msgbox gUnknown_819918E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16D849
msgbox gUnknown_8199337
release
@@ -21,7 +21,7 @@ EventScript_16D83F:: @ 816D83F
EventScript_16D849:: @ 816D849
msgbox gUnknown_8199207
checkitemspace ITEM_GOOD_ROD, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16D88A
additem ITEM_GOOD_ROD, 1
giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD
data/maps/FuchsiaCity_House3/scripts.inc
+6 -6
View File
@@ -5,7 +5,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895
lock
faceplayer
msgbox gUnknown_81993B9, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16D8B0
goto EventScript_16D941
end
@@ -14,23 +14,23 @@ EventScript_16D8B0:: @ 816D8B0
msgbox gUnknown_8199421
special Special_ChooseMonFromParty
waitstate
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_16D941
special IsSelectedMonEgg
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16D937
special ScrSpecial_CountPokemonMoves
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16D92A
msgbox gUnknown_8199445
fadescreen 1
special SelectMove
fadescreen 0
compare_var_to_value VAR_0x8005, 4
compare VAR_0x8005, 4
goto_if eq, EventScript_16D8B0
special ScrSpecial_GetPokemonNicknameAndMoveName
msgbox gUnknown_8199485, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16D919
goto EventScript_16D941
end
data/maps/FuchsiaCity_Mart/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA
FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+9 -9
View File
@@ -38,7 +38,7 @@ EventScript_16D312:: @ 816D312
lockall
textcolor 0
msgbox gUnknown_8197E1A, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16D345
msgbox gUnknown_8197E48
closemessage
@@ -102,7 +102,7 @@ EventScript_16D391:: @ 816D391
waitmovement 0
showmoneybox 0, 0, 0
msgbox gUnknown_8197C87, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16D3CA
msgbox gUnknown_8197DE9
goto EventScript_16D49A
@@ -111,7 +111,7 @@ EventScript_16D391:: @ 816D391
EventScript_16D3CA:: @ 816D3CA
call EventScript_16D462
checkmoney 500, 0
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16D48C
takemoney 500, 0
updatemoneybox 0, 0, 0
@@ -124,11 +124,11 @@ EventScript_16D3CA:: @ 816D3CA
msgbox gUnknown_8197D80
closemessage
hidemoneybox 0, 0
compare_var_to_value VAR_0x4002, 0
compare VAR_0x4002, 0
call_if eq, EventScript_16D44C
compare_var_to_value VAR_0x4002, 1
compare VAR_0x4002, 1
call_if eq, EventScript_16D441
compare_var_to_value VAR_0x4002, 2
compare VAR_0x4002, 2
call_if eq, EventScript_16D457
special EnterSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2
@@ -153,10 +153,10 @@ EventScript_16D457:: @ 816D457
EventScript_16D462:: @ 816D462
countpokemon
compare_var_to_value VAR_RESULT, 6
compare VAR_RESULT, 6
goto_if ne, EventScript_1A77A9
specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_1A77A9
msgbox gUnknown_81BFEAC
goto EventScript_16D49A
@@ -200,7 +200,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7
lock
faceplayer
msgbox gUnknown_8197EB0, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16D4D6
msgbox gUnknown_819809E
release
data/maps/IndigoPlateau_Exterior/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B
IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246
setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR
compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1
compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1
call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic
end
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -6,7 +6,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A
IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65
setrespawn SPAWN_INDIGO_PLATEAU
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16EA79
end
@@ -20,7 +20,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A
lock
faceplayer
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16EAA6
msgbox gUnknown_819A8D8
release
@@ -44,7 +44,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3
IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/LavenderTown/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ LavenderTown_EventScript_16687D:: @ 816687D
lock
faceplayer
msgbox gUnknown_817F52E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16689C
msgbox gUnknown_817F568
release
data/maps/LavenderTown_House2/scripts.inc
+10 -10
View File
@@ -5,9 +5,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266
lock
faceplayer
msgbox gUnknown_8193A4B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16B287
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16B2AA
end
@@ -15,9 +15,9 @@ EventScript_16B287:: @ 816B287
msgbox gUnknown_8193AA6
special Special_ChooseMonFromParty
waitstate
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if lt, EventScript_16B2B4
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_16B2AA
end
@@ -28,20 +28,20 @@ EventScript_16B2AA:: @ 816B2AA
EventScript_16B2B4:: @ 816B2B4
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare_var_to_value VAR_RESULT, SPECIES_EGG
compare VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_16B307
special TV_CopyNicknameToStringVar1AndEnsureTerminated
special TV_CheckMonOTIDEqualsPlayerID
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16B311
specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16B311
msgbox gUnknown_8193AD2, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16B31B
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16B2AA
end
@@ -60,7 +60,7 @@ EventScript_16B31B:: @ 816B31B
call EventScript_1A74EB
specialvar VAR_RESULT, NameRaterWasNicknameChanged
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16B345
msgbox gUnknown_8193BF0
release
data/maps/LavenderTown_Mart/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362
LavenderTown_Mart_EventScript_16B36B:: @ 816B36B
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A
goto_if TRUE, EventScript_16B196
msgbox gUnknown_81936FF
checkitemspace ITEM_POKE_FLUTE, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16B1A0
setflag FLAG_GOT_POKE_FLUTE
additem ITEM_POKE_FLUTE, 1
data/maps/MtEmber_Exterior/scripts.inc
+4 -4
View File
@@ -5,7 +5,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946
MtEmber_Exterior_MapScript1_163951:: @ 8163951
setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR
compare_var_to_value VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2
compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2
call_if eq, EventScript_163960
end
@@ -15,7 +15,7 @@ EventScript_163960:: @ 8163960
return
MtEmber_Exterior_MapScript2_163969:: @ 8163969
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
call_if ge, EventScript_163975
end
@@ -27,7 +27,7 @@ MtEmber_Exterior_EventScript_16397F:: @ 816397F
lock
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43
goto_if eq, EventScript_16399E
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if eq, EventScript_1639A8
msgbox gUnknown_817A82A
release
@@ -65,7 +65,7 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0
faceplayer
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44
goto_if eq, EventScript_163A1B
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if eq, EventScript_163A25
msgbox gUnknown_817A88C
closemessage
data/maps/MtEmber_Summit/scripts.inc
+5 -5
View File
@@ -10,7 +10,7 @@ MtEmber_Summit_MapScript2_163B07:: @ 8163B07
EventScript_163B11:: @ 8163B11
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
@@ -26,7 +26,7 @@ EventScript_163B2F:: @ 8163B2F
MtEmber_Summit_EventScript_163B33:: @ 8163B33
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
@@ -45,11 +45,11 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_163B96
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163B9F
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163B9F
setflag FLAG_FOUGHT_MOLTRES
release
data/maps/MtMoon_B2F/scripts.inc
+2 -2
View File
@@ -57,7 +57,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B
lock
faceplayer
msgbox gUnknown_8172E77, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1607DE
removeobject 1
additem ITEM_DOME_FOSSIL, 1
@@ -90,7 +90,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F
lock
faceplayer
msgbox gUnknown_8172E94, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1607DE
removeobject 2
additem ITEM_HELIX_FOSSIL, 1
data/maps/NavelRock_Base/scripts.inc
+5 -5
View File
@@ -27,14 +27,14 @@ NavelRock_Base_MapScript2_165116:: @ 8165116
EventScript_165120:: @ 8165120
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 1
return
NavelRock_Base_EventScript_165134:: @ 8165134
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
@@ -69,11 +69,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1651D9
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1651E7
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1651E7
setflag FLAG_FOUGHT_LUGIA
release
data/maps/NavelRock_Exterior/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
NavelRock_Exterior_MapScripts:: @ 81646AE
map_script 3, NavelRock_Exterior_MapScript1_1646B4
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_OnTransition
.byte 0
NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4
NavelRock_Exterior_OnTransition:: @ 81646B4
setworldmapflag FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR
end
data/maps/NavelRock_Summit/scripts.inc
+5 -5
View File
@@ -30,14 +30,14 @@ NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD
EventScript_164FE7:: @ 8164FE7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 1
return
NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lockall
@@ -74,11 +74,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
setvar VAR_LAST_TALKED, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1650B4
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1650C2
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1650C2
setflag FLAG_FOUGHT_HO_OH
releaseall
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+20 -20
View File
@@ -6,7 +6,7 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8
.byte 0
OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
call_if ge, EventScript_170C22
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_170C36
@@ -28,11 +28,11 @@ EventScript_170C36:: @ 8170C36
OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E
setrespawn SPAWN_ONE_ISLAND
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
call_if eq, EventScript_170C73
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
call_if eq, EventScript_170C79
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
call_if eq, EventScript_170C90
end
@@ -112,9 +112,9 @@ EventScript_170CB1:: @ 8170CB1
additem ITEM_TRI_PASS, 1
giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5
msgbox gUnknown_81A1150
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if ge, EventScript_170E46
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if lt, EventScript_170E58
setflag FLAG_SYS_SEVII_MAP_123
msgbox gUnknown_81A1230
@@ -208,22 +208,22 @@ EventScript_170EB1:: @ 8170EB1
OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
goto_if eq, EventScript_170F35
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
goto_if eq, EventScript_170F9B
checkflag FLAG_RECOVERED_SAPPHIRE
goto_if TRUE, EventScript_170FA5
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if eq, EventScript_17103A
checkflag FLAG_GOT_RUBY
goto_if TRUE, EventScript_171044
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if eq, EventScript_1710F2
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_1710FC
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
goto_if eq, EventScript_171134
msgbox gUnknown_81A1321
closemessage
@@ -235,9 +235,9 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
EventScript_170F35:: @ 8170F35
msgbox gUnknown_81A1EBD
random 3
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_170F6D
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_170F84
famechecker FAMECHECKER_BILL, 5
msgbox gUnknown_81A2076
@@ -324,14 +324,14 @@ EventScript_171044:: @ 8171044
applymovement 3, Movement_1A75E1
waitmovement 0
msgbox gUnknown_81A19AA, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_171099
goto EventScript_1710B2
end
EventScript_171099:: @ 8171099
msgbox gUnknown_81A1A08, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_171099
goto EventScript_1710B2
end
@@ -466,13 +466,13 @@ EventScript_1711DA:: @ 81711DA
waitmovement 0
msgbox gUnknown_81A13B8
closemessage
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_1712E4
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_1712EF
compare_var_to_value VAR_0x4001, 3
compare VAR_0x4001, 3
call_if eq, EventScript_1712FA
compare_var_to_value VAR_0x4001, 4
compare VAR_0x4001, 4
call_if eq, EventScript_171305
delay 10
msgbox gUnknown_81A13CB
data/maps/PalletTown/scripts.inc
+13 -13
View File
@@ -7,16 +7,16 @@ PalletTown_MapScript1_165465:: @ 8165465
setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
call_if TRUE, EventScript_165488
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0
call_if eq, EventScript_1654A8
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
call_if eq, EventScript_1654A2
end
EventScript_165488:: @ 8165488
checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
goto_if FALSE, EventScript_1A77A9
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
goto_if ge, EventScript_1A77A9
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
return
@@ -59,7 +59,7 @@ EventScript_1654D8:: @ 81654D8
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
compare_var_to_value VAR_0x8009, 60
compare VAR_0x8009, 60
goto_if lt, EventScript_165593
msgbox gUnknown_817D9AA
closemessage
@@ -199,17 +199,17 @@ EventScript_165605:: @ 8165605
waitmovement 0
delay 30
addobject 3
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_1656B8
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_1656C3
delay 30
msgbox gUnknown_817D74A
closemessage
delay 30
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_1656CE
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_1656E0
opendoor 16, 13
waitdooranim
@@ -374,11 +374,11 @@ Movement_165758:: @ 8165758
PalletTown_EventScript_16575C:: @ 816575C
lock
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2
goto_if eq, EventScript_1657ED
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
goto_if eq, EventScript_165815
compare_var_to_value VAR_0x4002, 1
compare VAR_0x4002, 1
goto_if eq, EventScript_1658C2
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_165801
@@ -392,9 +392,9 @@ PalletTown_EventScript_16575C:: @ 816575C
waitmovement 0
msgbox gUnknown_81B1C9F
closemessage
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_1657D7
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if ne, EventScript_1657E2
moveobjectoffscreen 1
setflag FLAG_TEMP_2
data/maps/PalletTown_GarysHouse/scripts.inc
+12 -12
View File
@@ -3,9 +3,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27
.byte 0
PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if lt, EventScript_168D44
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if ge, EventScript_168D50
end
@@ -24,13 +24,13 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56
famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_168DB9
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
goto_if eq, EventScript_168EEC
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
goto_if eq, EventScript_168F59
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1
goto_if eq, EventScript_168EF6
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
goto_if ge, EventScript_168DAF
msgbox gUnknown_818D58C
closemessage
@@ -46,23 +46,23 @@ EventScript_168DAF:: @ 8168DAF
EventScript_168DB9:: @ 8168DB9
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
compare_var_to_value VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
goto_if lt, EventScript_168E46
msgbox gUnknown_818D7D3, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_168E3C
msgbox gUnknown_818D8B2
special Special_ChooseMonFromParty
waitstate
lock
faceplayer
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_168E3C
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare_var_to_value VAR_RESULT, SPECIES_EGG
compare VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_168E32
msgbox gUnknown_818D8CC
closemessage
@@ -143,7 +143,7 @@ EventScript_168EF6:: @ 8168EF6
msgbox gUnknown_818D60A
closemessage
checkitemspace ITEM_TOWN_MAP, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_168F4F
applymovement 1, Movement_1A75EB
waitmovement 0
data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+5 -5
View File
@@ -7,9 +7,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09
checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB
goto_if TRUE, EventScript_168C4A
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_168C38
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_168C41
closemessage
applymovement 1, Movement_1A75E5
@@ -35,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A
PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
lockall
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
goto_if eq, EventScript_168C78
msgbox gUnknown_818D4F9
releaseall
@@ -43,9 +43,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
EventScript_168C78:: @ 8168C78
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_168C91
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_168C9A
releaseall
end
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3
.byte 0
PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0
compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0
call_if eq, EventScript_168CBA
end
@@ -32,7 +32,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB
gUnknown_8168CE4:: @ 8168CE4
PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lockall
setvar VAR_0x8004, 32
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+99 -99
View File
@@ -6,11 +6,11 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E
PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E
setflag FLAG_VISITED_OAKS_LAB
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
call_if eq, EventScript_168FC6
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
call_if eq, EventScript_168FD5
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
call_if eq, EventScript_168FC0
checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
call_if TRUE, EventScript_168FBC
@@ -66,32 +66,32 @@ EventScript_169002:: @ 8169002
EventScript_169035:: @ 8169035
msgbox gUnknown_818EE60
closemessage
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169174
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_1691BB
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_169194
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_169194
msgbox gUnknown_818EF59
fadedefaultbgm
msgbox gUnknown_818F004
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_1691DB
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_1691E6
textcolor 3
msgbox gUnknown_818F062
closemessage
call EventScript_1A6675
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_1691F1
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_1691FC
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_169215
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_169227
addobject 9
addobject 10
@@ -101,13 +101,13 @@ EventScript_169035:: @ 8169035
removeobject 9
removeobject 10
delay 30
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169845
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_169850
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_16985B
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_16986D
textcolor 3
playfanfare MUS_FAN5
@@ -120,13 +120,13 @@ EventScript_169035:: @ 8169035
msgbox gUnknown_818F1DB
closemessage
playbgm MUS_RIVAL2, 0
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169B69
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_169B7B
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_169B7B
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_169B7B
removeobject 8
fadedefaultbgm
@@ -311,20 +311,20 @@ EventScript_16930B:: @ 816930B
closemessage
applymovement 4, Movement_1A75F1
waitmovement 0
compare_var_to_value VAR_STARTER_MON, 0
compare VAR_STARTER_MON, 0
goto_if eq, EventScript_1693D2
compare_var_to_value VAR_STARTER_MON, 1
compare VAR_STARTER_MON, 1
goto_if eq, EventScript_16944D
compare_var_to_value VAR_STARTER_MON, 2
compare VAR_STARTER_MON, 2
goto_if eq, EventScript_16935A
end
EventScript_16935A:: @ 816935A
compare_var_to_value VAR_0x4002, 1
compare VAR_0x4002, 1
goto_if eq, EventScript_16937C
compare_var_to_value VAR_0x4002, 2
compare VAR_0x4002, 2
goto_if eq, EventScript_16938C
compare_var_to_value VAR_0x4002, 3
compare VAR_0x4002, 3
goto_if eq, EventScript_16939C
end
@@ -376,11 +376,11 @@ Movement_1693CD:: @ 81693CD
step_end
EventScript_1693D2:: @ 81693D2
compare_var_to_value VAR_0x4002, 1
compare VAR_0x4002, 1
goto_if eq, EventScript_1693F4
compare_var_to_value VAR_0x4002, 2
compare VAR_0x4002, 2
goto_if eq, EventScript_169404
compare_var_to_value VAR_0x4002, 3
compare VAR_0x4002, 3
goto_if eq, EventScript_169414
end
@@ -435,11 +435,11 @@ Movement_169447:: @ 8169447
step_end
EventScript_16944D:: @ 816944D
compare_var_to_value VAR_0x4002, 1
compare VAR_0x4002, 1
goto_if eq, EventScript_16946F
compare_var_to_value VAR_0x4002, 2
compare VAR_0x4002, 2
goto_if eq, EventScript_16947F
compare_var_to_value VAR_0x4002, 3
compare VAR_0x4002, 3
goto_if eq, EventScript_16948F
end
@@ -492,11 +492,11 @@ EventScript_1694C2:: @ 81694C2
msgbox gUnknown_818DE38
closemessage
playbgm MUS_RIVAL2, 0
compare_var_to_value VAR_0x4002, 1
compare VAR_0x4002, 1
call_if eq, EventScript_169504
compare_var_to_value VAR_0x4002, 2
compare VAR_0x4002, 2
call_if eq, EventScript_169516
compare_var_to_value VAR_0x4002, 3
compare VAR_0x4002, 3
call_if eq, EventScript_169528
removeobject 8
playse SE_KAIDAN
@@ -574,9 +574,9 @@ Movement_169559:: @ 8169559
PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if eq, EventScript_16958B
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if eq, EventScript_169581
msgbox gUnknown_818DC67
release
@@ -597,21 +597,21 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
faceplayer
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_169600
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
goto_if eq, EventScript_169903
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
goto_if eq, EventScript_169A6E
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_1699CE
compare_var_to_value VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
goto_if eq, EventScript_169903
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
goto_if eq, EventScript_1698D6
compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
goto_if ge, EventScript_16961E
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
goto_if eq, EventScript_169614
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if eq, EventScript_16960A
msgbox gUnknown_818E116
release
@@ -645,13 +645,13 @@ EventScript_16961E:: @ 816961E
playbgm MUS_RIVAL1, 0
msgbox gUnknown_818DE8D
closemessage
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169A82
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_169AC1
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_169A9E
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_169A9E
fadedefaultbgm
msgbox gUnknown_818DE99
@@ -662,23 +662,23 @@ EventScript_16961E:: @ 816961E
waitmovement 0
applymovement 4, Movement_1A75DD
waitmovement 0
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_169ADD
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_169B14
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_169AF5
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169B86
msgbox gUnknown_818E508
closemessage
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169882
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_16988D
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_1698A6
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_1698B8
msgbox gUnknown_818E536
closemessage
@@ -691,13 +691,13 @@ EventScript_16961E:: @ 816961E
delay 10
removeobject 10
delay 25
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169845
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_169850
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_16985B
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_16986D
delay 10
textcolor 3
@@ -716,24 +716,24 @@ EventScript_16961E:: @ 816961E
famechecker FAMECHECKER_OAK, 1
msgbox gUnknown_818E784
msgbox gUnknown_818DEC8
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169B33
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_169B45
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_169B57
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_169B57
msgbox gUnknown_818DEF3
closemessage
playbgm MUS_RIVAL2, 0
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169B69
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_169B7B
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_169B7B
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_169B7B
removeobject 8
fadedefaultbgm
@@ -839,7 +839,7 @@ EventScript_1698D6:: @ 81698D6
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
compare_var_to_value VAR_0x8009, 1
compare VAR_0x8009, 1
goto_if eq, EventScript_1699FB
goto EventScript_169903
end
@@ -856,13 +856,13 @@ EventScript_169913:: @ 8169913
delay 40
message Text_1A7291
waitmessage
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_169964
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_16996F
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_16997A
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_169985
applymovement 4, Movement_1A75E1
waitmovement 0
@@ -970,7 +970,7 @@ Movement_1699C5:
EventScript_1699CE:: @ 81699CE
call EventScript_1A737B
closemessage
compare_var_to_value VAR_0x8009, 60
compare VAR_0x8009, 60
goto_if lt, EventScript_1699F9
checkflag FLAG_WORLD_MAP_ONE_ISLAND
goto_if FALSE, EventScript_1699F9
@@ -985,7 +985,7 @@ EventScript_1699F9:: @ 81699F9
EventScript_1699FB:: @ 81699FB
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK
@@ -993,13 +993,13 @@ EventScript_1699FB:: @ 81699FB
checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
goto_if TRUE, EventScript_169A78
checkitem ITEM_POKE_BALL, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_169A34
goto EventScript_169A6E
end
EventScript_169A34:: @ 8169A34
compare_var_to_value VAR_MAP_SCENE_ROUTE22, 2
compare VAR_MAP_SCENE_ROUTE22, 2
goto_if ge, EventScript_169A45
goto EventScript_169A6E
end
@@ -1153,9 +1153,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB
setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR
setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER
setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if eq, EventScript_169BE1
msgbox gUnknown_818EA19
release
@@ -1166,35 +1166,35 @@ EventScript_169BE1:: @ 8169BE1
waitmovement 0
drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3
textcolor 0
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0
goto_if eq, EventScript_OakDescribesBulbasaur
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1
goto_if eq, EventScript_OakDescribesCharmander
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2
goto_if eq, EventScript_OakDescribesSquirtle
end
EventScript_OakDescribesBulbasaur:: @ 8169C14
msgbox gUnknown_818E272, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_DeclinedStarter
end
EventScript_OakDescribesCharmander:: @ 8169C33
msgbox gUnknown_818E207, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_DeclinedStarter
end
EventScript_OakDescribesSquirtle:: @ 8169C52
msgbox gUnknown_818E194, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_DeclinedStarter
end
@@ -1218,9 +1218,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
playfanfare MUS_FAN5
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_GiveNicknameToStarter
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_SkipGiveNicknameToStarter
end
@@ -1232,11 +1232,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC
EventScript_SkipGiveNicknameToStarter:: @ 8169CDC
closemessage
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0
goto_if eq, EventScript_RivalWalksToCharmander
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1
goto_if eq, EventScript_RivalWalksToSquirtle
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2
goto_if eq, EventScript_RivalWalksToBulbasaur
end
@@ -1313,9 +1313,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78
setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE
setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR
setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if eq, EventScript_169BE1
msgbox gUnknown_818EA19
release
@@ -1328,9 +1328,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE
setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER
setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE
setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if eq, EventScript_169BE1
msgbox gUnknown_818EA19
release
@@ -1393,7 +1393,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71
PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A
lockall
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
goto_if ge, EventScript_169E90
msgbox gUnknown_818EA84
releaseall
data/maps/PewterCity/scripts.inc
+21 -21
View File
@@ -13,7 +13,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D
msgbox gUnknown_817E67E
closemessage
playbgm MUS_ANNAI, 0
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_165BD3
msgbox gUnknown_817E6C7
closemessage
@@ -445,11 +445,11 @@ EventScript_165DBE:: @ 8165DBE
msgbox gUnknown_817E67E
closemessage
playbgm MUS_ANNAI, 0
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_165E0A
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_165E26
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_165E42
msgbox gUnknown_817E6C7
closemessage
@@ -1032,19 +1032,19 @@ PewterCity_EventScript_16607E:: @ 816607E
lock
faceplayer
msgbox gUnknown_817E53E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_166136
msgbox gUnknown_817E589
closemessage
delay 10
playbgm MUS_ANNAI, 0
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_1660EE
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_166100
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_166112
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_166124
msgbox gUnknown_817E5AC
closemessage
@@ -1351,7 +1351,7 @@ PewterCity_EventScript_166244:: @ 8166244
lock
faceplayer
msgbox gUnknown_817E602, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_166263
msgbox gUnknown_817E644
release
@@ -1416,11 +1416,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1
EventScript_1662DE:: @ 81662DE
textcolor 0
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_1663CA
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_1663CA
compare_var_to_value VAR_0x4001, 3
compare VAR_0x4001, 3
call_if eq, EventScript_1663CA
waitse
playse SE_PIN
@@ -1429,13 +1429,13 @@ EventScript_1662DE:: @ 81662DE
applymovement 7, Movement_1A75DD
waitmovement 0
msgbox gUnknown_817E902
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_1663D5
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_1663DA
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_1663E6
compare_var_to_value VAR_0x4001, 3
compare VAR_0x4001, 3
call_if eq, EventScript_1663FC
msgbox gUnknown_817E90C
textcolor 3
@@ -1451,13 +1451,13 @@ EventScript_1662DE:: @ 81662DE
call EventScript_1A6675
msgbox gUnknown_817EA06
closemessage
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_166412
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16641D
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_166428
compare_var_to_value VAR_0x4001, 3
compare VAR_0x4001, 3
call_if eq, EventScript_166433
delay 30
textcolor 3
data/maps/PewterCity_Gym/scripts.inc
+3 -3
View File
@@ -24,7 +24,7 @@ EventScript_16A5C5:: @ 816A5C5
EventScript_16A5F3:: @ 816A5F3
msgbox gUnknown_8190FC1
checkitemspace ITEM_TM39, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16A634
additem ITEM_TM39, 1
giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39
@@ -49,9 +49,9 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655
checkflag FLAG_DEFEATED_BROCK
goto_if TRUE, EventScript_16A67F
msgbox gUnknown_8191298, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16A689
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16A697
end
data/maps/PewterCity_Mart/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7
PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
data/maps/PewterCity_Museum_1F/scripts.inc
+11 -11
View File
@@ -4,11 +4,11 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A
PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B
lock
faceplayer
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
goto_if eq, EventScript_16A348
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
goto_if eq, EventScript_16A348
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
goto_if eq, EventScript_16A348
msgbox gUnknown_8190539
release
@@ -16,9 +16,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B
EventScript_16A348:: @ 816A348
msgbox gUnknown_8190550, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16A367
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16A37B
end
@@ -64,7 +64,7 @@ EventScript_16A3D1:: @ 816A3D1
textcolor 0
showmoneybox 0, 0, 0
msgbox gUnknown_81904B5, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16A402
msgbox gUnknown_81904F9
closemessage
@@ -76,14 +76,14 @@ EventScript_16A3D1:: @ 816A3D1
EventScript_16A402:: @ 816A402
checkmoney 50, 0
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16A476
closemessage
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16A455
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16A460
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_16A46B
playse SE_SHOP
takemoney 50, 0
@@ -156,7 +156,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE
goto_if TRUE, EventScript_16A4FF
msgbox gUnknown_8190717
checkitemspace ITEM_OLD_AMBER, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16A4F5
setflag FLAG_GOT_OLD_AMBER
removeobject 4
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825
PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830
checkflag FLAG_DEFEATED_AGATHA
call_if TRUE, EventScript_16284B
compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3
call_if eq, EventScript_162845
end
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+9 -9
View File
@@ -13,7 +13,7 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A
PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5
checkflag FLAG_DEFEATED_BRUNO
call_if TRUE, EventScript_1626C0
compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2
call_if eq, EventScript_1626BA
end
@@ -87,13 +87,13 @@ EventScript_16276E:: @ 816276E
EventScript_162779:: @ 8162779
msgbox gUnknown_8178420
closemessage
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_1627FA
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_1627EF
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_162805
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_162805
release
end
@@ -103,13 +103,13 @@ EventScript_1627B0:: @ 81627B0
call EventScript_1A7506
msgbox gUnknown_8178420
closemessage
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_1627FA
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_1627EF
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_162805
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_162805
release
end
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+10 -10
View File
@@ -7,11 +7,11 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2
PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2
setvar VAR_0x8004, 4
call EventScript_1A75D5
compare_var_to_value VAR_STARTER_MON, 2
compare VAR_STARTER_MON, 2
call_if eq, EventScript_162B1E
compare_var_to_value VAR_STARTER_MON, 1
compare VAR_STARTER_MON, 1
call_if eq, EventScript_162B31
compare_var_to_value VAR_STARTER_MON, 0
compare VAR_STARTER_MON, 0
call_if eq, EventScript_162B44
end
@@ -64,7 +64,7 @@ EventScript_162B76:: @ 8162B76
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_162CBC
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_162C68
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
@@ -116,20 +116,20 @@ EventScript_162C68:: @ 8162C68
end
EventScript_162C6F:: @ 8162C6F
compare_var_to_value VAR_STARTER_MON, 2
compare VAR_STARTER_MON, 2
call_if eq, EventScript_162CC5
compare_var_to_value VAR_STARTER_MON, 1
compare VAR_STARTER_MON, 1
call_if eq, EventScript_162CD0
compare_var_to_value VAR_STARTER_MON, 0
compare VAR_STARTER_MON, 0
call_if eq, EventScript_162CDB
return
EventScript_162C91:: @ 8162C91
compare_var_to_value VAR_STARTER_MON, 2
compare VAR_STARTER_MON, 2
call_if eq, EventScript_162CE6
compare_var_to_value VAR_STARTER_MON, 1
compare VAR_STARTER_MON, 1
call_if eq, EventScript_162CF1
compare_var_to_value VAR_STARTER_MON, 0
compare VAR_STARTER_MON, 0
call_if eq, EventScript_162CFC
return
data/maps/PokemonLeague_LancesRoom/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942
end
PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D
compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4
call_if eq, EventScript_162962
checkflag FLAG_DEFEATED_LANCE
call_if TRUE, EventScript_162968
data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586
PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591
checkflag FLAG_DEFEATED_LORELEI
call_if TRUE, EventScript_1625AC
compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1
call_if eq, EventScript_1625A6
end
data/maps/PokemonTower_1F/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A
lock
faceplayer
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_163272
msgbox gUnknown_8179BFC
release
data/maps/PokemonTower_2F/scripts.inc
+7 -7
View File
@@ -20,9 +20,9 @@ PokemonTower_2F_EventScript_16329B:: @ 816329B
EventScript_1632A7:: @ 81632A7
textcolor 0
playbgm MUS_RIVAL1, 0
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_163339
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16334B
applymovement 1, Movement_1A75DB
waitmovement 0
@@ -30,18 +30,18 @@ EventScript_1632A7:: @ 81632A7
waitmovement 0
msgbox gUnknown_8179CFF
setvar VAR_LAST_TALKED, 1
compare_var_to_value VAR_STARTER_MON, 2
compare VAR_STARTER_MON, 2
call_if eq, EventScript_16335D
compare_var_to_value VAR_STARTER_MON, 1
compare VAR_STARTER_MON, 1
call_if eq, EventScript_163368
compare_var_to_value VAR_STARTER_MON, 0
compare VAR_STARTER_MON, 0
call_if eq, EventScript_163373
msgbox gUnknown_8179DD4
closemessage
playbgm MUS_RIVAL2, 0
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16337E
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_163389
playse SE_KAIDAN
delay 25
data/maps/PokemonTower_6F/scripts.inc
+2 -2
View File
@@ -6,13 +6,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
textcolor 2
msgbox gUnknown_817A2F8
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special ScrSpecial_StartMarowakBattle
waitstate
special sub_8112364
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1634F5
applymovement 255, Movement_163512
waitmovement 0
data/maps/PokemonTower_7F/scripts.inc
+7 -7
View File
@@ -24,11 +24,11 @@ EventScript_1635A1:: @ 81635A1
msgbox gUnknown_817A3AF
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare_var_to_value VAR_0x8004, 10
compare VAR_0x8004, 10
goto_if eq, EventScript_1635E0
compare_var_to_value VAR_0x8004, 11
compare VAR_0x8004, 11
goto_if eq, EventScript_1635F0
compare_var_to_value VAR_0x8004, 9
compare VAR_0x8004, 9
goto_if eq, EventScript_163600
applymovement 2, Movement_16362C
waitmovement 0
@@ -112,9 +112,9 @@ EventScript_163658:: @ 8163658
msgbox gUnknown_817A477
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare_var_to_value VAR_0x8004, 12
compare VAR_0x8004, 12
goto_if eq, EventScript_163699
compare_var_to_value VAR_0x8004, 13
compare VAR_0x8004, 13
goto_if eq, EventScript_1636A9
applymovement 3, Movement_1636C6
waitmovement 0
@@ -177,9 +177,9 @@ EventScript_1636F1:: @ 81636F1
msgbox gUnknown_817A506
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare_var_to_value VAR_0x8004, 10
compare VAR_0x8004, 10
goto_if eq, EventScript_163725
compare_var_to_value VAR_0x8004, 9
compare VAR_0x8004, 9
goto_if eq, EventScript_163735
applymovement 4, Movement_163754
waitmovement 0
data/maps/PowerPlant/scripts.inc
+13 -13
View File
@@ -10,7 +10,7 @@ PowerPlant_MapScript1_16376F:: @ 816376F
EventScript_163779:: @ 8163779
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
@@ -39,7 +39,7 @@ EventScript_1637B4:: @ 81637B4
PowerPlant_EventScript_1637B8:: @ 81637B8
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
@@ -58,11 +58,11 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16381B
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163824
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163824
setflag FLAG_FOUGHT_ZAPDOS
release
@@ -80,7 +80,7 @@ EventScript_163824:: @ 8163824
PowerPlant_EventScript_16382F:: @ 816382F
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
@@ -94,11 +94,11 @@ PowerPlant_EventScript_16382F:: @ 816382F
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_163884
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163884
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163884
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
release
@@ -111,7 +111,7 @@ EventScript_163884:: @ 8163884
PowerPlant_EventScript_16388D:: @ 816388D
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
lock
faceplayer
@@ -125,11 +125,11 @@ PowerPlant_EventScript_16388D:: @ 816388D
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1638E2
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1638E2
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1638E2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
release
data/maps/RockTunnel_1F/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
RockTunnel_1F_MapScripts:: @ 8162DD6
map_script 3, RockTunnel_1F_MapScript1_162DDC
map_script MAP_SCRIPT_ON_TRANSITION, RockTunnel_1F_OnTransition
.byte 0
RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC
RockTunnel_1F_OnTransition:: @ 8162DDC
setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F
end
data/maps/RocketHideout_B4F/scripts.inc
+7 -7
View File
@@ -8,7 +8,7 @@ RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE
call_if eq, EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if eq, EventScript_161311
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if ne, EventScript_16146A
end
@@ -42,7 +42,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363
faceplayer
removeobject 2
giveitem ITEM_SILPH_SCOPE
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
release
end
@@ -66,7 +66,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD
setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
removeobject 4
giveitem ITEM_LIFT_KEY
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
release
end
@@ -82,9 +82,9 @@ EventScript_1613E9:: @ 81613E9
call_if eq, EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if eq, EventScript_161311
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_1614A1
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_161462
release
end
@@ -100,9 +100,9 @@ EventScript_161433:: @ 8161433
call_if eq, EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if eq, EventScript_161311
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_1614A1
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_161462
release
end
data/maps/RocketHideout_Elevator/scripts.inc
+3 -3
View File
@@ -53,7 +53,7 @@ EventScript_161554:: @ 8161554
EventScript_161591:: @ 8161591
setvar VAR_0x8006, 3
setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25
compare_var_to_value VAR_ELEVATOR_FLOOR, 3
compare VAR_ELEVATOR_FLOOR, 3
goto_if eq, EventScript_161609
call EventScript_16160E
setvar VAR_ELEVATOR_FLOOR, 3
@@ -65,7 +65,7 @@ EventScript_1615B8:: @ 81615B8
EventScript_1615B9:: @ 81615B9
setvar VAR_0x8006, 2
setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16
compare_var_to_value VAR_ELEVATOR_FLOOR, 2
compare VAR_ELEVATOR_FLOOR, 2
goto_if eq, EventScript_161609
call EventScript_16160E
setvar VAR_ELEVATOR_FLOOR, 2
@@ -77,7 +77,7 @@ EventScript_1615E0:: @ 81615E0
EventScript_1615E1:: @ 81615E1
setvar VAR_0x8006, 0
setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23
compare_var_to_value VAR_ELEVATOR_FLOOR, 0
compare VAR_ELEVATOR_FLOOR, 0
goto_if eq, EventScript_161609
call EventScript_16160E
setvar VAR_ELEVATOR_FLOOR, 0
data/maps/Route1/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ Route1_EventScript_167EFE:: @ 8167EFE
msgbox gUnknown_818329D
textcolor 3
checkitemspace ITEM_POTION, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
getitemname 1, ITEM_POTION
playfanfare MUS_FANFA1
data/maps/Route10_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -34,17 +34,17 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
goto_if TRUE, EventScript_16FCE7
msgbox gUnknown_819E5FB, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AD1
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16FCF1
compare_var_to_value VAR_0x8006, 20
compare VAR_0x8006, 20
goto_if lt, EventScript_1A7ABD
msgbox gUnknown_819E733
checkitemspace ITEM_EVERSTONE, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AC7
additem ITEM_EVERSTONE, 1
giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE
data/maps/Route11_EastEntrance_2F/scripts.inc
+6 -6
View File
@@ -26,13 +26,13 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
checkflag FLAG_DID_NINA_TRADE
goto_if TRUE, EventScript_16FDCE
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16FDB6
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_16FDB6
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16FDC0
call EventScript_1A8CD9
msgbox gUnknown_81A59DA
@@ -63,17 +63,17 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
checkflag FLAG_GOT_ITEMFINDER
goto_if TRUE, EventScript_16FE5A
msgbox gUnknown_819E9E5, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AD1
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16FE64
compare_var_to_value VAR_0x8006, 30
compare VAR_0x8006, 30
goto_if lt, EventScript_1A7ABD
msgbox gUnknown_819EAE4
checkitemspace ITEM_ITEMFINDER, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AC7
additem ITEM_ITEMFINDER, 1
giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER
data/maps/Route12/scripts.inc
+5 -5
View File
@@ -17,11 +17,11 @@ Route12_EventScript_168014:: @ 8168014
checkflag FLAG_GOT_POKE_FLUTE
goto_if FALSE, EventScript_168099
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
msgbox gUnknown_81853CC, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16808D
call EventScript_1A924B
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
@@ -35,11 +35,11 @@ Route12_EventScript_168014:: @ 8168014
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16808F
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_16808F
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_16808F
release
end
data/maps/Route12_FishingHouse/scripts.inc
+10 -10
View File
@@ -7,7 +7,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
checkflag FLAG_GOT_SUPER_ROD
goto_if TRUE, EventScript_16FF7F
msgbox gUnknown_819EFE0, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_16FF34
msgbox gUnknown_819F1FA
release
@@ -15,7 +15,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
EventScript_16FF34:: @ 816FF34
checkitemspace ITEM_SUPER_ROD, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16FF75
additem ITEM_SUPER_ROD, 1
msgbox gUnknown_819F05B
@@ -32,28 +32,28 @@ EventScript_16FF75:: @ 816FF75
EventScript_16FF7F:: @ 816FF7F
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16FFF5
special GetMagikarpSizeRecordInfo
msgbox gUnknown_819F2DB
special Special_ChooseMonFromParty
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare_var_to_value VAR_RESULT, 6
compare VAR_RESULT, 6
goto_if ge, EventScript_16FFFF
special CompareMagikarpSize
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_170001
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_17000B
compare_var_to_value VAR_RESULT, 3
compare VAR_RESULT, 3
goto_if eq, EventScript_170031
compare_var_to_value VAR_RESULT, 4
compare VAR_RESULT, 4
goto_if eq, EventScript_17001E
release
end
@@ -90,7 +90,7 @@ EventScript_170031:: @ 8170031
setflag FLAG_GOT_RECORD_SETTING_MAGIKARP
msgbox gUnknown_819F31B
giveitem ITEM_NET_BALL
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_17005D
msgbox gUnknown_819F395
release
data/maps/Route12_NorthEntrance_2F/scripts.inc
+3 -3
View File
@@ -15,12 +15,12 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A
checkflag FLAG_GOT_TM27
goto_if TRUE, EventScript_16FF01
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_16FEE5
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16FEEE
checkitemspace ITEM_TM27, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16FEF7
additem ITEM_TM27, 1
giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27
data/maps/Route15_WestEntrance_2F/scripts.inc
+3 -3
View File
@@ -24,17 +24,17 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
checkflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
goto_if TRUE, EventScript_17013B
msgbox gUnknown_819F5AB, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AD1
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_170145
compare_var_to_value VAR_0x8006, 50
compare VAR_0x8006, 50
goto_if lt, EventScript_1A7ABD
msgbox gUnknown_819F6AA
checkitemspace ITEM_EXP_SHARE, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AC7
additem ITEM_EXP_SHARE, 1
giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE
data/maps/Route16/scripts.inc
+6 -6
View File
@@ -14,7 +14,7 @@ EventScript_1680FF:: @ 81680FF
return
Route16_MapScript2_168103:: @ 8168103
compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1
compare VAR_MAP_SCENE_ROUTE16, 1
call_if eq, EventScript_16810F
end
@@ -36,11 +36,11 @@ Route16_EventScript_168121:: @ 8168121
checkflag FLAG_GOT_POKE_FLUTE
goto_if FALSE, EventScript_1681A3
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
msgbox gUnknown_81853CC, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_168197
call EventScript_1A924B
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
@@ -53,11 +53,11 @@ Route16_EventScript_168121:: @ 8168121
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_168199
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_168199
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_168199
release
end
data/maps/Route16_House/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ Route16_House_EventScript_17014F:: @ 817014F
goto_if TRUE, EventScript_1701A5
msgbox gUnknown_819F851
checkitemspace ITEM_HM02, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_17019B
additem ITEM_HM02, 1
giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02
data/maps/Route16_NorthEntrance_1F/scripts.inc
+4 -4
View File
@@ -53,13 +53,13 @@ EventScript_170220:: @ 8170220
applymovement 255, Movement_1A75E9
waitmovement 0
delay 20
compare_var_to_value VAR_0x8008, 1
compare VAR_0x8008, 1
call_if eq, EventScript_170279
compare_var_to_value VAR_0x8008, 2
compare VAR_0x8008, 2
call_if eq, EventScript_170284
compare_var_to_value VAR_0x8008, 3
compare VAR_0x8008, 3
call_if eq, EventScript_17028F
compare_var_to_value VAR_0x8008, 4
compare VAR_0x8008, 4
call_if eq, EventScript_17029A
msgbox gUnknown_819F95F
closemessage
data/maps/Route16_NorthEntrance_2F/scripts.inc
+3 -3
View File
@@ -24,17 +24,17 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
goto_if TRUE, EventScript_170365
msgbox gUnknown_819FB0E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AD1
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_17036F
compare_var_to_value VAR_0x8006, 40
compare VAR_0x8006, 40
goto_if lt, EventScript_1A7ABD
msgbox gUnknown_819FC15
checkitemspace ITEM_AMULET_COIN, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AC7
additem ITEM_AMULET_COIN, 1
giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN
data/maps/Route18/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ Route18_MapScripts:: @ 81681F6
.byte 0
Route18_MapScript1_168201:: @ 8168201
compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1
compare VAR_MAP_SCENE_ROUTE16, 1
call_if eq, EventScript_16820D
end
data/maps/Route18_EastEntrance_1F/scripts.inc
+4 -4
View File
@@ -53,13 +53,13 @@ EventScript_1703D6:: @ 81703D6
applymovement 255, Movement_1A75E9
waitmovement 0
delay 20
compare_var_to_value VAR_0x8008, 1
compare VAR_0x8008, 1
call_if eq, EventScript_17042F
compare_var_to_value VAR_0x8008, 2
compare VAR_0x8008, 2
call_if eq, EventScript_17043A
compare_var_to_value VAR_0x8008, 3
compare VAR_0x8008, 3
call_if eq, EventScript_170445
compare_var_to_value VAR_0x8008, 4
compare VAR_0x8008, 4
call_if eq, EventScript_170450
msgbox gUnknown_819FD0C
closemessage
data/maps/Route18_EastEntrance_2F/scripts.inc
+3 -3
View File
@@ -17,13 +17,13 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
checkflag FLAG_DID_MARC_TRADE
goto_if TRUE, EventScript_1704F0
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1704D8
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_1704D8
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_1704E2
call EventScript_1A8CD9
msgbox gUnknown_81A59DA
data/maps/Route20/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route20_MapScripts:: @ 816823B
map_script 3, Route20_MapScript1_168241
map_script MAP_SCRIPT_ON_TRANSITION, Route20_OnTransition
.byte 0
Route20_MapScript1_168241:: @ 8168241
Route20_OnTransition:: @ 8168241
checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
call_if FALSE, EventScript_168254
checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
data/maps/Route22/scripts.inc
+15 -15
View File
@@ -31,29 +31,29 @@ EventScript_1682BE:: @ 81682BE
textcolor 0
playbgm MUS_RIVAL1, 0
addobject 1
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_168350
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_168350
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_16835B
delay 6
msgbox gUnknown_8188890
compare_var_to_value VAR_STARTER_MON, 2
compare VAR_STARTER_MON, 2
call_if eq, EventScript_16836D
compare_var_to_value VAR_STARTER_MON, 1
compare VAR_STARTER_MON, 1
call_if eq, EventScript_16837C
compare_var_to_value VAR_STARTER_MON, 0
compare VAR_STARTER_MON, 0
call_if eq, EventScript_16838B
msgbox gUnknown_8188974
closemessage
delay 10
playbgm MUS_RIVAL2, 0
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16839A
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16839A
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_1683A5
fadedefaultbgm
removeobject 1
@@ -197,19 +197,19 @@ EventScript_16841F:: @ 816841F
textcolor 0
playbgm MUS_RIVAL1, 0
addobject 1
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_16849C
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_16849C
compare_var_to_value VAR_0x4001, 2
compare VAR_0x4001, 2
call_if eq, EventScript_1684A7
msgbox gUnknown_8188A3C
setvar VAR_LAST_TALKED, 1
compare_var_to_value VAR_STARTER_MON, 2
compare VAR_STARTER_MON, 2
call_if eq, EventScript_1684B9
compare_var_to_value VAR_STARTER_MON, 1
compare VAR_STARTER_MON, 1
call_if eq, EventScript_1684C4
compare_var_to_value VAR_STARTER_MON, 0
compare VAR_STARTER_MON, 0
call_if eq, EventScript_1684CF
msgbox gUnknown_8188B29
closemessage
data/maps/Route24/scripts.inc
+6 -6
View File
@@ -4,11 +4,11 @@ Route24_MapScripts:: @ 816861F
Route24_EventScript_168620:: @ 8168620
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_ROUTE24, 1
compare VAR_MAP_SCENE_ROUTE24, 1
goto_if eq, EventScript_168656
msgbox gUnknown_8188C3C
checkitemspace ITEM_NUGGET, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16864C
call EventScript_1686B9
release
@@ -38,15 +38,15 @@ Route24_EventScript_16866C:: @ 816866C
EventScript_168678:: @ 8168678
textcolor 0
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_1686FD
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_168708
applymovement 255, Movement_1A75EB
waitmovement 0
msgbox gUnknown_8188C3C
checkitemspace ITEM_NUGGET, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_168713
call EventScript_1686B9
releaseall
@@ -80,7 +80,7 @@ EventScript_168713:: @ 8168713
closemessage
applymovement 255, Movement_168743
waitmovement 0
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_168733
release
end
data/maps/Route25_SeaCottage/scripts.inc
+12 -12
View File
@@ -28,9 +28,9 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B
checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE
goto_if TRUE, EventScript_17064A
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_170580
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_17058E
end
@@ -45,18 +45,18 @@ EventScript_17058E:: @ 817058E
end
EventScript_17059C:: @ 817059C
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_170600
msgbox gUnknown_819FFD3
closemessage
delay 10
compare_var_to_value VAR_FACING, 1
compare VAR_FACING, 1
call_if eq, EventScript_17062A
compare_var_to_value VAR_FACING, 2
compare VAR_FACING, 2
call_if eq, EventScript_170635
compare_var_to_value VAR_FACING, 3
compare VAR_FACING, 3
call_if eq, EventScript_170635
compare_var_to_value VAR_FACING, 4
compare VAR_FACING, 4
call_if eq, EventScript_170635
opendoor 10, 3
waitdooranim
@@ -72,9 +72,9 @@ EventScript_17059C:: @ 817059C
EventScript_170600:: @ 8170600
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_170618
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_170621
return
@@ -104,12 +104,12 @@ EventScript_170640:: @ 8170640
EventScript_17064A:: @ 817064A
famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_1706AC
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_1706B5
checkitemspace ITEM_SS_TICKET, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1706BE
additem ITEM_SS_TICKET, 1
giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5
data/maps/Route2_EastBuilding/scripts.inc
+3 -3
View File
@@ -8,17 +8,17 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
checkflag FLAG_GOT_HM05
goto_if TRUE, EventScript_16F701
msgbox gUnknown_819D64F, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AD1
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16F70B
compare_var_to_value VAR_0x8006, 10
compare VAR_0x8006, 10
goto_if lt, EventScript_1A7ABD
msgbox gUnknown_819D74E
checkitemspace ITEM_HM05, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7AC7
additem ITEM_HM05, 1
giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05
data/maps/Route2_House/scripts.inc
+3 -3
View File
@@ -13,13 +13,13 @@ Route2_House_EventScript_16F602:: @ 816F602
checkflag FLAG_DID_MIMIEN_TRADE
goto_if TRUE, EventScript_16F674
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16F65C
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
compare VAR_0x8004, 6
goto_if ge, EventScript_16F65C
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16F666
call EventScript_1A8CD9
msgbox gUnknown_81A59DA

Some files were not shown because too many files have changed in this diff Show More