diff options
Diffstat (limited to 'data/maps/LittlerootTown/scripts.inc')
| -rw-r--r-- | data/maps/LittlerootTown/scripts.inc | 143 |
1 files changed, 70 insertions, 73 deletions
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 660a3984d..9f589d2e4 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -8,23 +8,22 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call LittlerootTown_EventScript_271ED7 compare VAR_0x4092, 2 - call_if 1, LittlerootTown_EventScript_1E7E67 - checkflag FLAG_0x052 - call_if 0, LittlerootTown_EventScript_1E7E6F + call_if_eq LittlerootTown_EventScript_1E7E67 + call_if_unset FLAG_0x052, LittlerootTown_EventScript_1E7E6F compare VAR_0x4050, 3 - call_if 1, LittlerootTown_EventScript_1E7E92 + call_if_eq LittlerootTown_EventScript_1E7E92 compare VAR_0x4082, 4 - call_if 1, LittlerootTown_EventScript_1E7E5C + call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_0x408C, 4 - call_if 1, LittlerootTown_EventScript_1E7E5C + call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_0x40C7, 1 - call_if 1, LittlerootTown_EventScript_1E7E53 + call_if_eq LittlerootTown_EventScript_1E7E53 compare VAR_0x408D, 3 - call_if 1, LittlerootTown_EventScript_1E7E4F + call_if_eq LittlerootTown_EventScript_1E7E4F compare VAR_0x40D3, 1 - call_if 1, LittlerootTown_EventScript_1E7E4B + call_if_eq LittlerootTown_EventScript_1E7E4B compare VAR_0x40D3, 2 - call_if 1, LittlerootTown_EventScript_1E7E45 + call_if_eq LittlerootTown_EventScript_1E7E45 end LittlerootTown_EventScript_1E7E45:: @ 81E7E45 @@ -55,7 +54,7 @@ LittlerootTown_EventScript_1E7E67:: @ 81E7E67 LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F compare VAR_0x4050, 0 - goto_eq LittlerootTown_EventScript_1E7E86 + goto_if_eq LittlerootTown_EventScript_1E7E86 setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 return @@ -70,9 +69,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92 setobjectmovementtype 4, 8 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E7EB1 + call_if_eq LittlerootTown_EventScript_1E7EB1 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E7EB9 + call_if_eq LittlerootTown_EventScript_1E7EB9 return LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1 @@ -114,7 +113,7 @@ LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 LittlerootTown_EventScript_1E7F17:: @ 81E7F17 delay 15 playse SE_DANSA - applymovement 255, LittlerootTown_Movement_1E7FAC + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FAC waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -129,16 +128,16 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_1E7F9D - applymovement 255, LittlerootTown_Movement_1E7FA4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA4 waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 4, LittlerootTown_Movement_1E7FA1 - applymovement 255, LittlerootTown_Movement_1E7FA9 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_0x4092, 3 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN @@ -210,7 +209,7 @@ LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC addobject 7 checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_EventScript_1E8004 + goto_if_eq LittlerootTown_EventScript_1E8004 goto LittlerootTown_EventScript_1E8013 end @@ -235,12 +234,10 @@ LittlerootTown_EventScript_1E802B:: @ 81E802B LittlerootTown_EventScript_1E8034:: @ 81E8034 lock faceplayer - checkflag FLAG_0x074 - goto_eq LittlerootTown_EventScript_1E8087 - checkflag FLAG_0x052 - goto_eq LittlerootTown_EventScript_1E807A + goto_if_set FLAG_0x074, LittlerootTown_EventScript_1E8087 + goto_if_set FLAG_0x052, LittlerootTown_EventScript_1E807A compare VAR_0x4050, 0 - goto_if 5, LittlerootTown_EventScript_1E805D + goto_if_ne LittlerootTown_EventScript_1E805D msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT release end @@ -280,7 +277,7 @@ LittlerootTown_EventScript_1E80AD:: @ 81E80AD msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_1E80DF - applymovement 255, LittlerootTown_Movement_1E80EB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E80EB waitmovement 0 msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT closemessage @@ -362,7 +359,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F lockall applymovement 1, LittlerootTown_Movement_2725A8 waitmovement 0 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT @@ -385,9 +382,9 @@ LittlerootTown_EventScript_1E8163:: @ 81E8163 lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E817D + call_if_eq LittlerootTown_EventScript_1E817D compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E8186 + call_if_eq LittlerootTown_EventScript_1E8186 releaseall end @@ -403,9 +400,9 @@ LittlerootTown_EventScript_1E818F:: @ 81E818F lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E81A9 + call_if_eq LittlerootTown_EventScript_1E81A9 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E81B2 + call_if_eq LittlerootTown_EventScript_1E81B2 releaseall end @@ -458,27 +455,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205 LittlerootTown_EventScript_1E8211:: @ 81E8211 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8297 + call_if_eq LittlerootTown_EventScript_1E8297 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E82A2 + call_if_eq LittlerootTown_EventScript_1E82A2 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E828C + call_if_eq LittlerootTown_EventScript_1E828C msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E82AD + call_if_eq LittlerootTown_EventScript_1E82AD compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E82F0 + call_if_eq LittlerootTown_EventScript_1E82F0 call LittlerootTown_EventScript_1E8693 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8405 + call_if_eq LittlerootTown_EventScript_1E8405 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E8448 + call_if_eq LittlerootTown_EventScript_1E8448 goto LittlerootTown_EventScript_1E8686 end @@ -504,99 +501,99 @@ LittlerootTown_EventScript_1E82A2:: @ 81E82A2 LittlerootTown_EventScript_1E82AD:: @ 81E82AD compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_1E8333 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_1E8348 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E835D + call_if_eq LittlerootTown_EventScript_1E835D compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E8372 + call_if_eq LittlerootTown_EventScript_1E8372 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E8387 + call_if_eq LittlerootTown_EventScript_1E8387 compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E839C + call_if_eq LittlerootTown_EventScript_1E839C return LittlerootTown_EventScript_1E82F0:: @ 81E82F0 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_1E8333 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_1E8348 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E83B1 + call_if_eq LittlerootTown_EventScript_1E83B1 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E83C6 + call_if_eq LittlerootTown_EventScript_1E83C6 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E83DB + call_if_eq LittlerootTown_EventScript_1E83DB compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E83F0 + call_if_eq LittlerootTown_EventScript_1E83F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement 255, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement 255, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -604,32 +601,32 @@ LittlerootTown_EventScript_1E83F0:: @ 81E83F0 LittlerootTown_EventScript_1E8405:: @ 81E8405 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_1E848B compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_1E8496 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E84A1 + call_if_eq LittlerootTown_EventScript_1E84A1 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E84C7 + call_if_eq LittlerootTown_EventScript_1E84C7 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E84ED + call_if_eq LittlerootTown_EventScript_1E84ED compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E8513 + call_if_eq LittlerootTown_EventScript_1E8513 return LittlerootTown_EventScript_1E8448:: @ 81E8448 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_1E848B compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_1E8496 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E8539 + call_if_eq LittlerootTown_EventScript_1E8539 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E855F + call_if_eq LittlerootTown_EventScript_1E855F compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E8585 + call_if_eq LittlerootTown_EventScript_1E8585 compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E85AB + call_if_eq LittlerootTown_EventScript_1E85AB return LittlerootTown_EventScript_1E848B:: @ 81E848B @@ -893,9 +890,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D faceplayer checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E828C + call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 applymovement 4, LittlerootTown_Movement_2725A6 waitmovement 0 |