diff options
85 files changed, 330 insertions, 330 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index d2164c72f..29b715e7f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -535,88 +535,88 @@ @ Applies the movement data at movements to the specified (index) Person event. Also closes any standard message boxes that are still open. @ This command in fact uses variables to access the Person event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Person event 3 will have the movements at @move1 applied to them. Thank you Shiny Quagsire for bringing this to my attention. .macro applymovement index, movements, mapGroup, mapNum - .ifb \mapGroup - .byte 0x4f - .2byte \index - .4byte \movements - .else - .byte 0x50 - .2byte \index - .4byte \movements - .byte \mapGroup - .byte \mapNum - .endif + .ifb \mapGroup + .byte 0x4f + .2byte \index + .4byte \movements + .else + .byte 0x50 + .2byte \index + .4byte \movements + .byte \mapGroup + .byte \mapNum + .endif .endm @ Blocks script execution until the movements being applied to the specified (index) Person event finish. If the specified Person event is 0x0000, then the command will block script execution until all Person events affected by applymovement finish their movements. If the specified Person event is not currently being manipulated with applymovement, then this command does nothing. .macro waitmovement index, mapBank, mapNum - .ifb \mapBank - .byte 0x51 - .2byte \index - .else - .byte 0x52 - .2byte \index - .byte \mapBank - .byte \mapNum - .endif - .endm - - @ Attempts to hide the specified (local_ID, a local ID) Person event on the current map, by setting its visibility flag if it has a valid one. If the Person does not have a valid visibility flag, this command does nothing. - .macro disappear local_ID - .byte 0x53 - .2byte \local_ID - .endm - - @ Clone of hidesprite that also moves the Person? Test it! - .macro disappearxy index, X, Y - .byte 0x54 - .2byte \index - .byte \X - .byte \Y + .ifb \mapBank + .byte 0x51 + .2byte \index + .else + .byte 0x52 + .2byte \index + .byte \mapBank + .byte \mapNum + .endif .endm - .macro reappear word - .byte 0x55 - .2byte \word + @ Attempts to hide the specified (local_ID, a local ID) Person event on the specified map, by setting its visibility flag if it has a valid one. If the Person does not have a valid visibility flag, this command does nothing. + @ If no map is specified, then the current map is used + .macro removeobject localId, mapGroup, mapNum + .ifb \mapGroup + .byte 0x53 + .2byte \localId + .else + .byte 0x54 + .2byte \localId + .byte \mapGroup + .byte \mapNum + .endif .endm - .macro reappearxy word, byte1, byte2 - .byte 0x56 - .2byte \word - .byte \byte1 - .byte \byte2 + .macro addobject localId, mapGroup, mapNum + .ifb \mapGroup + .byte 0x55 + .2byte \localId + .else + .byte 0x56 + .2byte \localId + .byte \mapGroup + .byte \mapNum + .endif .endm - .macro movesprite word1, word2, word3 - .byte 0x57 - .2byte \word1 - .2byte \word2 - .2byte \word3 + .macro setobjectxy word1, word2, word3 + .byte 0x57 + .2byte \word1 + .2byte \word2 + .2byte \word3 .endm - .macro spritevisible word, byte1, byte2 - .byte 0x58 - .2byte \word - .byte \byte1 - .byte \byte2 + .macro showobject word, byte1, byte2 + .byte 0x58 + .2byte \word + .byte \byte1 + .byte \byte2 .endm - .macro spriteinvisible word, byte1, byte2 - .byte 0x59 - .2byte \word - .byte \byte1 - .byte \byte2 + .macro hideobject word, byte1, byte2 + .byte 0x59 + .2byte \word + .byte \byte1 + .byte \byte2 .endm @ If the script was called by a Person event, then that Person will turn to face toward the tile that the player is stepping off of. .macro faceplayer - .byte 0x5a + .byte 0x5a .endm - .macro spriteface word, byte - .byte 0x5b - .2byte \word - .byte \byte + .macro turnobject word, byte + .byte 0x5b + .2byte \word + .byte \byte .endm @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 5751e440d..1ec043aa0 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1613,7 +1613,7 @@ Std_FindItem: @ 819FF21 return Std_FindItem_Success: @ 819FF52 - disappear LAST_TALKED + removeobject LAST_TALKED message Message_FoundOneItem waitfanfare waittext @@ -2260,8 +2260,8 @@ PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 - disappear 1 - disappear 10 + removeobject 1 + removeobject 10 clearflag 808 clearflag 984 setvar 0x409a, 6 @@ -2272,7 +2272,7 @@ EventScript_1A0457: @ unreferenced? delay 30 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmovement 0 - spritevisible 255, 0, 0 + showobject 255, 0, 0 delay 30 applymovement 255, Movement_1A047A waitmovement 0 @@ -2290,7 +2290,7 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 call BattleTower_Outside_EventScript_1A040E return @@ -3898,7 +3898,7 @@ EventScript_1A2F95: addvar 0x8004, 1 compare 0x8005, 0 goto_if_eq EventScript_1A2F95 - disappear 0x8006 + removeobject 0x8006 setflag 0x8005 goto EventScript_1A2F95 end diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 59635ee4f..d218d834d 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -28,7 +28,7 @@ S_UseCut:: @ 81B0E16 DoTreeCutMovement: @ 81B0E21 applymovement LAST_TALKED, TreeCutMovement @ tree cut animation waitmovement 0 - disappear LAST_TALKED @ tree disappears + removeobject LAST_TALKED @ tree disappears releaseall end @@ -89,7 +89,7 @@ S_UseRockSmash:: @ 81B0F01 DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 - disappear LAST_TALKED + removeobject LAST_TALKED specialvar RESULT, sub_810F5BC compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done diff --git a/data/event_scripts.s b/data/event_scripts.s index 0db608cd5..32cb8d233 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1607,7 +1607,7 @@ Std_FindItem: @ 819FF21 return Std_FindItem_Success: @ 819FF52 - disappear LAST_TALKED + removeobject LAST_TALKED message Message_FoundOneItem waitfanfare waittext @@ -2254,8 +2254,8 @@ PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 - disappear 1 - disappear 10 + removeobject 1 + removeobject 10 clearflag 808 clearflag 984 setvar 0x409a, 6 @@ -2266,7 +2266,7 @@ EventScript_1A0457: @ unreferenced? delay 30 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmovement 0 - spritevisible 255, 0, 0 + showobject 255, 0, 0 delay 30 applymovement 255, Movement_1A047A waitmovement 0 @@ -2284,7 +2284,7 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 call BattleTower_Outside_EventScript_1A040E return @@ -3877,7 +3877,7 @@ EventScript_1A2F95: addvar 0x8004, 1 compare 0x8005, 0 goto_if_eq EventScript_1A2F95 - disappear 0x8006 + removeobject 0x8006 setflag 0x8005 goto EventScript_1A2F95 end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 7df5ac90f..592dd7003 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -28,7 +28,7 @@ S_UseCut:: @ 81B0E16 DoTreeCutMovement: @ 81B0E21 applymovement LAST_TALKED, TreeCutMovement @ tree cut animation waitmovement 0 - disappear LAST_TALKED @ tree disappears + removeobject LAST_TALKED @ tree disappears releaseall end @@ -86,7 +86,7 @@ S_UseRockSmash:: @ 81B0F01 DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 - disappear LAST_TALKED + removeobject LAST_TALKED specialvar RESULT, sub_810F5BC compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b25bc12bd..078d6444f 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -21,7 +21,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3D2D:: @ 81A3D2D - spriteface 0x8007, 4 + turnobject 0x8007, 4 end DewfordTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 @@ -233,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E doorchange applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 5, 1 doorchange release @@ -398,7 +398,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 doorchange applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 8, 1 doorchange release @@ -496,7 +496,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 doorchange applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 11, 1 doorchange release diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index acf5597ea..10314c462 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -344,7 +344,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall - reappear 13 + addobject 13 playse 10 lockall applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C @@ -724,7 +724,7 @@ LinkContestRoom1_EventScript_1A587F:: @ 81A587F LinkContestRoom1_EventScript_1A5880:: @ 81A5880 closebutton release - disappear 13 + removeobject 13 special sub_80C5164 switch 0x8006 case 0, LinkContestRoom1_EventScript_1A58BA diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 01bdb7c31..998da7380 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -60,13 +60,13 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB closebutton delay 30 fadescreen 1 - disappear 2 - disappear 3 - disappear 22 + removeobject 2 + removeobject 3 + removeobject 22 setflag 926 fadescreen 0 movespriteperm 1, 10, 12 - reappear 1 + addobject 1 compare FACING, 4 call_if 1, MtChimney_EventScript_1B2D7D compare FACING, 2 @@ -83,7 +83,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB call_if 1, MtChimney_EventScript_1B2D93 compare FACING, 2 call_if 1, MtChimney_EventScript_1B2D9E - disappear 1 + removeobject 1 setflag 927 setflag 139 clearflag 928 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index a0f00e877..5a0b4014a 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -10,7 +10,7 @@ AncientTomb_MapScript1_15EFCE:: @ 815EFCE end AncientTomb_EventScript_15EFD8:: @ 815EFD8 - disappear LAST_TALKED + removeobject LAST_TALKED return AncientTomb_MapScript1_15EFDC:: @ 815EFDC diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index cad8e7481..0001d7574 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C end AquaHideout_B1F_EventScript_15D846:: @ 815D846 - disappear LAST_TALKED + removeobject LAST_TALKED return AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index b08a68d1b..9fd81f121 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -59,7 +59,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8009, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - disappear 0x8009 + removeobject 0x8009 delay 20 applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index bbc3360a8..3223deba4 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -13,7 +13,7 @@ BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_81347F8 - reappear 1 + addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 special sub_8135474 @@ -45,7 +45,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 waitmovement 0 - disappear 1 + removeobject 1 applymovement 2, BattleTower_BattleRoom_Movement_160ACB waitmovement 0 applymovement 255, BattleTower_BattleRoom_Movement_160ABC diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index fe55b50db..a147a3b5a 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -29,7 +29,7 @@ BattleTower_Elevator_MapScript2_160821:: @ 8160821 BattleTower_Elevator_EventScript_16082B:: @ 816082B setvar 0x4001, 1 - spriteface 255, 2 + turnobject 255, 2 end BattleTower_Elevator_Movement_160835:: @ 8160835 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 61b2da5e7..61ac04810 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -46,7 +46,7 @@ BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 setvar 0x4001, 1 - spriteface 255, 2 + turnobject 255, 2 end BattleTower_Lobby_MapScript2_160302:: @ 8160302 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index f577f39fa..53e693f71 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -67,7 +67,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 - spriteinvisible 5, 26, 4 + hideobject 5, 26, 4 setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index dcd97f069..3b2e7802d 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -9,7 +9,7 @@ CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 end CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 - disappear 1 + removeobject 1 return CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index d63398d78..b549cf127 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -10,7 +10,7 @@ DesertRuins_MapScript1_15CB03:: @ 815CB03 end DesertRuins_EventScript_15CB0D:: @ 815CB0D - disappear LAST_TALKED + removeobject LAST_TALKED return DesertRuins_MapScript1_15CB11:: @ 815CB11 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 09835c0b9..c8f20f4ac 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -122,24 +122,24 @@ DewfordTown_EventScript_14E151:: @ 814E151 spritelevelup 255, 0, 11, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 - disappear 2 + removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - spriteinvisible 255, 0, 11 + hideobject 255, 0, 11 call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E293 applymovement 255, DewfordTown_Movement_14E293 waitmovement 0 - spritevisible 255, 0, 19 + showobject 255, 0, 19 call DewfordTown_EventScript_1A02EF applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 - spritevisible 255, 0, 19 + showobject 255, 0, 19 clearflag 739 clearflag 881 clearflag 742 setflag 743 - spriteinvisible 4, 0, 11 + hideobject 4, 0, 11 setvar 0x408e, 2 restorespritelevel 255, 0, 11 warp Route104_MrBrineysHouse, 255, 5, 4 @@ -154,28 +154,28 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 spritelevelup 255, 0, 11, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 - disappear 2 + removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - spriteinvisible 255, 0, 11 + hideobject 255, 0, 11 call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E356 applymovement 255, DewfordTown_Movement_14E356 waitmovement 0 call DewfordTown_EventScript_1A02EF - spritevisible 255, 0, 24 + showobject 255, 0, 24 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 movespriteperm 2, 21, 26 - reappear 2 + addobject 2 spritelevelup 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 clearflag 741 - reappear 1 + addobject 1 clearflag 744 setflag 743 - spriteinvisible 4, 0, 11 + hideobject 4, 0, 11 checkflag 149 call_if 0, DewfordTown_EventScript_14E281 checkflag 149 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 669da34f9..adfbca1bf 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 @@ -57,7 +57,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 - reappear 2 + addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender compare RESULT, 0 @@ -102,7 +102,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 closebutton - reappear 3 + addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 waitmovement 0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/scripts/maps/EverGrandeCity_Corridor1.inc index 499ad673f..104504960 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor1.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 .2byte 0 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/scripts/maps/EverGrandeCity_Corridor2.inc index 692de1ed9..c7c049020 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor2.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 .2byte 0 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/scripts/maps/EverGrandeCity_Corridor3.inc index f8ed19669..1714db5cc 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor3.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C .2byte 0 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/scripts/maps/EverGrandeCity_Corridor4.inc index 616a25ec5..64cc234eb 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor4.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 .2byte 0 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/scripts/maps/EverGrandeCity_Corridor5.inc index 783b03aec..73c0b5a84 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor5.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 .2byte 0 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ee171824f..3d3d56ff9 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 8ebf7939f..07f6e8877 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index d0fb7922f..523a337cc 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index b8fe90a01..b7c1618ba 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 3f472ca3f..daca98176 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -25,7 +25,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index abe0ac7c6..3b33c5a41 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -47,7 +47,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 - disappear 4 + removeobject 4 clearflag 870 release end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index e0bac8007..a7c548b1f 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -81,7 +81,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 waitpokecry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 - disappear LAST_TALKED + removeobject LAST_TALKED setflag 295 release end diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index f7f8391d4..f90c080f8 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -19,7 +19,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 clearflag 934 applymovement 3, FortreeCity_House4_Movement_158218 waitmovement 0 - disappear 3 + removeobject 3 releaseall end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 06f234f28..9afe54091 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -23,7 +23,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playse 9 - disappear 1 + removeobject 1 release end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 06524f95e..b59500625 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -10,7 +10,7 @@ IslandCave_MapScript1_15EEC6:: @ 815EEC6 end IslandCave_EventScript_15EED0:: @ 815EED0 - disappear LAST_TALKED + removeobject LAST_TALKED return IslandCave_MapScript1_15EED4:: @ 815EED4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index d24280efa..afad309a9 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -31,7 +31,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED setvar 0x8008, 1 setdooropened 12, 15 doorchange - reappear 8 + addobject 8 applymovement 8, LavaridgeTown_Movement_14E70E waitmovement 0 setdoorclosed 12, 15 @@ -103,14 +103,14 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 call_if 1, LavaridgeTown_EventScript_14E646 compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E64E - disappear 8 - reappear 7 + removeobject 8 + addobject 7 delay 30 compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 - disappear 7 + removeobject 7 setvar 0x4053, 2 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 7031eb530..af353e824 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -418,7 +418,7 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B setanimation 0, 1 doanimation 30 delay 15 - disappear LAST_TALKED + removeobject LAST_TALKED checkanimation 30 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1020e9d2b..7746eac01 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -20,7 +20,7 @@ LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 lockall - reappear 4 + addobject 4 applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B waitmovement 4 applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C @@ -48,7 +48,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE call_if 1, LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 - disappear 4 + removeobject 4 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA releaseall @@ -63,7 +63,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 setvar 0x4099, 0 - disappear 4 + removeobject 4 releaseall end @@ -195,7 +195,7 @@ LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A lockall - reappear 11 + addobject 11 applymovement 11, LilycoveCity_ContestLobby_Movement_158B64 waitmovement 11 applymovement 255, LilycoveCity_ContestLobby_Movement_158B76 @@ -221,7 +221,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 - disappear 11 + removeobject 11 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA releaseall @@ -236,7 +236,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 setvar 0x4099, 0 - disappear 11 + removeobject 11 releaseall end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 94b2d53a9..cbcac6f6e 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -79,13 +79,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 13, 10 + hideobject LAST_TALKED, 13, 10 compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -117,9 +117,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 13, 10 + hideobject LAST_TALKED, 13, 10 delay 60 - reappear 4 + addobject 4 delay 30 applymovement 4, LilycoveCity_Harbor_Movement_1A0839 waitmovement 0 @@ -128,13 +128,13 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement 4, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - disappear 4 + removeobject 4 compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index db55695e6..548c80a96 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -38,7 +38,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3 applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC waitmovement 0 - disappear 2 + removeobject 2 switch FACING case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 0f1dc96d9..06508fd02 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -104,7 +104,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setdooropened 0x8004, 0x8005 doorchange - reappear 4 + addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 setdoorclosed 0x8004, 0x8005 @@ -124,7 +124,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setflag 752 setvar 0x4092, 3 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 0x8004, 0x8005 doorchange clearflag 868 @@ -370,14 +370,14 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall setvar 0x8008, 0 - movesprite 4, 10, 9 + setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall setvar 0x8008, 1 - movesprite 4, 11, 9 + setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end @@ -599,7 +599,7 @@ LittlerootTown_EventScript_14DB46:: @ 814DB46 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -611,7 +611,7 @@ LittlerootTown_EventScript_14DB6C:: @ 814DB6C doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -623,7 +623,7 @@ LittlerootTown_EventScript_14DB92:: @ 814DB92 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -635,7 +635,7 @@ LittlerootTown_EventScript_14DBB8:: @ 814DBB8 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -647,7 +647,7 @@ LittlerootTown_EventScript_14DBDE:: @ 814DBDE doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -659,7 +659,7 @@ LittlerootTown_EventScript_14DC04:: @ 814DC04 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -671,7 +671,7 @@ LittlerootTown_EventScript_14DC2A:: @ 814DC2A doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -683,7 +683,7 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -853,14 +853,14 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange goto LittlerootTown_EventScript_14DD2B end LittlerootTown_EventScript_14DD2B:: @ 814DD2B - disappear 4 + removeobject 4 setflag 2144 setvar 0x4050, 4 release diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 712bebf03..84fb4e69b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -38,7 +38,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 - disappear LAST_TALKED + removeobject LAST_TALKED setvar 0x408d, 3 setvar 0x4050, 1 savebgm 0 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 834ae8521..7e3386d7a 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -14,7 +14,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 - spriteface 255, 2 + turnobject 255, 2 end LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 63364c6e5..780eea4f5 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -8,5 +8,5 @@ MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 - disappear LAST_TALKED + removeobject LAST_TALKED return diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 5dd9983f4..da406e2f7 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -154,8 +154,8 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 end MauvilleCity_EventScript_14C22B:: @ 814C22B - disappear 6 - disappear 7 + removeobject 6 + removeobject 7 clearflag 806 clearflag 809 setflag 190 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 8d78d1496..c7aa8fb10 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -33,9 +33,9 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A083F applymovement 6, MeteorFalls_1F_1R_Movement_1A083F waitmovement 0 - reappear 7 - reappear 8 - reappear 9 + addobject 7 + addobject 8 + addobject 9 applymovement 7, MeteorFalls_1F_1R_Movement_15C608 applymovement 8, MeteorFalls_1F_1R_Movement_15C60F applymovement 9, MeteorFalls_1F_1R_Movement_15C617 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC waitmovement 0 - disappear 5 - disappear 6 + removeobject 5 + removeobject 6 applymovement 7, MeteorFalls_1F_1R_Movement_15C628 waitmovement 0 .ifdef SAPPHIRE @@ -74,9 +74,9 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 8, MeteorFalls_1F_1R_Movement_15C62E applymovement 9, MeteorFalls_1F_1R_Movement_15C63E waitmovement 0 - disappear 7 - disappear 8 - disappear 9 + removeobject 7 + removeobject 8 + removeobject 9 setflag 819 setvar 0x40bf, 1 releaseall diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index b8388376a..c34eb9391 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -23,7 +23,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B call_if 1, MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 call_if 1, MossdeepCity_House2_EventScript_15A8B9 - disappear 3 + removeobject 3 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index aebb51c9c..8648487c9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -78,7 +78,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT - disappear 2 + removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e60c40cae..8720375ae 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -43,10 +43,10 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .endif closebutton fadescreen 1 - disappear 2 - disappear 4 - disappear 5 - disappear 6 + removeobject 2 + removeobject 4 + removeobject 5 + removeobject 6 setflag 916 setflag 917 fadescreen 0 @@ -286,7 +286,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 call_if 1, MtPyre_Summit_EventScript_15D78A compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 - disappear 2 + removeobject 2 setvar 0x40b9, 3 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index ef016f261..0627fc53b 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F - disappear LAST_TALKED + removeobject LAST_TALKED return NewMauville_Inside_MapScript1_15E593:: @ 815E593 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 0ece240c6..412261ce1 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -277,7 +277,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 closebutton applymovement 4, OldaleTown_Movement_14DFE5 waitmovement 0 - disappear 4 + removeobject 4 setvar 0x40c7, 2 setflag 979 releaseall diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1eff4d6c4..3ac7b85fc 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -69,7 +69,7 @@ PetalburgCity_Gym_MapScript2_154553:: @ 8154553 .2byte 0 PetalburgCity_Gym_EventScript_15455D:: @ 815455D - spriteface 255, 2 + turnobject 255, 2 end PetalburgCity_Gym_MapScript2_154562:: @ 8154562 @@ -85,7 +85,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 playse 9 - disappear 10 + removeobject 10 setflag 726 delay 30 applymovement 255, PetalburgCity_Gym_Movement_1A0841 @@ -142,7 +142,7 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E end PetalburgCity_Gym_EventScript_154669:: @ 8154669 - reappear 10 + addobject 10 playse 8 compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE @@ -204,7 +204,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if 1, PetalburgCity_Gym_EventScript_154860 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 - disappear 10 + removeobject 10 setflag 728 setvar 0x4085, 1 setvar 0x4057, 2 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 48eb53a50..4dececafa 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -86,7 +86,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA closebutton applymovement 3, PetalburgWoods_Movement_15CEB7 waitmovement 0 - disappear 3 + removeobject 3 applymovement 255, PetalburgWoods_Movement_1A0845 waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 @@ -110,7 +110,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D return PetalburgWoods_EventScript_15CE69:: @ 815CE69 - disappear 4 + removeobject 4 setvar 0x4098, 1 releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 35fbaf744..35c2d4117 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -21,8 +21,8 @@ Route101_EventScript_14E948:: @ 814E948 playbgm 410, 1 msgbox Route101_Text_16D10E, 4 closebutton - movesprite 2, 0, 15 - movesprite 4, 0, 16 + setobjectxy 2, 0, 15 + setobjectxy 4, 0, 16 applymovement 255, Route101_Movement_14EA2C applymovement 2, Route101_Movement_14EA50 applymovement 4, Route101_Movement_14EA1F @@ -220,8 +220,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag 2048 setflag 82 fadescreen 1 - disappear 4 - movesprite 255, 6, 13 + removeobject 4 + setobjectxy 255, 6, 13 applymovement 255, Route101_Movement_1A083F waitmovement 0 special ScrSpecial_ChooseStarter diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index b46545050..e5cf156a1 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -116,7 +116,7 @@ Route103_EventScript_14ED29:: @ 814ED29 end Route103_EventScript_14ED46:: @ 814ED46 - disappear 2 + removeobject 2 setvar 0x4062, 1 setvar 0x4084, 4 clearflag 889 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c954ac972..8abb7354a 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -128,10 +128,10 @@ Route104_EventScript_14EFD5:: @ 814EFD5 spritelevelup 255, 0, 19, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 - disappear 8 + removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - spriteinvisible 255, 0, 19 + hideobject 255, 0, 19 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,20 +139,20 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - spritevisible 255, 0, 11 + showobject 255, 0, 11 applymovement 255, Route104_Movement_14F168 waitmovement 0 movespriteperm 2, 12, 8 - reappear 2 + addobject 2 spritelevelup 2, 0, 11, 0 clearflag 740 applymovement 2, Route104_Movement_14F16F waitmovement 0 - reappear 4 + addobject 4 clearflag 743 call Route104_EventScript_1A02EF setflag 742 - spriteinvisible 7, 0, 19 + hideobject 7, 0, 19 copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 19 restorespritelevel 2, 0, 11 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 45ff1d3ed..7b13fef72 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -7,7 +7,7 @@ Route109_EventScript_14F4D3:: @ 814F4D3 spritelevelup 255, 0, 24, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 - disappear 2 + removeobject 2 switch FACING case 1, Route109_EventScript_14F518 case 3, Route109_EventScript_14F538 @@ -33,25 +33,25 @@ Route109_EventScript_14F538:: @ 814F538 end Route109_EventScript_14F548:: @ 814F548 - spriteinvisible 255, 0, 24 + hideobject 255, 0, 24 call Route109_EventScript_1A02E7 applymovement 1, Route109_Movement_14F5BF applymovement 255, Route109_Movement_14F5BF waitmovement 0 call Route109_EventScript_1A02EF - spritevisible 255, 0, 11 + showobject 255, 0, 11 applymovement 255, Route109_Movement_14F670 waitmovement 0 - reappear 4 + addobject 4 clearflag 743 movespriteperm 2, 12, 8 - reappear 2 + addobject 2 spritelevelup 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 clearflag 740 setflag 744 - spriteinvisible 1, 0, 24 + hideobject 1, 0, 24 msgbox Route109_Text_16B4B5, 4 closebutton copyvar 0x4096, 0x8008 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 56d4ff196..194816c36 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -433,8 +433,8 @@ Route110_EventScript_14FEB2:: @ 814FEB2 call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 - disappear 28 - reappear 29 + removeobject 28 + addobject 29 delay 45 compare 0x8008, 1 call_if 1, Route110_EventScript_14FF35 @@ -442,7 +442,7 @@ Route110_EventScript_14FEB2:: @ 814FEB2 call_if 1, Route110_EventScript_14FF40 compare 0x8008, 3 call_if 1, Route110_EventScript_14FF4B - disappear 29 + removeobject 29 setvar 0x4069, 1 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index f99869648..0445496d2 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -21,9 +21,9 @@ Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 .2byte 0 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F - reappear 1 - spritevisible 1, 29, 1 - spriteface 1, 4 + addobject 1 + showobject 1, 29, 1 + turnobject 1, 4 end Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C @@ -185,7 +185,7 @@ Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E playse 178 applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 addvar 0x4044, 1 return @@ -223,7 +223,7 @@ Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall - spriteface 1, 3 + turnobject 1, 3 playse 21 applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 waitmovement 0 @@ -238,7 +238,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 waitmovement 0 delay 4 - spriteface 1, 4 + turnobject 1, 4 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 129cc7d6a..677ce93fa 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -138,15 +138,15 @@ Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 .2byte 0 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 - reappear 1 - spritevisible 1, 29, 0 - spriteface 1, 4 - spriteface 255, 3 + addobject 1 + showobject 1, 29, 0 + turnobject 1, 4 + turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 - reappear 1 - spriteinvisible 1, 29, 0 + addobject 1 + hideobject 1, 29, 0 switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 @@ -159,51 +159,51 @@ Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 end Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B - movesprite 1, 6, 3 + setobjectxy 1, 6, 3 end Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173 - movesprite 1, 11, 5 + setobjectxy 1, 11, 5 end Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B - movesprite 1, 11, 1 + setobjectxy 1, 11, 1 end Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183 - movesprite 1, 3, 1 + setobjectxy 1, 3, 1 end Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B - movesprite 1, 0, 5 + setobjectxy 1, 0, 5 end Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193 - movesprite 1, 9, 1 + setobjectxy 1, 9, 1 end Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B - movesprite 1, 8, 1 + setobjectxy 1, 8, 1 end Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3 - movesprite 1, 4, 4 + setobjectxy 1, 4, 4 end Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB - disappear 1 + removeobject 1 end Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF - reappear 1 - movesprite 1, 5, 2 - spriteface 1, 2 + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 2 end Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE - reappear 1 - movesprite 1, 5, 2 - spriteface 1, 1 + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 1 end Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD @@ -223,7 +223,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 playse 178 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 setvar 0x40a7, 1 setvar 0x40a6, 0 releaseall @@ -472,7 +472,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 playse 178 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 setvar 0x40c1, 0 setvar 0x40a7, 5 releaseall diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 617509938..879735ece 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -58,11 +58,11 @@ Route111_EventScript_150023:: @ 8150023 closebutton setflag 963 setflag 964 - disappear 34 + removeobject 34 delay 30 applymovement 35, Route111_Movement_1500AF waitmovement 0 - disappear 35 + removeobject 35 releaseall end @@ -80,11 +80,11 @@ Route111_EventScript_150069:: @ 8150069 closebutton setflag 964 setflag 963 - disappear 35 + removeobject 35 delay 30 applymovement 34, Route111_Movement_1500AF waitmovement 0 - disappear 34 + removeobject 34 releaseall end @@ -254,12 +254,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 1, Route111_Movement_150356 waitmovement 0 - disappear 1 + removeobject 1 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 2 + addobject 2 applymovement 2, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -272,12 +272,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 2, Route111_Movement_150356 waitmovement 0 - disappear 2 + removeobject 2 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 3 + addobject 3 applymovement 3, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -290,12 +290,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 3, Route111_Movement_150356 waitmovement 0 - disappear 3 + removeobject 3 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 4 + addobject 4 applymovement 4, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -308,7 +308,7 @@ Route111_EventScript_1501F3:: @ 81501F3 call Route111_EventScript_150348 applymovement 4, Route111_Movement_150356 waitmovement 0 - disappear 4 + removeobject 4 call Route111_EventScript_15034F release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 5a328f198..ca3895e1a 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -56,7 +56,7 @@ Route116_EventScript_150A94:: @ 8150A94 call_if 1, Route116_EventScript_150AEE compare FACING, 4 call_if 1, Route116_EventScript_150AF9 - disappear LAST_TALKED + removeobject LAST_TALKED clearflag 949 setflag 256 release @@ -189,7 +189,7 @@ Route116_EventScript_150C03:: @ 8150C03 call_if 1, Route116_EventScript_150C37 compare FACING, 4 call_if 1, Route116_EventScript_150C42 - disappear LAST_TALKED + removeobject LAST_TALKED release end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 86e5f9045..8427395a6 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -90,7 +90,7 @@ Route118_EventScript_151004:: @ 8151004 compare 0x8008, 2 call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 - disappear 19 + removeobject 19 releaseall end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index fff294ca9..d825cb96e 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -16,11 +16,11 @@ Route119_EventScript_15117C:: @ 815117C return Route119_EventScript_151193:: @ 8151193 - disappear 35 + removeobject 35 return Route119_EventScript_151197:: @ 8151197 - disappear 36 + removeobject 36 return Route119_MapScript1_15119B:: @ 815119B @@ -50,7 +50,7 @@ Route119_EventScript_1511D0:: @ 81511D0 Route119_EventScript_1511DB:: @ 81511DB lockall - reappear 25 + addobject 25 checkgender compare RESULT, 0 call_if 1, Route119_EventScript_151254 @@ -68,8 +68,8 @@ Route119_EventScript_1511DB:: @ 81511DB call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 - disappear 25 - reappear 16 + removeobject 25 + addobject 16 delay 30 checkgender compare RESULT, 0 @@ -158,14 +158,14 @@ Route119_EventScript_151362:: @ 8151362 call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 - disappear 16 - reappear 25 + removeobject 16 + addobject 25 delay 30 compare 0x4001, 1 call_if 1, Route119_EventScript_1513BC compare 0x4001, 2 call_if 1, Route119_EventScript_1513C7 - disappear 25 + removeobject 25 setvar 0x4072, 1 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 5f9cf9888..37b6d07a9 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -43,9 +43,9 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 fadedefaultbgm fadescreen 1 setflag 890 - disappear 1 - disappear 2 - disappear 3 + removeobject 1 + removeobject 2 + removeobject 3 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmovement 0 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index cb8ebb2cc..b6bb60ddd 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -25,28 +25,28 @@ Route120_EventScript_151628:: @ 8151628 return Route120_EventScript_15166B:: @ 815166B - disappear 30 - disappear 36 + removeobject 30 + removeobject 36 return Route120_EventScript_151672:: @ 8151672 - disappear 37 + removeobject 37 return Route120_EventScript_151676:: @ 8151676 - disappear 38 + removeobject 38 return Route120_EventScript_15167A:: @ 815167A - disappear 39 + removeobject 39 return Route120_EventScript_15167E:: @ 815167E - disappear 41 + removeobject 41 return Route120_EventScript_151682:: @ 8151682 - disappear 40 + removeobject 40 return Route120_MapScript1_151686:: @ 8151686 @@ -248,7 +248,7 @@ Route120_EventScript_151908:: @ 8151908 setanimation 0, 1 doanimation 30 delay 15 - disappear 31 + removeobject 31 checkanimation 30 setmaptile 13, 15, 663, 0 setmaptile 12, 16, 671, 0 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index efaf251b1..43be91266 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -26,9 +26,9 @@ Route121_EventScript_151B25:: @ 8151B25 applymovement 13, Route121_Movement_151B60 applymovement 14, Route121_Movement_151B69 waitmovement 0 - disappear 12 - disappear 13 - disappear 14 + removeobject 12 + removeobject 13 + removeobject 14 setvar 0x4074, 1 releaseall end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 158313a1b..f19dc6662 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -49,13 +49,13 @@ Route128_EventScript_15213F:: @ 815213F applymovement 5, Route128_Movement_152296 applymovement 4, Route128_Movement_152283 waitmovement 0 - disappear 5 - disappear 4 + removeobject 5 + removeobject 4 delay 100 setanimation 0, 1 doanimation 30 checkanimation 30 - reappear 3 + addobject 3 applymovement 3, Route128_Movement_15226F waitmovement 0 applymovement 255, Route128_Movement_1A0843 @@ -80,7 +80,7 @@ Route128_EventScript_15213F:: @ 815213F setanimation 0, 1 doanimation 30 delay 15 - disappear 3 + removeobject 3 checkanimation 30 setvar 0x407b, 2 releaseall diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index dcbb75886..d2469dca7 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -165,18 +165,18 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD RustboroCity_EventScript_14C4F4:: @ 814C4F4 msgbox RustboroCity_Text_166E65, 4 closebutton - reappear 10 - reappear 9 + addobject 10 + addobject 9 applymovement 10, RustboroCity_Movement_14C5C2 waitmovement 0 - disappear 10 + removeobject 10 applymovement 9, RustboroCity_Movement_14C5D3 waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 closebutton applymovement 9, RustboroCity_Movement_14C5DB waitmovement 0 - disappear 9 + removeobject 9 movespriteperm 9, 30, 10 clearflag 732 setflag 142 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 88f1c377a..6458ec5ca 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 - spriteface 255, 4 + turnobject 255, 4 end RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 81bfcd27d..0cfb66351 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -318,9 +318,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 waitmovement 0 - disappear 6 + removeobject 6 delay 50 - reappear 5 + addobject 5 applymovement 5, RusturfTunnel_Movement_15CAAC waitmovement 0 applymovement 255, RusturfTunnel_Movement_15CA9F @@ -339,8 +339,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 waitmovement 0 - disappear 5 - disappear 7 + removeobject 5 + removeobject 7 clearflag 142 setflag 143 setvar 0x405a, 4 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 087c1caf7..e600611be 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -28,7 +28,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closebutton - reappear 0x8004 + addobject 0x8004 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36 @@ -96,8 +96,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 - disappear 7 - reappear 1 + removeobject 7 + addobject 1 waitstate delay 60 applymovement 1, SeafloorCavern_Room9_Movement_15DD4C @@ -110,7 +110,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 - disappear 1 + removeobject 1 delay 4 setvar 0x8004, 2 setvar 0x8005, 2 @@ -153,9 +153,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closebutton - reappear 0x8005 - reappear 0x8006 - reappear 0x8007 + addobject 0x8005 + addobject 0x8006 + addobject 0x8007 applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 9a8a57e3f..f5ee60d6d 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -8,7 +8,7 @@ SkyPillar_Top_MapScript1_15F308:: @ 815F308 end SkyPillar_Top_EventScript_15F312:: @ 815F312 - disappear LAST_TALKED + removeobject LAST_TALKED return SkyPillar_Top_EventScript_15F316:: @ 815F316 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index aba9ee235..1c9fc342f 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -502,8 +502,8 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 10, SlateportCity_Movement_14BFDD applymovement 9, SlateportCity_Movement_14BFEA waitmovement 0 - disappear 10 - disappear 9 + removeobject 10 + removeobject 9 msgbox SlateportCity_Text_16558D, 4 applymovement 11, SlateportCity_Movement_1A0841 waitmovement 0 @@ -532,7 +532,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_14BFFB applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 - disappear 11 + removeobject 11 clearflag 841 clearflag 848 clearflag 845 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 184586d94..50f4926e4 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -59,9 +59,9 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 applymovement 7, SlateportCity_Harbor_Movement_15609B applymovement 8, SlateportCity_Harbor_Movement_1560A5 waitmovement 0 - disappear 6 - disappear 7 - disappear 8 + removeobject 6 + removeobject 7 + removeobject 8 setvar 0x40a0, 2 compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C @@ -222,13 +222,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 9, 8 + hideobject LAST_TALKED, 9, 8 compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 7fe5865a4..32a5c2013 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -181,7 +181,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 waitmovement 0 setflag 965 playse 9 - disappear 13 + removeobject 13 release end @@ -190,7 +190,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD waitmovement 0 setflag 965 playse 9 - disappear 13 + removeobject 13 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index c1398e579..5f64b3941 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -12,10 +12,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closebutton playbgm BGM_EVIL_TEAM, 1 - reappear 3 + addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmovement 0 - reappear 4 + addobject 4 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 @@ -55,7 +55,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 closebutton delay 35 - reappear 2 + addobject 2 applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE waitmovement 0 @@ -69,9 +69,9 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 .endif closebutton fadescreen 1 - disappear 2 - disappear 3 - disappear 4 + removeobject 2 + removeobject 3 + removeobject 4 fadescreen 0 delay 30 setflag 883 @@ -85,7 +85,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 playse 9 - disappear 1 + removeobject 1 setflag 900 setflag 149 clearflag 947 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 936b859e5..90d2bcc5e 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -464,7 +464,7 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD setanimation 0, 1 doanimation 30 delay 15 - disappear LAST_TALKED + removeobject LAST_TALKED checkanimation 30 release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 358e2277c..77c163c47 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,7 +17,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 - spriteinvisible 1, 26, 9 + hideobject 1, 26, 9 setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C warp LilycoveCity_Harbor, 255, 8, 11 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 37af5e140..f4ec0ab2f 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -9,7 +9,7 @@ SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E end SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 - disappear 2 + removeobject 2 return SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C @@ -57,7 +57,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 pokecry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 waitpokecry - reappear 2 + addobject 2 delay 30 applymovement 127, SouthernIsland_Interior_Movement_160C16 applymovement 2, SouthernIsland_Interior_Movement_160C22 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 994f37b63..0c621d237 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A end LinkContestRoom1_EventScript_15F625:: @ 815F625 - spriteinvisible 255, 0, 9 + hideobject 255, 0, 9 call LinkContestRoom1_EventScript_15F919 end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index a0173e720..2ed660a5f 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -13,7 +13,7 @@ VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF07 waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 @@ -21,7 +21,7 @@ VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF13 waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 @@ -29,7 +29,7 @@ VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF1E waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 432ba8f65..a821fd62d 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -74,13 +74,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse 9 - disappear 0x8008 + removeobject 0x8008 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 setvar 0x8008, 14 - reappear 0x8008 + addobject 0x8008 applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 @@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 setvar 0x8008, 14 - reappear 0x8008 + addobject 0x8008 applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F @@ -397,7 +397,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 - disappear 0x8009 + removeobject 0x8009 setflag 291 setvar 0x4082, 4 setvar 0x408c, 4 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index dde0d0400..9f9b21807 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -272,10 +272,10 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D setvar 0x8004, 0 fadescreen 1 - disappear 240 - disappear 239 - disappear 238 - disappear 237 + removeobject 240 + removeobject 239 + removeobject 238 + removeobject 237 special sub_804E538 waitstate releaseall diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 2c1524e5b..d9ebe56a3 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -22,7 +22,7 @@ Route111_EventScript_1A3877:: @ 81A3877 call_if 1, Route111_EventScript_1A38C3 compare FACING, 2 call_if 1, Route111_EventScript_1A38CE - disappear LAST_TALKED + removeobject LAST_TALKED release end diff --git a/src/scrcmd.c b/src/scrcmd.c index d44fa53e2..233f04f37 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1011,9 +1011,9 @@ bool8 ScrCmd_waitmovexy(struct ScriptContext *ctx) bool8 ScrCmd_disappear(struct ScriptContext *ctx) { - u16 objectId = VarGet(ScriptReadHalfword(ctx)); + u16 localId = VarGet(ScriptReadHalfword(ctx)); - RemoveFieldObjectByLocalIdAndMap(objectId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + RemoveFieldObjectByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); return FALSE; } |