Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise

This commit is contained in:
Slawter666
2018-10-21 00:20:09 +01:00
422 changed files with 7626 additions and 12999 deletions
-1
View File
@@ -93,4 +93,3 @@ If you've only changed `.c` or `.s` files, you can turn off the dependency scann
`make NODEP=1` `make NODEP=1`
+1 -1
View File
@@ -97,7 +97,7 @@ _081D9EB4:
ldrb r1, [r1] ldrb r1, [r1]
adds r0, 0x2C adds r0, 0x2C
strb r1, [r0] strb r1, [r0]
ldr r0, =0x00000864 ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
bl FlagGet bl FlagGet
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
+2 -2
View File
@@ -7951,7 +7951,7 @@ sub_811EA28: @ 811EA28
bgt _0811EA48 bgt _0811EA48
cmp r0, 0x11 cmp r0, 0x11
blt _0811EA66 blt _0811EA66
ldr r0, =0x00000864 ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
bl FlagGet bl FlagGet
b _0811EA60 b _0811EA60
.pool .pool
@@ -9131,7 +9131,7 @@ _0811F2FE:
adds r3, 0x1 adds r3, 0x1
cmp r3, 0x10 cmp r3, 0x10
ble _0811F2FE ble _0811F2FE
ldr r0, =0x00000864 ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
bl FlagGet bl FlagGet
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -65,7 +65,7 @@
.endm .endm
.macro bg_hidden_item_event x, y, height, item, flag .macro bg_hidden_item_event x, y, height, item, flag
bg_event \x, \y, \height, 7, \item, \flag, 0 bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0
.endm .endm
.macro bg_secret_base_event x, y, height, secret_base_id .macro bg_secret_base_event x, y, height, secret_base_id
+1 -1
View File
@@ -10499,7 +10499,7 @@ sub_81B5958: @ 81B5958
thumb_func_start sub_81B5974 thumb_func_start sub_81B5974
sub_81B5974: @ 81B5974 sub_81B5974: @ 81B5974
push {lr} push {lr}
bl sub_809D1E8 bl TrySetDiveWarp
ldr r1, =gFieldEffectArguments ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
+1 -1
View File
@@ -30184,7 +30184,7 @@ _081D6670:
asrs r0, 1 asrs r0, 1
lsls r0, 1 lsls r0, 1
subs r4, r0 subs r4, r0
ldr r0, =0x00000864 ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
bl FlagGet bl FlagGet
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
+2 -2
View File
@@ -8335,7 +8335,7 @@ _08019C5A:
beq _08019CE6 beq _08019CE6
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
bl plaer_get_pos_including_state_based_drift bl player_get_pos_including_state_based_drift
mov r0, sp mov r0, sp
movs r1, 0 movs r1, 0
ldrsh r2, [r0, r1] ldrsh r2, [r0, r1]
@@ -8881,7 +8881,7 @@ sub_801A064: @ 801A064
adds r5, 0x6 adds r5, 0x6
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl plaer_get_pos_including_state_based_drift bl player_get_pos_including_state_based_drift
lsls r0, r7, 2 lsls r0, r7, 2
adds r0, r7 adds r0, r7
subs r0, 0x38 subs r0, 0x38
+1 -1
View File
@@ -718,7 +718,7 @@ _080E23AC:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
bls _080E23AC bls _080E23AC
ldr r6, =0x00000864 ldr r6, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
adds r0, r6, 0 adds r0, r6, 0
bl FlagGet bl FlagGet
lsls r0, 24 lsls r0, 24
-1821
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
gSelectedEventObject
+1046 -1046
View File
File diff suppressed because it is too large Load Diff
+263 -263
View File
@@ -431,7 +431,7 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/SecretBase_YellowCave3/scripts.inc" .include "data/maps/SecretBase_YellowCave3/scripts.inc"
.include "data/maps/SecretBase_YellowCave4/scripts.inc" .include "data/maps/SecretBase_YellowCave4/scripts.inc"
gUnknown_0823B4BB:: @ 823B4BB EventScript_SecretBasePC:: @ 823B4BB
lockall lockall
playse 2 playse 2
message Text_276805 message Text_276805
@@ -492,7 +492,7 @@ EventScript_23B585:: @ 823B585
special sub_80E9C88 special sub_80E9C88
end end
gUnknown_0823B589:: @ 823B589 EventScript_RecordMixingSecretBasePC:: @ 823B589
lockall lockall
message Text_276805 message Text_276805
playse 2 playse 2
@@ -581,13 +581,13 @@ EventScript_23B680:: @ 823B680
special sub_80EBB28 special sub_80EBB28
end end
gUnknown_0823B684:: @ 823B684 EventScript_SecretBaseSandOrnament:: @ 823B684
special sub_80EBE7C special sub_80EBE7C
dofieldeffect 52 dofieldeffect 52
waitstate waitstate
end end
gUnknown_0823B68C:: @ 823B68C EventScript_SecretBaseShieldOrToyTV:: @ 823B68C
special sub_80FAC78 special sub_80FAC78
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq EventScript_23B6BC goto_eq EventScript_23B6BC
@@ -1070,165 +1070,165 @@ EventScript_27149D:: @ 827149D
return return
EventScript_2715DE:: @ 82715DE EventScript_2715DE:: @ 82715DE
setflag FLAG_0x056 setflag FLAG_LINK_CONTEST_POKE_BALL
setflag FLAG_0x301 setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
setflag FLAG_0x302 setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
setflag FLAG_0x303 setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
setflag FLAG_0x2D1 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_0x379 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
setflag FLAG_0x32B setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL
setflag FLAG_0x32C setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE
setflag FLAG_0x346 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA
setflag FLAG_0x2D6 setflag FLAG_HIDE_PETALBURG_CITY_WALLY
setflag FLAG_0x363 setflag FLAG_UNKNOWN_0x363
setflag FLAG_0x2DB setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT
setflag FLAG_0x2DC setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setflag FLAG_0x32E setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
setflag FLAG_0x34C setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
setflag FLAG_0x364 setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
setflag FLAG_0x2E3 setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
setflag FLAG_0x371 setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setflag FLAG_0x2E2 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_0x2E4 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_0x2E5 setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
setflag FLAG_0x2E7 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_0x2E8 setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_0x38A setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
setflag FLAG_0x345 setflag FLAG_HIDE_ROUTE_110_BIRCH
setflag FLAG_0x306 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1
setflag FLAG_0x37F setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2
setflag FLAG_0x308 setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
setflag FLAG_0x309 setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
setflag FLAG_0x30A setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
setflag FLAG_0x30B setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
setflag FLAG_0x30C setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
setflag FLAG_0x30D setflag FLAG_HIDE_PETALBURG_GYM_GREETER
setflag FLAG_0x338 setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
setflag FLAG_0x2E9 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
setflag FLAG_0x2EA setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
setflag FLAG_0x2F8 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
setflag FLAG_0x2D2 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
setflag FLAG_0x2DE setflag FLAG_HIDE_PLAYERS_HOUSE_DAD
setflag FLAG_0x351 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
setflag FLAG_0x32F setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
setflag FLAG_HIDE_FANCLUB_OLD_LADY setflag FLAG_HIDE_FANCLUB_OLD_LADY
setflag FLAG_HIDE_FANCLUB_BOY setflag FLAG_HIDE_FANCLUB_BOY
setflag FLAG_HIDE_FANCLUB_LITTLE_BOY setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
setflag FLAG_HIDE_FANCLUB_LADY setflag FLAG_HIDE_FANCLUB_LADY
setflag FLAG_0x2DA setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
setflag FLAG_0x31D setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
setflag FLAG_0x31E setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
setflag FLAG_0x31F setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
setflag FLAG_0x385 setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
setflag FLAG_0x386 setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
setflag FLAG_0x387 setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
setflag FLAG_0x388 setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
setflag FLAG_0x323 setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
setflag FLAG_0x322 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
setflag FLAG_0x326 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
setflag FLAG_0x328 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
setflag FLAG_0x329 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
setflag FLAG_0x3D8 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
setflag FLAG_0x2FE setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
setflag FLAG_0x33E setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
setflag FLAG_0x362 setflag FLAG_HIDE_PETALBURG_GYM_WALLY
setflag FLAG_0x365 setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
setflag FLAG_0x33C setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
setflag FLAG_0x33D setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
setflag FLAG_0x33F setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
setflag FLAG_0x35B setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
setflag FLAG_0x355 setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1
setflag FLAG_0x349 setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
setflag FLAG_0x34D setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
setflag FLAG_0x34E setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
setflag FLAG_0x35C setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
setflag FLAG_0x35D setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
setflag FLAG_0x343 setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
setflag FLAG_0x348 setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
setflag FLAG_0x350 setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
setflag FLAG_0x353 setflag FLAG_HIDE_ROUTE_119_RIVAL
setflag FLAG_0x312 setflag FLAG_HIDE_ROUTE_119_SCOTT
setflag FLAG_0x3CD setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
setflag FLAG_0x330 setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
setflag FLAG_0x366 setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
setflag FLAG_0x368 setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
setflag FLAG_0x36D setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
setflag FLAG_0x3E2 setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
setflag FLAG_0x36F setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
setflag FLAG_0x37B setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
setflag FLAG_0x370 setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
setflag FLAG_0x36E setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
setflag FLAG_0x327 setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
setflag FLAG_0x3D7 setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
setflag FLAG_0x376 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE
setflag FLAG_0x374 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1
setflag FLAG_0x375 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2
setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
setflag FLAG_0x378 setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
setflag FLAG_0x2F0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setflag FLAG_0x2F5 setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
setflag FLAG_0x31A setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
setflag FLAG_0x31B setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
setflag FLAG_0x37C setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
setflag FLAG_0x380 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_0x381 setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_0x382 setflag FLAG_HIDE_ROUTE_103_BIRCH
setflag FLAG_0x38D setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR
setflag FLAG_0x2EC setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER
setflag FLAG_0x38E setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
setflag FLAG_0x38F setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
setflag FLAG_0x393 setflag FLAG_0x393
setflag FLAG_0x358 setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
setflag FLAG_0x2FD setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT
setflag FLAG_0x398 setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
setflag FLAG_0x399 setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH
setflag FLAG_0x39A setflag FLAG_HIDE_ROUTE_110_RIVAL_2
setflag FLAG_0x39B setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
setflag FLAG_0x2CF setflag FLAG_HIDE_ROUTE_104_RIVAL
setflag FLAG_0x39D setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
setflag FLAG_0x3A1 setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
setflag FLAG_0x3A2 setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
setflag FLAG_0x3A6 setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
setflag FLAG_0x3AA setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
setflag FLAG_0x3AC setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
setflag FLAG_0x3A0 setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
setflag FLAG_0x3E0 setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
setflag FLAG_0x342 setflag FLAG_HIDE_ROUTE_128_STEVEN
setflag FLAG_0x3B0 setflag FLAG_HIDE_ROUTE_128_ARCHIE
setflag FLAG_0x3B1 setflag FLAG_HIDE_ROUTE_128_MAXIE
setflag FLAG_0x3B3 setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
setflag FLAG_0x3B4 setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
setflag FLAG_0x2ED setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT
setflag FLAG_0x35A setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
setflag FLAG_0x2EF setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
setflag FLAG_0x3B6 setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
setflag FLAG_0x3C7 setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
setflag FLAG_0x3C8 setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
setflag FLAG_0x2D7 setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
setflag FLAG_0x3D3 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
setflag FLAG_0x3DF setflag FLAG_HIDE_ROUTE_101_BOY
setflag FLAG_0x3E3 setflag FLAG_HIDE_PETALBURG_CITY_SCOTT
setflag FLAG_0x3E4 setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA
setflag FLAG_0x3E5 setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE
setflag FLAG_0x3E6 setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON
setflag FLAG_0x356 setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
setflag FLAG_0x33A setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
setflag FLAG_0x33B setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
setflag FLAG_0x36C setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
setflag FLAG_0x36B setflag FLAG_HIDE_ROUTE_111_DESERT_RIVAL
setflag FLAG_0x36A setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
setflag FLAG_0x337 setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
setflag FLAG_0x2F4 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
setflag FLAG_0x35E setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
setflag FLAG_0x35F setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
setflag FLAG_0x340 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
setflag FLAG_0x2FB setflag FLAG_HIDE_DEOXYS
setflag FLAG_0x2EB setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
setflag FLAG_0x2FF setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
setflag FLAG_0x319 setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
setflag FLAG_0x357 setflag FLAG_HIDE_SKY_PILLAR_WALLACE
setflag FLAG_0x050 setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
call EventScript_27149D call EventScript_27149D
end end
@@ -1238,26 +1238,26 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
call EverGrandeCity_HallOfFame_EventScript_271829 call EverGrandeCity_HallOfFame_EventScript_271829
compare VAR_0x40CC, 0 compare VAR_0x40CC, 0
call_if 1, EverGrandeCity_HallOfFame_EventScript_271839 call_if 1, EverGrandeCity_HallOfFame_EventScript_271839
clearflag FLAG_0x39D clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
call EverGrandeCity_HallOfFame_EventScript_2718CC call EverGrandeCity_HallOfFame_EventScript_2718CC
setflag FLAG_0x365 setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
clearflag FLAG_0x3B6 clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
clearflag FLAG_0x2D7 clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
setvar VAR_0x40C6, 2 setvar VAR_0x40C6, 2
setflag FLAG_0x35A setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
clearflag FLAG_0x2EF clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
clearflag FLAG_0x35C clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
clearflag FLAG_0x35D clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
setflag FLAG_0x2CD setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
clearflag FLAG_0x2EB clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
setflag FLAG_0x3CB setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL
special sub_813BA60 special sub_813BA60
checkflag FLAG_0x123 checkflag FLAG_0x123
call_if 0, EverGrandeCity_HallOfFame_EventScript_271843 call_if 0, EverGrandeCity_HallOfFame_EventScript_271843
checkflag FLAG_0x12A checkflag FLAG_0x12A
call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F
setflag FLAG_0x2F8 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
setflag FLAG_0x2D2 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
compare VAR_0x40D3, 0 compare VAR_0x40D3, 0
call_if 1, EverGrandeCity_HallOfFame_EventScript_271851 call_if 1, EverGrandeCity_HallOfFame_EventScript_271851
return return
@@ -1275,13 +1275,13 @@ EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839
return return
EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
clearflag FLAG_0x3C8 clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
return return
EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
setvar VAR_0x4082, 3 setvar VAR_0x4082, 3
setvar VAR_0x408C, 3 setvar VAR_0x408C, 3
clearflag FLAG_0x2DE clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
return return
EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
@@ -1303,35 +1303,35 @@ EventScript_271862:: @ 8271862
end end
EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
setflag FLAG_0x2E4 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_0x2E7 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_0x2E5 setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
setflag FLAG_0x2E8 setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
clearflag FLAG_0x2E6 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
clearflag FLAG_0x2E3 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_0x371 clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
end end
EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
setflag FLAG_0x2E5 setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
setflag FLAG_0x2E8 setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_0x2E2 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_0x2E6 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_0x2E3 setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
setflag FLAG_0x371 setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
clearflag FLAG_0x2E4 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
clearflag FLAG_0x2E7 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
end end
EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3 EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3
setflag FLAG_0x2E2 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_0x2E6 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_0x2E3 setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
setflag FLAG_0x371 setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setflag FLAG_0x2E4 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_0x2E7 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
clearflag FLAG_0x2E5 clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
clearflag FLAG_0x2E8 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
end end
EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC
@@ -1355,11 +1355,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27374E goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27374E
checkflag FLAG_0x4F4 checkflag FLAG_0x4F4
goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E
checkflag FLAG_0x2E6 checkflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C
checkflag FLAG_0x2E4 checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912
checkflag FLAG_0x2E5 checkflag FLAG_HIDE_ROUTE_108_MR_BRINEY
goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918
return return
@@ -1685,7 +1685,7 @@ EventScript_271CA1:: @ 8271CA1
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
return return
EventScript_271CB7:: @ 8271CB7 EventScript_HiddenItemScript:: @ 8271CB7
lockall lockall
waitse waitse
giveitem VAR_0x8005, 1 giveitem VAR_0x8005, 1
@@ -1761,7 +1761,7 @@ EventScript_271D89:: @ 8271D89
release release
end end
EventScript_271D92:: @ 8271D92 EventScript_PC:: @ 8271D92
lockall lockall
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special DoPCTurnOnEffect special DoPCTurnOnEffect
@@ -1884,7 +1884,7 @@ DewfordTown_Gym_EventScript_271E84:: @ 8271E84
LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84 LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84
MauvilleCity_Gym_EventScript_271E84:: @ 8271E84 MauvilleCity_Gym_EventScript_271E84:: @ 8271E84
RustboroCity_Gym_EventScript_271E84:: @ 8271E84 RustboroCity_Gym_EventScript_271E84:: @ 8271E84
clearflag FLAG_0x30D clearflag FLAG_HIDE_PETALBURG_GYM_GREETER
setflag FLAG_0x128 setflag FLAG_0x128
return return
@@ -1902,7 +1902,7 @@ Route109_EventScript_271E95:: @ 8271E95
setvar VAR_0x4096, 0 setvar VAR_0x4096, 0
return return
EventScript_271EA0:: @ 8271EA0 EventScript_UseSurf:: @ 8271EA0
checkpartymove MOVE_SURF checkpartymove MOVE_SURF
compare VAR_RESULT, 6 compare VAR_RESULT, 6
goto_eq EventScript_271ED6 goto_eq EventScript_271ED6
@@ -2201,7 +2201,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083
fadescreen 0 fadescreen 0
return return
EventScript_27208F:: @ 827208F EventScript_RegionMap:: @ 827208F
lockall lockall
msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4 msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4
fadescreen 1 fadescreen 1
@@ -2250,24 +2250,24 @@ Route103_EventScript_2720AD:: @ 82720AD
return return
Route101_EventScript_27211A:: @ 827211A Route101_EventScript_27211A:: @ 827211A
clearflag FLAG_0x2D1 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
clearflag FLAG_0x380 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_0x381 setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_0x382 setflag FLAG_HIDE_ROUTE_103_BIRCH
return return
Route101_EventScript_272127:: @ 8272127 Route101_EventScript_272127:: @ 8272127
clearflag FLAG_0x381 clearflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_0x2D1 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_0x380 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_0x382 setflag FLAG_HIDE_ROUTE_103_BIRCH
return return
Route101_EventScript_272134:: @ 8272134 Route101_EventScript_272134:: @ 8272134
clearflag FLAG_0x382 clearflag FLAG_HIDE_ROUTE_103_BIRCH
setflag FLAG_0x381 setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_0x2D1 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_0x380 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
return return
LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141
@@ -2341,22 +2341,22 @@ SlateportCity_Harbor_Movement_2721F0: @ 82721F0
step_end step_end
PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
setflag FLAG_0x2E4 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_0x2E7 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_0x2E5 setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
setflag FLAG_0x2E8 setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_0x2E2 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_0x2E6 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_0x2E3 setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
setflag FLAG_0x371 setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setvar VAR_0x4096, 0 setvar VAR_0x4096, 0
return return
RusturfTunnel_EventScript_272216:: @ 8272216 RusturfTunnel_EventScript_272216:: @ 8272216
removeobject 1 removeobject 1
removeobject 10 removeobject 10
clearflag FLAG_0x328 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN
clearflag FLAG_0x3D8 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN
setvar VAR_RUSTURF_TUNNEL_STATE, 6 setvar VAR_RUSTURF_TUNNEL_STATE, 6
setflag FLAG_RUSTURF_TUNNEL_OPENED setflag FLAG_RUSTURF_TUNNEL_OPENED
return return
@@ -3074,31 +3074,31 @@ Movement_2725CB:: @ 82725CB
walk_up walk_up
step_end step_end
EventScript_2725CE:: @ 82725CE EventScript_PictureBookShelf:: @ 82725CE
msgbox Text_2A81E5, 3 msgbox Text_2A81E5, 3
end end
EventScript_2725D7:: @ 82725D7 EventScript_BookShelf:: @ 82725D7
msgbox Text_2A820D, 3 msgbox Text_2A820D, 3
end end
EventScript_2725E0:: @ 82725E0 EventScript_PokemonCenterBookshelf:: @ 82725E0
msgbox Text_2A8232, 3 msgbox Text_2A8232, 3
end end
EventScript_2725E9:: @ 82725E9 EventScript_Vase:: @ 82725E9
msgbox Text_2A8276, 3 msgbox Text_2A8276, 3
end end
EventScript_2725F2:: @ 82725F2 EventScript_TrashCan:: @ 82725F2
msgbox Text_2A82B3, 3 msgbox Text_2A82B3, 3
end end
EventScript_2725FB:: @ 82725FB EventScript_ShopShelf:: @ 82725FB
msgbox Text_2A82BF, 3 msgbox Text_2A82BF, 3
end end
EventScript_272604:: @ 8272604 EventScript_Blueprint:: @ 8272604
msgbox Text_2A82F7, 3 msgbox Text_2A82F7, 3
end end
@@ -3322,7 +3322,7 @@ EventScript_2736B3:: @ 82736B3
msgbox gUnknown_08272C98, 3 msgbox gUnknown_08272C98, 3
end end
EventScript_2736BC:: @ 82736BC EventScript_Poison:: @ 82736BC
lockall lockall
special ExecuteWhiteOut special ExecuteWhiteOut
waitstate waitstate
@@ -3565,7 +3565,7 @@ RustboroCity_DevonCorp_2F_EventScript_273811:: @ 8273811
release release
end end
EventScript_27381B:: @ 827381B EventScript_Questionnaire:: @ 827381B
lockall lockall
msgbox gUnknown_0827339F, 5 msgbox gUnknown_0827339F, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -4536,7 +4536,7 @@ EventScript_275B5B:: @ 8275B5B
closemessage closemessage
playse SE_KAIDAN playse SE_KAIDAN
setvar VAR_0x4097, 0 setvar VAR_0x4097, 0
setflag FLAG_0x0AD setflag FLAG_DECORATION_0
special sub_80E8E18 special sub_80E8E18
special sub_80E9068 special sub_80E9068
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
@@ -4577,14 +4577,14 @@ EventScript_275BB7:: @ 8275BB7
special sub_80E9744 special sub_80E9744
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq EventScript_275BDB goto_eq EventScript_275BDB
clearflag FLAG_0x0AD clearflag FLAG_DECORATION_0
special sub_80E9068 special sub_80E9068
setvar VAR_0x4089, 0 setvar VAR_0x4089, 0
waitstate waitstate
end end
EventScript_275BDB:: @ 8275BDB EventScript_275BDB:: @ 8275BDB
setflag FLAG_0x0AD setflag FLAG_DECORATION_0
special sub_80E9068 special sub_80E9068
setvar VAR_0x4089, 0 setvar VAR_0x4089, 0
waitstate waitstate
@@ -4655,20 +4655,20 @@ EventScript_275CDE:: @ 8275CDE
LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1
LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1
SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1
setflag FLAG_0x0AE setflag FLAG_DECORATION_1
setflag FLAG_0x0AF setflag FLAG_DECORATION_2
setflag FLAG_0x0B0 setflag FLAG_DECORATION_3
setflag FLAG_0x0B1 setflag FLAG_DECORATION_4
setflag FLAG_0x0B2 setflag FLAG_DECORATION_5
setflag FLAG_0x0B3 setflag FLAG_DECORATION_6
setflag FLAG_0x0B4 setflag FLAG_DECORATION_7
setflag FLAG_0x0B5 setflag FLAG_DECORATION_8
setflag FLAG_0x0B6 setflag FLAG_DECORATION_9
setflag FLAG_0x0B7 setflag FLAG_DECORATION_10
setflag FLAG_0x0B8 setflag FLAG_DECORATION_11
setflag FLAG_0x0B9 setflag FLAG_DECORATION_12
setflag FLAG_0x0BA setflag FLAG_DECORATION_13
setflag FLAG_0x0BB setflag FLAG_DECORATION_14
return return
EventScript_275D0C:: @ 8275D0C EventScript_275D0C:: @ 8275D0C
@@ -5680,7 +5680,7 @@ SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F
LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59
lock lock
faceplayer faceplayer
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 goto_eq LilycoveCity_ContestLobby_EventScript_28CB21
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
special InterviewBefore special InterviewBefore
@@ -5726,7 +5726,7 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0
msgbox LilycoveCity_ContestLobby_Text_27F0EC, 4 msgbox LilycoveCity_ContestLobby_Text_27F0EC, 4
setflag FLAG_0x002 setflag FLAG_TEMP_2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
goto LilycoveCity_ContestLobby_EventScript_28C7E9 goto LilycoveCity_ContestLobby_EventScript_28C7E9
end end
@@ -5753,7 +5753,7 @@ LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B
end end
LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91
clearflag FLAG_0x322 clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
return return
LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95
@@ -5762,7 +5762,7 @@ LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95
BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
lock lock
faceplayer faceplayer
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special InterviewBefore special InterviewBefore
@@ -5814,7 +5814,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70
msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, 4 msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, 4
setflag FLAG_0x002 setflag FLAG_TEMP_2
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9
@@ -5837,11 +5837,11 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84
special InterviewBefore special InterviewBefore
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
clearflag FLAG_0x396 clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER
return return
BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6
setflag FLAG_0x396 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
return return
.include "data/scripts/gabby_and_ty.inc" .include "data/scripts/gabby_and_ty.inc"
@@ -5859,7 +5859,7 @@ EventScript_2926F8:: @ 82926F8
.include "data/scripts/players_house.inc" .include "data/scripts/players_house.inc"
EventScript_292DE5:: @ 8292DE5 EventScript_RunningShoesManual:: @ 8292DE5
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, 3 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, 3
end end
@@ -6010,7 +6010,7 @@ MirageTower_3F_MapScript2_2A8327: @ 82A8327
MtPyre_2F_MapScript2_2A8327: @ 82A8327 MtPyre_2F_MapScript2_2A8327: @ 82A8327
SkyPillar_2F_MapScript2_2A8327: @ 82A8327 SkyPillar_2F_MapScript2_2A8327: @ 82A8327
SkyPillar_4F_MapScript2_2A8327: @ 82A8327 SkyPillar_4F_MapScript2_2A8327: @ 82A8327
map_script_2 VAR_ICE_STEP_COUNT, 0, gUnknown_082A8337 map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
.2byte 0 .2byte 0
GraniteCave_B1F_MapScript1_2A8331: @ 82A8331 GraniteCave_B1F_MapScript1_2A8331: @ 82A8331
@@ -6020,7 +6020,7 @@ MtPyre_2F_MapScript1_2A8331: @ 82A8331
copyvar VAR_ICE_STEP_COUNT, 0x1 copyvar VAR_ICE_STEP_COUNT, 0x1
end end
gUnknown_082A8337:: @ 82A8337 EventScript_FallDownHole:: @ 82A8337
lockall lockall
delay 20 delay 20
applymovement 255, GraniteCave_B1F_Movement_2A8369 applymovement 255, GraniteCave_B1F_Movement_2A8369
@@ -11691,7 +11691,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF
.2byte 0 .2byte 0
TrainerHill_1F_EventScript_2C8393:: @ 82C8393 EventScript_TrainerHillTimer:: @ 82C8393
lockall lockall
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
special sp194_trainer_tower special sp194_trainer_tower
@@ -1,6 +1,6 @@
AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY
AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
@@ -4,12 +4,12 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2
lock lock
faceplayer faceplayer
checkflag FLAG_0x126 checkflag FLAG_TRADED_SCANNER_TO_STERN
goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
checkitem ITEM_SCANNER, 1 checkitem ITEM_SCANNER, 1
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 goto_eq AbandonedShip_CaptainsOffice_EventScript_238810
checkflag FLAG_0x436 checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
msgbox AbandonedShip_CaptainsOffice_Text_238824, 4 msgbox AbandonedShip_CaptainsOffice_Text_238824, 4
release release
@@ -1,8 +1,8 @@
AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18
object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE
AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -16,10 +16,10 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31 bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY
bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32 bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY
bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33 bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY
bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34 bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY
bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+1 -1
View File
@@ -1,5 +1,5 @@
AbandonedShip_Room_B1F_EventObjects: @ 853697C AbandonedShip_Room_B1F_EventObjects: @ 853697C
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13
AbandonedShip_Room_B1F_MapWarps: @ 8536994 AbandonedShip_Room_B1F_MapWarps: @ 8536994
warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+1 -1
View File
@@ -1,7 +1,7 @@
AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE
object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
@@ -1,6 +1,6 @@
AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL
AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+1 -1
View File
@@ -1,6 +1,6 @@
AbandonedShip_Rooms_1F_EventObjects: @ 8536764 AbandonedShip_Rooms_1F_EventObjects: @ 8536764
object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL
object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
+1 -1
View File
@@ -1,6 +1,6 @@
AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE
AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+1 -1
View File
@@ -1,5 +1,5 @@
AncientTomb_EventObjects: @ 8536CDC AncientTomb_EventObjects: @ 8536CDC
object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937 object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL
AncientTomb_MapWarps: @ 8536CF4 AncientTomb_MapWarps: @ 8536CF4
warp_def 8, 29, 3, 0, MAP_ROUTE120 warp_def 8, 29, 3, 0, MAP_ROUTE120
+1 -1
View File
@@ -23,7 +23,7 @@ AncientTomb_MapScript1_238FE1: @ 8238FE1
end end
AncientTomb_EventScript_238FEE:: @ 8238FEE AncientTomb_EventScript_238FEE:: @ 8238FEE
clearflag FLAG_0x3A9 clearflag FLAG_HIDE_REGISTEEL
return return
AncientTomb_MapScript1_238FF2: @ 8238FF2 AncientTomb_MapScript1_238FF2: @ 8238FF2
+3 -3
View File
@@ -1,7 +1,7 @@
AquaHideout_1F_EventObjects: @ 8535304 AquaHideout_1F_EventObjects: @ 8535304
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821 object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
AquaHideout_1F_MapWarps: @ 853534C AquaHideout_1F_MapWarps: @ 853534C
warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
+9 -9
View File
@@ -1,13 +1,13 @@
AquaHideout_B1F_EventObjects: @ 8535378 AquaHideout_B1F_EventObjects: @ 8535378
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924 object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924 object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR
object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET
object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
AquaHideout_B1F_MapWarps: @ 8535450 AquaHideout_B1F_MapWarps: @ 8535450
warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
+2 -2
View File
@@ -23,11 +23,11 @@ AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
end end
AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
clearflag FLAG_0x3D1 clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
return return
AquaHideout_B1F_EventScript_2339E7:: @ 82339E7 AquaHideout_B1F_EventScript_2339E7:: @ 82339E7
clearflag FLAG_0x3D2 clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
return return
AquaHideout_B1F_EventScript_2339EB:: @ 82339EB AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
+6 -6
View File
@@ -1,10 +1,10 @@
AquaHideout_B2F_EventObjects: @ 853552C AquaHideout_B2F_EventObjects: @ 853552C
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924 object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924 object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL
object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943 object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW
object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924 object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
AquaHideout_B2F_MapWarps: @ 85355BC AquaHideout_B2F_MapWarps: @ 85355BC
warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
+1 -1
View File
@@ -48,7 +48,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25
waitmovement 0 waitmovement 0
msgbox AquaHideout_B2F_Text_233FF2, 4 msgbox AquaHideout_B2F_Text_233FF2, 4
setflag FLAG_0x070 setflag FLAG_0x070
setflag FLAG_0x354 setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
release release
end end
+1 -1
View File
@@ -1,5 +1,5 @@
ArtisanCave_1F_EventObjects: @ 8537774 ArtisanCave_1F_EventObjects: @ 8537774
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS
ArtisanCave_1F_MapWarps: @ 853778C ArtisanCave_1F_MapWarps: @ 853778C
warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+5 -5
View File
@@ -1,15 +1,15 @@
ArtisanCave_B1F_EventObjects: @ 8537708 ArtisanCave_B1F_EventObjects: @ 8537708
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP
ArtisanCave_B1F_MapWarps: @ 8537720 ArtisanCave_B1F_MapWarps: @ 8537720
warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F
ArtisanCave_B1F_MapBGEvents: @ 8537730 ArtisanCave_B1F_MapBGEvents: @ 8537730
bg_hidden_item_event 32, 29, 0, ITEM_ZINC, 102 bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC
bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101 bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM
bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103 bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN
bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104 bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON
ArtisanCave_B1F_MapEvents:: @ 8537760 ArtisanCave_B1F_MapEvents:: @ 8537760
map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
@@ -219,17 +219,17 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B
checkflag FLAG_0x001 checkflag FLAG_TEMP_1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4
setflag FLAG_0x001 setflag FLAG_TEMP_1
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0
checkflag FLAG_0x001 checkflag FLAG_TEMP_1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4
setflag FLAG_0x001 setflag FLAG_TEMP_1
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
@@ -1,8 +1,8 @@
BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
@@ -220,7 +220,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283 BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
closemessage closemessage
clearflag FLAG_0x002 clearflag FLAG_TEMP_2
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
waitmovement 0 waitmovement 0
@@ -349,7 +349,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
return return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
multichoice 19, 6, 105, 1 multichoice 19, 6, 105, 1
switch VAR_RESULT switch VAR_RESULT
@@ -387,7 +387,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
setflag FLAG_0x002 setflag FLAG_TEMP_2
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
end end
@@ -3,8 +3,8 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER
object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, 701 object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0
@@ -19,7 +19,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1
BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
clearflag FLAG_0x2BD clearflag FLAG_HIDE_APPRENTICE
setvar VAR_0x8004, 23 setvar VAR_0x8004, 23
special CallApprenticeFunction special CallApprenticeFunction
@@ -27,7 +27,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
end end
BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1 BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1
setflag FLAG_0x2BD setflag FLAG_HIDE_APPRENTICE
goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0 goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0
BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
@@ -1,13 +1,13 @@
BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
@@ -13,14 +13,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
checkflag FLAG_0x152 checkflag FLAG_0x152
goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
clearflag FLAG_0x2C7 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
clearflag FLAG_0x2C8 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
clearflag FLAG_0x2C9 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
clearflag FLAG_0x2CA clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
clearflag FLAG_0x2CB clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
clearflag FLAG_0x2CC clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
setflag FLAG_0x360 setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
setflag FLAG_0x361 setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_8161F74 special sub_8161F74
end end
@@ -12,7 +12,7 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10
object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0
object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0
object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0
object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842 object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0
object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0
object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0
@@ -17,13 +17,13 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
setvar VAR_0x40BC, 0 setvar VAR_0x40BC, 0
setflag FLAG_0x396 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
checkflag FLAG_0x1C6 checkflag FLAG_0x1C6
call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F
end end
BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
clearflag FLAG_0x34A clearflag FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
return return
BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43 BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43
@@ -4,7 +4,7 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
setvar VAR_0x40BC, 0 setvar VAR_0x40BC, 0
setflag FLAG_0x396 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
end end
BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0
@@ -2,7 +2,7 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0
object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F
@@ -2,7 +2,7 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0
object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0
object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 836 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT
object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0
BattleFrontier_ReceptionGate_MapWarps: @ 853D498 BattleFrontier_ReceptionGate_MapWarps: @ 853D498
@@ -4,11 +4,11 @@ BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7
BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8 BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8
lock lock
faceplayer faceplayer
checkflag FLAG_0x004 checkflag FLAG_TEMP_4
goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA
checkflag FLAG_0x003 checkflag FLAG_TEMP_3
goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
goto_eq BattleFrontier_ScottsHouse_EventScript_263939 goto_eq BattleFrontier_ScottsHouse_EventScript_263939
goto BattleFrontier_ScottsHouse_EventScript_2636CB goto BattleFrontier_ScottsHouse_EventScript_2636CB
end end
@@ -51,7 +51,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0
setflag FLAG_0x05C setflag FLAG_0x05C
setflag FLAG_0x004 setflag FLAG_TEMP_4
release release
end end
@@ -75,7 +75,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0
setflag FLAG_0x1D2 setflag FLAG_0x1D2
setflag FLAG_0x004 setflag FLAG_TEMP_4
release release
end end
@@ -138,7 +138,7 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0
setflag FLAG_0x0ED setflag FLAG_0x0ED
setflag FLAG_0x003 setflag FLAG_TEMP_3
goto BattleFrontier_ScottsHouse_EventScript_2638AA goto BattleFrontier_ScottsHouse_EventScript_2638AA
end end
@@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0
setflag FLAG_0x0EE setflag FLAG_0x0EE
setflag FLAG_0x003 setflag FLAG_TEMP_3
goto BattleFrontier_ScottsHouse_EventScript_2638AA goto BattleFrontier_ScottsHouse_EventScript_2638AA
end end
@@ -244,7 +244,7 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9 msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4 msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4
setflag FLAG_0x1D1 setflag FLAG_0x1D1
setflag FLAG_0x002 setflag FLAG_TEMP_2
release release
end end
+2 -2
View File
@@ -1,6 +1,6 @@
BirthIsland_Exterior_EventObjects: @ 853D7DC BirthIsland_Exterior_EventObjects: @ 853D7DC
object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 763 object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS
BirthIsland_Exterior_MapWarps: @ 853D80C BirthIsland_Exterior_MapWarps: @ 853D80C
warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR
+3 -3
View File
@@ -20,14 +20,14 @@ BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
end end
BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
setflag FLAG_0x2FB setflag FLAG_HIDE_DEOXYS
setflag FLAG_0x2FC setflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
return return
BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
checkflag FLAG_0x1AC checkflag FLAG_0x1AC
goto_eq BirthIsland_Exterior_EventScript_27374E goto_eq BirthIsland_Exterior_EventScript_27374E
clearflag FLAG_0x2FC clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
clearflag FLAG_0x8D4 clearflag FLAG_0x8D4
return return
+1 -1
View File
@@ -1,5 +1,5 @@
CaveOfOrigin_B1F_EventObjects: @ 8535DD0 CaveOfOrigin_B1F_EventObjects: @ 8535DD0
object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE
CaveOfOrigin_B1F_MapWarps: @ 8535DE8 CaveOfOrigin_B1F_MapWarps: @ 8535DE8
warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F
+1 -1
View File
@@ -54,7 +54,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D
setflag FLAG_0x137 setflag FLAG_0x137
setvar VAR_0x405E, 3 setvar VAR_0x405E, 3
removeobject 1 removeobject 1
clearflag FLAG_0x357 clearflag FLAG_HIDE_SKY_PILLAR_WALLACE
fadescreen 0 fadescreen 0
release release
end end
+1 -1
View File
@@ -1,5 +1,5 @@
DesertRuins_EventObjects: @ 8534354 DesertRuins_EventObjects: @ 8534354
object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK
DesertRuins_MapWarps: @ 853436C DesertRuins_MapWarps: @ 853436C
warp_def 8, 29, 3, 1, MAP_ROUTE111 warp_def 8, 29, 3, 1, MAP_ROUTE111
+1 -1
View File
@@ -37,7 +37,7 @@ DesertRuins_MapScript1_22D9CA: @ 822D9CA
end end
DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9D7:: @ 822D9D7
clearflag FLAG_0x3A7 clearflag FLAG_HIDE_REGIROCK
return return
DesertRuins_EventScript_22D9DB:: @ 822D9DB DesertRuins_EventScript_22D9DB:: @ 822D9DB
+1 -1
View File
@@ -1,5 +1,5 @@
DesertUnderpass_EventObjects: @ 85376D4 DesertUnderpass_EventObjects: @ 85376D4
object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874 object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
DesertUnderpass_MapWarps: @ 85376EC DesertUnderpass_MapWarps: @ 85376EC
warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
+2 -2
View File
@@ -1,8 +1,8 @@
DewfordTown_EventObjects: @ 8527964 DewfordTown_EventObjects: @ 8527964
object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0
object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0
object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 743 object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0
DewfordTown_MapWarps: @ 85279DC DewfordTown_MapWarps: @ 85279DC
+7 -7
View File
@@ -135,10 +135,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
applymovement 255, DewfordTown_Movement_1E9914 applymovement 255, DewfordTown_Movement_1E9914
waitmovement 0 waitmovement 0
showobjectat 255, MAP_ROUTE104 showobjectat 255, MAP_ROUTE104
clearflag FLAG_0x2E3 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_0x371 clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
clearflag FLAG_0x2E6 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_0x2E7 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN
setvar VAR_0x408E, 2 setvar VAR_0x408E, 2
resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 255, MAP_DEWFORD_TOWN
@@ -171,10 +171,10 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
setobjectpriority 2, MAP_ROUTE109, 0 setobjectpriority 2, MAP_ROUTE109, 0
applymovement 2, DewfordTown_Movement_1E991F applymovement 2, DewfordTown_Movement_1E991F
waitmovement 0 waitmovement 0
clearflag FLAG_0x2E5 clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
addobject 1 addobject 1
clearflag FLAG_0x2E8 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_0x2E7 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN
checkflag FLAG_0x095 checkflag FLAG_0x095
call_if 0, DewfordTown_EventScript_1E9790 call_if 0, DewfordTown_EventScript_1E9790
+1 -1
View File
@@ -7,7 +7,7 @@ DewfordTown_Hall_EventObjects: @ 852DC48
object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0
object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0
object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0
object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940 object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
DewfordTown_Hall_MapWarps: @ 852DD20 DewfordTown_Hall_MapWarps: @ 852DD20
warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN
+2 -2
View File
@@ -252,13 +252,13 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
lock lock
faceplayer faceplayer
call DewfordTown_Hall_EventScript_271E8B call DewfordTown_Hall_EventScript_271E8B
checkflag FLAG_0x0E6 checkflag FLAG_RECEIVED_TM_36
goto_eq DewfordTown_Hall_EventScript_1FD80E goto_eq DewfordTown_Hall_EventScript_1FD80E
msgbox DewfordTown_Hall_Text_1FE142, 4 msgbox DewfordTown_Hall_Text_1FE142, 4
giveitem_std ITEM_TM36 giveitem_std ITEM_TM36
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq DewfordTown_Hall_EventScript_272054 goto_eq DewfordTown_Hall_EventScript_272054
setflag FLAG_0x0E6 setflag FLAG_RECEIVED_TM_36
release release
end end
@@ -2,7 +2,7 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0
object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08
warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
@@ -1,7 +1,7 @@
EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 920 object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 921 object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH
EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748
warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4
@@ -136,7 +136,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20
waitmovement 0 waitmovement 0
setflag FLAG_0x30D setflag FLAG_HIDE_PETALBURG_GYM_GREETER
warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
waitstate waitstate
releaseall releaseall
@@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930
object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0
object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0
object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY
@@ -12,7 +12,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
checkflag FLAG_BADGE06_GET checkflag FLAG_BADGE06_GET
goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E
clearflag FLAG_0x319 clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
return return
EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
@@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0
object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C
warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
@@ -2,7 +2,7 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0
object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8
warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
@@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
setflag FLAG_0x1CF setflag FLAG_0x1CF
setflag FLAG_0x319 setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
end end
EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
+2 -2
View File
@@ -2,7 +2,7 @@ FallarborTown_EventObjects: @ 8527BE0
object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0
object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0
object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL
FallarborTown_MapWarps: @ 8527C40 FallarborTown_MapWarps: @ 8527C40
warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
@@ -19,7 +19,7 @@ FallarborTown_MapBGEvents: @ 8527C68
bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259 bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259
bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262
bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, 28 bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET
FallarborTown_MapEvents:: @ 8527CC8 FallarborTown_MapEvents:: @ 8527CC8
map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
@@ -3,7 +3,7 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370
object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0
object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0
object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0
object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8
warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN
+1 -1
View File
@@ -1,5 +1,5 @@
FallarborTown_House1_EventObjects: @ 852E5B8 FallarborTown_House1_EventObjects: @ 852E5B8
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928 object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0
FallarborTown_House1_MapWarps: @ 852E5E8 FallarborTown_House1_MapWarps: @ 852E5E8
+3 -3
View File
@@ -14,9 +14,9 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13
end end
FallarborTown_House1_EventScript_200F38:: @ 8200F38 FallarborTown_House1_EventScript_200F38:: @ 8200F38
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
call_if 0, FallarborTown_House1_EventScript_200F8B call_if 0, FallarborTown_House1_EventScript_200F8B
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
call_if 1, FallarborTown_House1_EventScript_200F9C call_if 1, FallarborTown_House1_EventScript_200F9C
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq FallarborTown_House1_EventScript_200FA5 goto_eq FallarborTown_House1_EventScript_200FA5
@@ -41,7 +41,7 @@ FallarborTown_House1_EventScript_200F9C:: @ 8200F9C
return return
FallarborTown_House1_EventScript_200FA5:: @ 8200FA5 FallarborTown_House1_EventScript_200FA5:: @ 8200FA5
setflag FLAG_0x002 setflag FLAG_TEMP_2
msgbox FallarborTown_House1_Text_201212, 4 msgbox FallarborTown_House1_Text_201212, 4
release release
end end
+2 -2
View File
@@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_201383:: @ 8201383
lockall lockall
applymovement 1, FallarborTown_House2_Movement_27259E applymovement 1, FallarborTown_House2_Movement_27259E
waitmovement 0 waitmovement 0
checkflag FLAG_0x001 checkflag FLAG_TEMP_1
goto_eq FallarborTown_House2_EventScript_2013A8 goto_eq FallarborTown_House2_EventScript_2013A8
msgbox FallarborTown_House2_Text_20145C, 4 msgbox FallarborTown_House2_Text_20145C, 4
setflag FLAG_0x001 setflag FLAG_TEMP_1
goto FallarborTown_House2_EventScript_2013A8 goto FallarborTown_House2_EventScript_2013A8
end end
@@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0
object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0
object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0
object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0
object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE
FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
@@ -49,7 +49,7 @@ FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38
FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48 FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48
playse SE_JIDO_DOA playse SE_JIDO_DOA
removeobject 4 removeobject 4
clearflag FLAG_0x366 clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
release release
end end
@@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0
object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C
warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
+1 -1
View File
@@ -1,5 +1,5 @@
FarawayIsland_Interior_EventObjects: @ 853D7A0 FarawayIsland_Interior_EventObjects: @ 853D7A0
object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718 object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW
FarawayIsland_Interior_MapWarps: @ 853D7B8 FarawayIsland_Interior_MapWarps: @ 853D7B8
warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE
+2 -2
View File
@@ -49,7 +49,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
checkflag FLAG_0x1C7 checkflag FLAG_0x1C7
goto_eq FarawayIsland_Interior_EventScript_27374E goto_eq FarawayIsland_Interior_EventScript_27374E
clearflag FLAG_0x2CE clearflag FLAG_HIDE_MEW
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
return return
@@ -195,7 +195,7 @@ FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0
FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB
lockall lockall
fadescreenswapbuffers 1 fadescreenswapbuffers 1
setflag FLAG_0x2CE setflag FLAG_HIDE_MEW
removeobject 1 removeobject 1
fadescreenswapbuffers 0 fadescreenswapbuffers 0
msgbox FarawayIsland_Interior_Text_267EF1, 4 msgbox FarawayIsland_Interior_Text_267EF1, 4
+8 -8
View File
@@ -1,12 +1,12 @@
FieryPath_EventObjects: @ 8534C80 FieryPath_EventObjects: @ 8534C80
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06
object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11
object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12
object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19 object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_13
object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20 object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_14
object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_15
object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22 object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16
object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE
FieryPath_MapWarps: @ 8534D40 FieryPath_MapWarps: @ 8534D40
warp_def 26, 36, 3, 4, MAP_ROUTE112 warp_def 26, 36, 3, 4, MAP_ROUTE112
+2 -2
View File
@@ -9,7 +9,7 @@ FieryPath_MapScript1_230F2A: @ 8230F2A
end end
FieryPath_EventScript_230F37:: @ 8230F37 FieryPath_EventScript_230F37:: @ 8230F37
setflag FLAG_0x2FE setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
clearflag FLAG_0x2FF clearflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
return return
+1 -1
View File
@@ -5,7 +5,7 @@ FortreeCity_EventObjects: @ 8526B9C
object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0
object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0
object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0
object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969 object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON
FortreeCity_MapWarps: @ 8526C44 FortreeCity_MapWarps: @ 8526C44
warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F
+1 -1
View File
@@ -1,7 +1,7 @@
FortreeCity_House4_EventObjects: @ 8530FD8 FortreeCity_House4_EventObjects: @ 8530FD8
object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0
object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0
object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
FortreeCity_House4_MapWarps: @ 8531020 FortreeCity_House4_MapWarps: @ 8531020
warp_def 3, 5, 0, 6, MAP_FORTREE_CITY warp_def 3, 5, 0, 6, MAP_FORTREE_CITY
+1 -1
View File
@@ -16,7 +16,7 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
msgbox FortreeCity_House4_Text_217DB9, 4 msgbox FortreeCity_House4_Text_217DB9, 4
closemessage closemessage
setflag FLAG_0x0DE setflag FLAG_0x0DE
clearflag FLAG_0x3A6 clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
applymovement 3, FortreeCity_House4_Movement_217D1A applymovement 3, FortreeCity_House4_Movement_217D1A
waitmovement 0 waitmovement 0
removeobject 3 removeobject 3
@@ -2,7 +2,7 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0
object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80
warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F
+1 -1
View File
@@ -1,6 +1,6 @@
GraniteCave_1F_EventObjects: @ 85343BC GraniteCave_1F_EventObjects: @ 85343BC
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE
GraniteCave_1F_MapWarps: @ 85343EC GraniteCave_1F_MapWarps: @ 85343EC
warp_def 37, 12, 3, 0, MAP_ROUTE106 warp_def 37, 12, 3, 0, MAP_ROUTE106
+1 -1
View File
@@ -1,5 +1,5 @@
GraniteCave_B1F_EventObjects: @ 8534420 GraniteCave_B1F_EventObjects: @ 8534420
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL
GraniteCave_B1F_MapWarps: @ 8534438 GraniteCave_B1F_MapWarps: @ 8534438
warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F
+11 -11
View File
@@ -1,13 +1,13 @@
GraniteCave_B2F_EventObjects: @ 8534484 GraniteCave_B2F_EventObjects: @ 8534484
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY
object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11
object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_12
object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_13
object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_14
object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_15
object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16
object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17
GraniteCave_B2F_MapWarps: @ 853455C GraniteCave_B2F_MapWarps: @ 853455C
warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F
@@ -17,8 +17,8 @@ GraniteCave_B2F_MapWarps: @ 853455C
warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F
GraniteCave_B2F_MapBGEvents: @ 8534584 GraniteCave_B2F_MapBGEvents: @ 8534584
bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, 48 bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1
bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, 49 bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2
GraniteCave_B2F_MapEvents:: @ 853459C GraniteCave_B2F_MapEvents:: @ 853459C
map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
+1 -1
View File
@@ -1,5 +1,5 @@
GraniteCave_StevensRoom_EventObjects: @ 85345B0 GraniteCave_StevensRoom_EventObjects: @ 85345B0
object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN
GraniteCave_StevensRoom_MapWarps: @ 85345C8 GraniteCave_StevensRoom_MapWarps: @ 85345C8
warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F
+10 -10
View File
@@ -26,11 +26,11 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04
InsideOfTruck_EventScript_23BF20:: @ 823BF20 InsideOfTruck_EventScript_23BF20:: @ 823BF20
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
setvar VAR_0x4092, 1 setvar VAR_0x4092, 1
setflag FLAG_0x2F7 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
setflag FLAG_0x2FA setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
setflag FLAG_0x310 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM
setflag FLAG_0x2DF setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
setflag FLAG_0x331 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
setvar VAR_0x408C, 1 setvar VAR_0x408C, 1
setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
releaseall releaseall
@@ -39,11 +39,11 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20
InsideOfTruck_EventScript_23BF46:: @ 823BF46 InsideOfTruck_EventScript_23BF46:: @ 823BF46
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
setvar VAR_0x4092, 2 setvar VAR_0x4092, 2
setflag FLAG_0x2F6 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
setflag FLAG_0x2F9 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
setflag FLAG_0x311 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM
setflag FLAG_0x2E0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
setflag FLAG_0x332 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
setvar VAR_0x4082, 1 setvar VAR_0x4082, 1
setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
releaseall releaseall
+1 -1
View File
@@ -1,5 +1,5 @@
IslandCave_EventObjects: @ 8536C74 IslandCave_EventObjects: @ 8536C74
object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936 object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE
IslandCave_MapWarps: @ 8536C8C IslandCave_MapWarps: @ 8536C8C
warp_def 8, 29, 3, 0, MAP_ROUTE105 warp_def 8, 29, 3, 0, MAP_ROUTE105
+6 -6
View File
@@ -38,7 +38,7 @@ IslandCave_MapScript1_238E99: @ 8238E99
end end
IslandCave_EventScript_238EAB:: @ 8238EAB IslandCave_EventScript_238EAB:: @ 8238EAB
clearflag FLAG_0x3A8 clearflag FLAG_HIDE_REGICE
return return
IslandCave_EventScript_238EAF:: @ 8238EAF IslandCave_EventScript_238EAF:: @ 8238EAF
@@ -55,12 +55,12 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
IslandCave_EventScript_238EEF:: @ 8238EEF IslandCave_EventScript_238EEF:: @ 8238EEF
lockall lockall
checkflag FLAG_0x003 checkflag FLAG_TEMP_3
call_if 1, IslandCave_EventScript_238F45 call_if 1, IslandCave_EventScript_238F45
checkflag FLAG_SYS_BRAILLE_WAIT checkflag FLAG_SYS_BRAILLE_WAIT
goto_eq IslandCave_EventScript_238F13 goto_eq IslandCave_EventScript_238F13
braillemessage IslandCave_Braille_2A6CD4 braillemessage IslandCave_Braille_2A6CD4
setflag FLAG_0x002 setflag FLAG_TEMP_2
special ShouldDoBrailleRegicePuzzle special ShouldDoBrailleRegicePuzzle
goto IslandCave_EventScript_238F41 goto IslandCave_EventScript_238F41
end end
@@ -72,12 +72,12 @@ IslandCave_EventScript_238F13:: @ 8238F13
IslandCave_EventScript_238F1D:: @ 8238F1D IslandCave_EventScript_238F1D:: @ 8238F1D
lockall lockall
checkflag FLAG_0x003 checkflag FLAG_TEMP_3
call_if 1, IslandCave_EventScript_238F45 call_if 1, IslandCave_EventScript_238F45
braillemessage IslandCave_Braille_2A6CD4 braillemessage IslandCave_Braille_2A6CD4
checkflag FLAG_SYS_BRAILLE_WAIT checkflag FLAG_SYS_BRAILLE_WAIT
goto_eq IslandCave_EventScript_238F41 goto_eq IslandCave_EventScript_238F41
setflag FLAG_0x002 setflag FLAG_TEMP_2
special ShouldDoBrailleRegicePuzzle special ShouldDoBrailleRegicePuzzle
goto IslandCave_EventScript_238F41 goto IslandCave_EventScript_238F41
end end
@@ -92,7 +92,7 @@ IslandCave_EventScript_238F45:: @ 8238F45
setvar VAR_0x403B, 0 setvar VAR_0x403B, 0
setvar VAR_0x403C, 0 setvar VAR_0x403C, 0
setvar VAR_0x403D, 0 setvar VAR_0x403D, 0
clearflag FLAG_0x003 clearflag FLAG_TEMP_3
return return
IslandCave_EventScript_238F58:: @ 8238F58 IslandCave_EventScript_238F58:: @ 8238F58
+4 -4
View File
@@ -1,9 +1,9 @@
JaggedPass_EventObjects: @ 8534AE4 JaggedPass_EventObjects: @ 8534AE4
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0
object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL
object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0
object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847 object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0
object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0
@@ -27,8 +27,8 @@ JaggedPass_MapCoordEvents: @ 8534BB4
coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
JaggedPass_MapBGEvents: @ 8534C54 JaggedPass_MapBGEvents: @ 8534C54
bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, 77 bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL
bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, 76 bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL
JaggedPass_MapEvents:: @ 8534C6C JaggedPass_MapEvents:: @ 8534C6C
map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
+3 -3
View File
@@ -5,8 +5,8 @@ LavaridgeTown_EventObjects: @ 8527A54
object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0
object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0
object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0
object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 930 object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 929 object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0
LavaridgeTown_MapWarps: @ 8527B2C LavaridgeTown_MapWarps: @ 8527B2C
@@ -28,7 +28,7 @@ LavaridgeTown_MapBGEvents: @ 8527B6C
bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73
bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A
bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73
bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, 0 bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL
LavaridgeTown_MapEvents:: @ 8527BCC LavaridgeTown_MapEvents:: @ 8527BCC
map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
+2 -2
View File
@@ -31,11 +31,11 @@ LavaridgeTown_EventScript_1EA529:: @ 81EA529
setobjectxyperm 8, 11, 9 setobjectxyperm 8, 11, 9
setobjectxyperm 7, 9, 8 setobjectxyperm 7, 9, 8
setobjectmovementtype 7, 7 setobjectmovementtype 7, 7
clearflag FLAG_0x3A1 clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
return return
LavaridgeTown_EventScript_1EA53F:: @ 81EA53F LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
clearflag FLAG_0x36D clearflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
return return
LavaridgeTown_EventScript_1EA543:: @ 81EA543 LavaridgeTown_EventScript_1EA543:: @ 81EA543
+1 -1
View File
@@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84
setvar VAR_0x8008, 4 setvar VAR_0x8008, 4
call LavaridgeTown_Gym_1F_EventScript_271F43 call LavaridgeTown_Gym_1F_EventScript_271F43
setflag FLAG_0x326 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
setvar VAR_0x4053, 1 setvar VAR_0x4053, 1
call LavaridgeTown_Gym_1F_EventScript_1FE841 call LavaridgeTown_Gym_1F_EventScript_1FE841
closemessage closemessage
@@ -2,7 +2,7 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0
object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8
warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
+10 -10
View File
@@ -8,14 +8,14 @@ LilycoveCity_EventObjects: @ 8526CE8
object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0
object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0
object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0
object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852 object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL
object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852 object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0
object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL
object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0
object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0
@@ -49,9 +49,9 @@ LilycoveCity_MapBGEvents: @ 8526F68
bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44 bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44
bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62 bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62
bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74 bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74
bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, 27 bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE
bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, 43 bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP
bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, 75 bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL
LilycoveCity_MapEvents:: @ 8527004 LilycoveCity_MapEvents:: @ 8527004
map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
+5 -5
View File
@@ -6,7 +6,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C
LilycoveCity_MapScript1_1E2B47: @ 81E2B47 LilycoveCity_MapScript1_1E2B47: @ 81E2B47
setflag FLAG_VISITED_LILYCOVE_CITY setflag FLAG_VISITED_LILYCOVE_CITY
setvar VAR_0x4086, 0 setvar VAR_0x4086, 0
setflag FLAG_0x322 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
checkflag FLAG_SYS_WEATHER_CTRL checkflag FLAG_SYS_WEATHER_CTRL
call_if 1, LilycoveCity_EventScript_27207A call_if 1, LilycoveCity_EventScript_27207A
call LilycoveCity_EventScript_271ED7 call LilycoveCity_EventScript_271ED7
@@ -347,8 +347,8 @@ LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E
call_if 1, LilycoveCity_EventScript_1E2F86 call_if 1, LilycoveCity_EventScript_1E2F86
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_EventScript_1E2F8F call_if 1, LilycoveCity_EventScript_1E2F8F
clearflag FLAG_0x2D2 clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
clearflag FLAG_0x351 clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
goto LilycoveCity_EventScript_1E3006 goto LilycoveCity_EventScript_1E3006
end end
@@ -384,8 +384,8 @@ LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA
call_if 1, LilycoveCity_EventScript_1E2FE2 call_if 1, LilycoveCity_EventScript_1E2FE2
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_EventScript_1E2FEB call_if 1, LilycoveCity_EventScript_1E2FEB
clearflag FLAG_0x2F8 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
clearflag FLAG_0x32F clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
goto LilycoveCity_EventScript_1E3006 goto LilycoveCity_EventScript_1E3006
end end
+11 -11
View File
@@ -2,27 +2,27 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0
object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0
object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 774 object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1
object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0
object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0
object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0
object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802 object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0
object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0
object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 895 object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2
object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0
object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0
object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0
object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0
object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0
object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0
LilycoveCity_ContestLobby_MapWarps: @ 853178C LilycoveCity_ContestLobby_MapWarps: @ 853178C
+12 -12
View File
@@ -12,13 +12,13 @@ LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
getpricereduction 4 getpricereduction 4
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_21A23C goto_eq LilycoveCity_ContestLobby_EventScript_21A23C
clearflag FLAG_0x369 clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
setflag FLAG_0x340 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
return return
LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
setflag FLAG_0x369 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
clearflag FLAG_0x340 clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
return return
LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
@@ -27,7 +27,7 @@ LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
.2byte 0 .2byte 0
LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255
checkflag FLAG_0x307 checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
goto_eq LilycoveCity_ContestLobby_EventScript_21A264 goto_eq LilycoveCity_ContestLobby_EventScript_21A264
setvar VAR_0x4099, 0 setvar VAR_0x4099, 0
end end
@@ -111,23 +111,23 @@ LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360
return return
LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2 LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2
clearflag FLAG_0x308 clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
return return
LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6 LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6
clearflag FLAG_0x309 clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
return return
LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA
clearflag FLAG_0x30A clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
return return
LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE
clearflag FLAG_0x30B clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
return return
LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2 LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2
clearflag FLAG_0x30C clearflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
return return
LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6 LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6
@@ -202,7 +202,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
step_end step_end
LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
checkflag FLAG_0x307 checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
goto_eq LilycoveCity_ContestLobby_EventScript_21A436 goto_eq LilycoveCity_ContestLobby_EventScript_21A436
setvar VAR_0x4099, 0 setvar VAR_0x4099, 0
end end
@@ -356,7 +356,7 @@ LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
return return
LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
setflag FLAG_0x307 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
copyvar VAR_0x4094, 0x1 copyvar VAR_0x4094, 0x1
giveitem ITEM_CONTEST_PASS, 1 giveitem ITEM_CONTEST_PASS, 1
setvar VAR_0x800B, 8 setvar VAR_0x800B, 8
@@ -1,11 +1,11 @@
LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188
object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT
LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230
warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
@@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2
LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3
lock lock
faceplayer faceplayer
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
specialvar VAR_RESULT, sub_80C08E4 specialvar VAR_RESULT, sub_80C08E4
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@@ -19,7 +19,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9
return return
LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702
setflag FLAG_0x002 setflag FLAG_TEMP_2
playfanfare MUS_FANFA4 playfanfare MUS_FANFA4
waitfanfare waitfanfare
goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
@@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
checkflag FLAG_0x002 checkflag FLAG_TEMP_2
call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
special sub_8139B60 special sub_8139B60
@@ -120,7 +120,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
waitse waitse
special ShakeScreenInElevator special ShakeScreenInElevator
waitstate waitstate
setflag FLAG_0x002 setflag FLAG_TEMP_2
return return
LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
@@ -1,7 +1,7 @@
LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C
object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0
object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0
object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962 object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0
LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C

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