diff options
Diffstat (limited to 'data/maps/LittlerootTown/scripts.inc')
| -rw-r--r-- | data/maps/LittlerootTown/scripts.inc | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 5d9161cb4..f347811f8 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,24 +1,24 @@ LittlerootTown_MapScripts:: @ 81E7DCB - map_script 3, LittlerootTown_MapScript1_1E7DDB - map_script 2, LittlerootTown_MapScript2_1E7EC1 - map_script 4, LittlerootTown_MapScript2_1E7FE2 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2 .byte 0 LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN - call LittlerootTown_EventScript_271ED7 - compare VAR_0x4092, 2 + call Common_EventScript_SetupRivalGender + compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if_eq LittlerootTown_EventScript_1E7E67 call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F compare VAR_0x4050, 3 call_if_eq LittlerootTown_EventScript_1E7E92 - compare VAR_0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_0x408C, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_0x40C7, 1 + compare VAR_OLDALE_STATE, 1 call_if_eq LittlerootTown_EventScript_1E7E53 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_eq LittlerootTown_EventScript_1E7E4F compare VAR_0x40D3, 1 call_if_eq LittlerootTown_EventScript_1E7E4B @@ -31,7 +31,7 @@ LittlerootTown_EventScript_1E7E45:: @ 81E7E45 return LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP return LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F @@ -39,13 +39,13 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F return LittlerootTown_EventScript_1E7E53:: @ 81E7E53 - setvar VAR_0x40C7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL return LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C - setvar VAR_0x4082, 5 - setvar VAR_0x408C, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 return LittlerootTown_EventScript_1E7E67:: @ 81E7E67 @@ -83,8 +83,8 @@ LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9 return LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1 - map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB - map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9 map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1 .2byte 0 @@ -136,12 +136,12 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setvar VAR_0x4092, 3 + setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP return LittlerootTown_Movement_1E7F98: @ 81E7F98 @@ -186,7 +186,7 @@ LittlerootTown_Movement_1E7FAC: @ 81E7FAC LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 lockall playse SE_PIN - applymovement 8, LittlerootTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 delay 80 msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT @@ -194,7 +194,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH delay 20 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate releaseall @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 release @@ -357,14 +357,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118 LittlerootTown_EventScript_1E811F:: @ 81E811F lockall - applymovement 1, LittlerootTown_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 releaseall @@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C return LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, LittlerootTown_Movement_2725A8 + applymovement 4, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, LittlerootTown_Movement_2725A4 + applymovement 4, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 - applymovement 4, LittlerootTown_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim |