diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/BirthIsland_Exterior/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/NavelRock_Base/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/NavelRock_Summit/scripts.inc | 2 | ||||
| -rw-r--r-- | data/mystery_event_msg.s | 2 | ||||
| -rw-r--r-- | data/script_cmd_table.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index ae7545a95..81419e08a 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -87,7 +87,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 setvar VAR_0x8004, SPECIES_DEOXYS setvar VAR_0x8005, 30 @ Level setvar VAR_0x8006, ITEM_NONE - special CreateObedientEnemyMon + special CreateEventLegalEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle waitstate diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 2a490f13e..f4dcdc8c8 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -59,7 +59,7 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134 setvar VAR_0x8004, SPECIES_LUGIA setvar VAR_0x8005, 70 @ Level setvar VAR_0x8006, ITEM_NONE - special CreateObedientEnemyMon + special CreateEventLegalEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle waitstate diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 32b163542..56a6c467c 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -63,7 +63,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB setvar VAR_0x8004, SPECIES_HO_OH setvar VAR_0x8005, 70 @ Level setvar VAR_0x8006, ITEM_NONE - special CreateObedientEnemyMon + special CreateEventLegalEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle waitstate diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index c9c7430ab..8ffbf788d 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -68,7 +68,7 @@ SurfPichu_FullParty: @ 8488EEB SurfPichu_GiveEgg: @ 8488EF6 giveegg SPECIES_PICHU - setmonobedient VAR_EVENT_PICHU_SLOT + setmoneventlegal VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff compare VAR_EVENT_PICHU_SLOT, 1 vgoto_if_eq SurfPichu_Slot1 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 84996a5d6..8612b810d 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -206,8 +206,8 @@ gScriptCmdTable:: @ 815F9B4 .4byte ScrCmd_signmsg .4byte ScrCmd_normalmsg .4byte ScrCmd_comparestattoword - .4byte ScrCmd_setmonobedient - .4byte ScrCmd_checkmonobedience + .4byte ScrCmd_setmoneventlegal + .4byte ScrCmd_checkmoneventlegal .4byte ScrCmd_execram .4byte ScrCmd_setworldmapflag .4byte ScrCmd_warpteleport2 diff --git a/data/specials.inc b/data/specials.inc index 8788a6105..aa7eced1a 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -451,5 +451,5 @@ gSpecials:: @ 815FD60 def_special InitElevatorFloorSelectMenuPos def_special UpdateLoreleiDollCollection def_special LoopWingFlapSound - def_special CreateObedientEnemyMon + def_special CreateEventLegalEnemyMon gSpecialsEnd:: |