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

Sync event macros

Browse Source
This commit is contained in:
GriffinR
2020-01-10 00:44:57 -05:00
parent 94fbc3ac48
commit 4a6f15ba24
220 changed files with 3209 additions and 3580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PalletTown/scripts.inc
+18 -23
View File
@@ -5,19 +5,17 @@ PalletTown_MapScripts:: @ 816545A
PalletTown_OnTransition:: @ 8165465
setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
call_if TRUE, EventScript_165488
call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_165488
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0
call_if eq, EventScript_1654A8
call_if_eq EventScript_1654A8
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
call_if eq, EventScript_1654A2
call_if_eq EventScript_1654A2
end
EventScript_165488:: @ 8165488
checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
goto_if FALSE, EventScript_1A77A9
goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_1A77A9
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
goto_if ge, EventScript_1A77A9
goto_if_ge EventScript_1A77A9
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
return
@@ -26,8 +24,7 @@ EventScript_1654A2:: @ 81654A2
return
EventScript_1654A8:: @ 81654A8
checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
goto_if TRUE, EventScript_1654BD
goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_1654BD
setobjectxyperm 1, 5, 15
setobjectmovementtype 1, 7
return
@@ -50,8 +47,7 @@ EventScript_1654D8:: @ 81654D8
addobject 3
applymovement 3, Movement_1655AF
waitmovement 0
checkflag FLAG_WORLD_MAP_ONE_ISLAND
goto_if FALSE, EventScript_1655A1
goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1655A1
msgbox gUnknown_817D8BF
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
@@ -60,7 +56,7 @@ EventScript_1654D8:: @ 81654D8
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
compare VAR_0x8009, 60
goto_if lt, EventScript_165593
goto_if_lt EventScript_165593
msgbox gUnknown_817D9AA
closemessage
playbgm MUS_ANNAI, 0
@@ -200,17 +196,17 @@ EventScript_165605:: @ 8165605
delay 30
addobject 3
compare VAR_TEMP_1, 0
call_if eq, EventScript_1656B8
call_if_eq EventScript_1656B8
compare VAR_TEMP_1, 1
call_if eq, EventScript_1656C3
call_if_eq EventScript_1656C3
delay 30
msgbox gUnknown_817D74A
closemessage
delay 30
compare VAR_TEMP_1, 0
call_if eq, EventScript_1656CE
call_if_eq EventScript_1656CE
compare VAR_TEMP_1, 1
call_if eq, EventScript_1656E0
call_if_eq EventScript_1656E0
opendoor 16, 13
waitdooranim
applymovement 3, Movement_16572E
@@ -375,13 +371,12 @@ Movement_165758:: @ 8165758
PalletTown_EventScript_16575C:: @ 816575C
lock
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2
goto_if eq, EventScript_1657ED
goto_if_eq EventScript_1657ED
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
goto_if eq, EventScript_165815
goto_if_eq EventScript_165815
compare VAR_TEMP_2, 1
goto_if eq, EventScript_1658C2
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_165801
goto_if_eq EventScript_1658C2
goto_if_set FLAG_TEMP_2, EventScript_165801
msgbox gUnknown_81B1C8B
applymovement 1, Movement_FacePlayer
waitmovement 0
@@ -393,9 +388,9 @@ PalletTown_EventScript_16575C:: @ 816575C
msgbox gUnknown_81B1C9F
closemessage
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_1657D7
call_if_eq EventScript_1657D7
compare VAR_FACING, DIR_EAST
call_if ne, EventScript_1657E2
call_if_ne EventScript_1657E2
moveobjectoffscreen 1
setflag FLAG_TEMP_2
release