diff options
Diffstat (limited to 'data')
138 files changed, 1183 insertions, 1912 deletions
diff --git a/data/battle_1.s b/data/battle_1.s deleted file mode 100644 index 37f68bfd6..000000000 --- a/data/battle_1.s +++ /dev/null @@ -1,12 +0,0 @@ - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_082FF1C8:: @ 82FF1C8 - .byte 0x01, 0x04, 0x10, 0x40 - .byte 0x02, 0x04, 0x08, 0x20 - .byte 0x02, 0x04, 0x08, 0x20 - .byte 0x00, 0x00, 0x00, 0x00 diff --git a/data/event_scripts.s b/data/event_scripts.s index c2906e649..841a9935c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1938,11 +1938,11 @@ RustboroCity_EventScript_271ED7:: @ 8271ED7 end RustboroCity_EventScript_271EEF:: @ 8271EEF - setvar VAR_0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, 105 return RustboroCity_EventScript_271EF5:: @ 8271EF5 - setvar VAR_0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, 100 return LavaridgeTown_EventScript_271EFB:: @ 8271EFB @@ -1956,11 +1956,11 @@ Route119_EventScript_271EFB:: @ 8271EFB end LavaridgeTown_EventScript_271F13:: @ 8271F13 - setvar VAR_0x4013, 106 + setvar VAR_OBJ_GFX_ID_3, 106 return LavaridgeTown_EventScript_271F19:: @ 8271F19 - setvar VAR_0x4013, 101 + setvar VAR_OBJ_GFX_ID_3, 101 return EventScript_271F1F:: @ 8271F1F @@ -1972,11 +1972,11 @@ EventScript_271F1F:: @ 8271F1F end EventScript_271F37:: @ 8271F37 - setvar VAR_0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, 100 return EventScript_271F3D:: @ 8271F3D - setvar VAR_0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, 105 return DewfordTown_Gym_EventScript_271F43:: @ 8271F43 @@ -2393,25 +2393,25 @@ EventScript_272274:: @ 8272274 waitse playmoncry SPECIES_KYOGRE, 2 waitmoncry - setvar VAR_0x4005, 1 + setvar VAR_TEMP_5, 1 releaseall end EventScript_272283:: @ 8272283 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_2722A7 end EventScript_27228F:: @ 827228F lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_2722A7 end EventScript_27229B:: @ 827229B lockall - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 goto EventScript_2722A7 end @@ -2429,11 +2429,11 @@ CaveOfOrigin_1F_EventScript_2722C1:: @ 82722C1 CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1:: @ 82722C1 CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1:: @ 82722C1 CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1 - setvar VAR_0x4001, 1 - setvar VAR_0x4002, 1 - setvar VAR_0x4003, 1 - setvar VAR_0x4004, 1 - setvar VAR_0x4005, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 return Route120_EventScript_2722DB:: @ 82722DB @@ -3522,7 +3522,7 @@ MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0 Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0 RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 bufferboxname 0, 16438 - bufferspeciesname 1, VAR_0x4001 + bufferspeciesname 1, VAR_TEMP_1 checkflag FLAG_SYS_PC_LANETTE call_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB checkflag FLAG_SYS_PC_LANETTE @@ -13216,12 +13216,12 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF:: @ 82C3ECF end BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE - map_script_2 VAR_0x4004, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 .2byte 0 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 - setvar VAR_0x4011, 28 - setvar VAR_0x4010, 28 + setvar VAR_OBJ_GFX_ID_1, 28 + setvar VAR_OBJ_GFX_ID_0, 28 setvar VAR_0x8004, 5 special sub_81A703C compare VAR_RESULT, 3 @@ -13233,17 +13233,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 compare VAR_RESULT, 8 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F hideobjectat 2, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 - setvar VAR_0x4004, 1 + setvar VAR_TEMP_4, 1 turnobject 255, 2 end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 - setvar VAR_0x4004, 1 + setvar VAR_TEMP_4, 1 turnobject 255, 2 end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F - setvar VAR_0x4004, 1 + setvar VAR_TEMP_4, 1 turnobject 255, 2 hideobjectat 1, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 end @@ -13313,26 +13313,26 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062:: @ 82C4062 - setvar VAR_0x4003, 1 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D - setvar VAR_0x4003, 0 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 lockall msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, 4 closemessage end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082:: @ 82C4082 - setvar VAR_0x4003, 1 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D - setvar VAR_0x4003, 0 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 lockall msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, 4 closemessage @@ -13435,13 +13435,13 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 end BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202:: @ 82C4202 - setvar VAR_0x4003, 1 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 end BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D - setvar VAR_0x4003, 0 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 lockall msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, 4 closemessage @@ -14632,7 +14632,7 @@ TrainerHill_2F_MapScript1_2C8336: @ 82C8336 TrainerHill_3F_MapScript1_2C8336: @ 82C8336 TrainerHill_4F_MapScript1_2C8336: @ 82C8336 TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 4 special sp194_trainer_tower setvar VAR_0x8004, 1 @@ -14648,11 +14648,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 TrainerHill_1F_MapScript2_2C8372: @ 82C8372 TrainerHill_2F_MapScript2_2C8372: @ 82C8372 - map_script_2 VAR_0x4003, 0, TrainerHill_1F_EventScript_2C837C + map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C .2byte 0 TrainerHill_1F_EventScript_2C837C:: @ 82C837C - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 @ forced stop TrainerHill_1F_MapScript2_2C8381: @ 82C8381 @@ -14660,8 +14660,8 @@ TrainerHill_2F_MapScript2_2C8381: @ 82C8381 TrainerHill_3F_MapScript2_2C8381: @ 82C8381 TrainerHill_4F_MapScript2_2C8381: @ 82C8381 TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 - map_script_2 VAR_0x4002, 0, TrainerHill_1F_EventScript_2C83A6 - map_script_2 VAR_0x4001, 1, TrainerHill_1F_EventScript_2C83DF + map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6 + map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF .2byte 0 TrainerHill_1F_EventScript_2C8393:: @ 82C8393 @@ -14673,7 +14673,7 @@ TrainerHill_1F_EventScript_2C8393:: @ 82C8393 end TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 9 special sp194_trainer_tower compare VAR_RESULT, 1 @@ -14690,12 +14690,12 @@ TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 special sp194_trainer_tower setvar VAR_0x8004, 5 special sp194_trainer_tower - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 end TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 warp TRAINER_HILL_ENTRANCE, 255, 9, 6 waitstate end diff --git a/data/field_effect.s b/data/field_effect.s deleted file mode 100644 index e6f8a558e..000000000 --- a/data/field_effect.s +++ /dev/null @@ -1,451 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - - .align 2 -gNewGameBirchPic:: @ 8553A90 - .incbin "graphics/birch_speech/birch.4bpp" - - .space 0x3800 - - .incbin "graphics/unused/intro_birch_beauty.4bpp" - - .align 2 -gNewGameBirchPalette:: @ 855A950 - .incbin "graphics/birch_speech/birch.gbapal" - - .align 2 -gSpriteImage_855A970:: @ 855A970 - .incbin "graphics/misc/pokeball_glow.4bpp" - - .align 2 -gFieldEffectObjectPalette4:: @ 855A990 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal" - - .align 2 -gSpriteImage_855A9B0:: @ 855A9B0 - .incbin "graphics/misc/pokecenter_monitor/0.4bpp" - - .align 2 -gSpriteImage_855AA70:: @ 855AA70 - .incbin "graphics/misc/pokecenter_monitor/1.4bpp" - - .align 2 -gSpriteImage_855AB30:: @ 855AB30 - .incbin "graphics/misc/big_hof_monitor.4bpp" - - .align 2 -gSpriteImage_855AD30:: @ 855AD30 - .incbin "graphics/misc/small_hof_monitor.4bpp" - - .align 2 -gFieldEffectObjectPalette5:: @ 855AE30 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal" - - .align 2 -gUnknown_0855AE50:: @ 855AE50 - .incbin "graphics/misc/field_move_streaks.4bpp" - - .align 2 -gUnknown_0855B050:: @ 855B050 - .incbin "graphics/misc/field_move_streaks.gbapal" - - .align 2 -gUnknown_0855B070:: @ 855B070 - .incbin "graphics/misc/field_move_streaks_map.bin" - - .align 2 -gUnknown_0855B2F0:: @ 855B2F0 - .incbin "graphics/misc/darkness_field_move_streaks.4bpp" - - .align 2 -gUnknown_0855B370:: @ 855B370 - .incbin "graphics/misc/darkness_field_move_streaks.gbapal" - - .align 2 -gUnknown_0855B390:: @ 855B390 - .incbin "graphics/misc/darkness_field_move_streaks_map.bin" - - .align 2 -gUnknown_0855B610:: @ 855B610 - .incbin "graphics/misc/spotlight.gbapal" - - .align 2 -gUnknown_0855B630:: @ 855B630 - .incbin "graphics/misc/spotlight.4bpp" - - .align 2 -gUnknown_0855C170:: @ 855C170 - .incbin "graphics/unknown/unknown_55C170.4bpp" - - .align 2 -gUnknown_0855C1F0:: @ 855C1F0 - .4byte FieldEffectCmd_loadtiles - .4byte FieldEffectCmd_loadfadedpal - .4byte FieldEffectCmd_loadpal - .4byte FieldEffectCmd_callnative - .4byte FieldEffectCmd_end - .4byte FieldEffectCmd_loadgfx_callnative - .4byte FieldEffectCmd_loadtiles_callnative - .4byte FieldEffectCmd_loadfadedpal_callnative - - .align 2 -@ TODO: something else uses these too -gNewGameBirchOamAttributes:: @ 855C210 - .4byte OAM_SIZE_64x64 - .2byte 0 - - .align 2 -gOamData_855C218:: @ 855C218 - .2byte 0x0000, 0x0000, 0x0000, 0x0000 - - .align 2 -gOamData_855C220:: @ 855C220 - .2byte 0x0000, 0x4000, 0x0000, 0x0000 - - .align 2 -gNewGameBirchPicTable:: @ 855C228 - obj_tiles gNewGameBirchPic, 0x800 - - .align 2 -gNewGameBirchObjectPaletteInfo:: @ 855C230 - obj_pal gNewGameBirchPalette, 0x1006 - - .align 2 -gNewGameBirchImageAnim:: @ 855C238 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gNewGameBirchImageAnimTable:: @ 855C240 - .4byte gNewGameBirchImageAnim - - .align 2 -gNewGameBirchObjectTemplate:: @ 855C244 - spr_template 0xFFFF, 0x1006, gNewGameBirchOamAttributes, gNewGameBirchImageAnimTable, gNewGameBirchPicTable, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gFieldEffectObjectPaletteInfo4:: @ 855C25C - obj_pal gFieldEffectObjectPalette4, 0x1007 - - .align 2 -gFieldEffectObjectPaletteInfo5:: @ 855C264 - obj_pal gFieldEffectObjectPalette5, 0x1010 - - .align 2 -gOamData_855C26C:: @ 855C26C - .2byte 0x4000, 0x8000, 0x0000, 0x0000 - - .align 2 -gUnknown_855C274:: @ 855C274 - obj_frame_tiles gSpriteImage_855A970, 0x0020 - - .align 2 -gUnknown_855C27C:: @ 855C27C - obj_frame_tiles gSpriteImage_855A9B0, 0x00c0 - obj_frame_tiles gSpriteImage_855AA70, 0x00c0 - - .align 2 -gUnknown_855C28C:: @ 855C28C - obj_frame_tiles gSpriteImage_855AB30, 0x0200 - - .align 2 -gUnknown_855C294:: @ 855C294 - obj_frame_tiles gSpriteImage_855AD30, 0x0200 - - .align 2 -gSubspriteTable_855C29C:: @ 855C29C - subsprite -12, -8, 2, 0, 16x8 - subsprite 4, -8, 2, 2, 8x8 - subsprite -12, 0, 2, 3, 16x8 - subsprite 4, 0, 2, 5, 8x8 - - .align 2 -gUnknown_0855C2AC:: @ 855C2AC - .4byte 4, gSubspriteTable_855C29C - - .align 2 -gSubspriteTable_855C2B4:: @ 855C2B4 - subsprite -32, -8, 2, 0, 32x8 - subsprite 0, -8, 2, 4, 32x8 - subsprite -32, 0, 2, 8, 32x8 - subsprite 0, 0, 2, 12, 32x8 - - .align 2 -gUnknown_0855C2C4:: @ 855C2C4 - .4byte 4, gSubspriteTable_855C2B4 - - .align 2 -gUnknown_0855C2CC:: @ 855C2CC - .2byte 0x0000, 0x0001, 0xfffe, 0x0000 - - .align 2 -gUnknown_0855C2D4:: @ 855C2D4 - .2byte 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010 - .2byte 0xffff, 0x0000 - - .align 2 -gUnknown_0855C2F8:: @ 855C2F8 - .4byte gUnknown_0855C2CC - .4byte gUnknown_0855C2D4 - - .align 2 -gUnknown_0855C300:: @ 855C300 - .4byte gUnknown_0855C2CC - - .align 2 -gUnknown_0855C304:: @ 855C304 - spr_template 0xffff, 0x1007, gOamData_855C218, gUnknown_0855C2F8, gUnknown_855C274, gDummySpriteAffineAnimTable, sub_80B6828 - - .align 2 -gUnknown_0855C31C:: @ 855C31C - spr_template 0xffff, 0x1004, gOamData_855C220, gUnknown_0855C2F8, gUnknown_855C27C, gDummySpriteAffineAnimTable, sub_80B68AC - - .align 2 -gUnknown_0855C334:: @ 855C334 - spr_template 0xffff, 0x1010, gOamData_855C220, gUnknown_0855C300, gUnknown_855C28C, gDummySpriteAffineAnimTable, sub_80B6970 - - .align 2 -gUnknown_0855C34C:: @ 855C34C - spr_template 0xffff, 0x1010, gOamData_855C26C, gUnknown_0855C300, gUnknown_855C294, gDummySpriteAffineAnimTable, sub_80B6970 - - .align 2 -gUnknown_0855C364:: @ 855C364 - .4byte sub_80B6214 - .4byte sub_80B6250 - .4byte sub_80B628C - .4byte sub_80B62B4 - - .align 2 -gUnknown_0855C374:: @ 855C374 - .4byte sub_80B6360 - .4byte sub_80B63D4 - .4byte sub_80B6404 - .4byte sub_80B642C - - .align 2 -gUnknown_0855C384:: @ 855C384 - .4byte sub_80B64DC - .4byte sub_80B6574 - .4byte sub_80B65A8 - .4byte sub_80B66E8 - .4byte sub_80B67DC - .4byte sub_80B67F8 - .4byte sub_80B6800 - .4byte nullsub_97 - - .align 1 -gUnknown_0855C3A4:: @ 855C3A4 - .2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008 - -gUnknown_0855C3BC:: @ 855C3BC - .byte 0x10, 0x0c, 0x08, 0x00 - -gUnknown_0855C3C0:: @ 855C3C0 - .byte 0x10, 0x0c, 0x08, 0x00 - -gUnknown_0855C3C4:: @ 855C3C4 - .byte 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0855C3C8:: @ 855C3C8 - .4byte sub_80B6BCC - .4byte sub_80B6C74 - .4byte sub_80B6C90 - .4byte sub_80B6D04 - .4byte sub_80B6DBC - .4byte sub_80B6DD8 - .4byte sub_80B6E18 - - .align 2 -gUnknown_0855C3E4:: @ 855C3E4 - .4byte sub_80B6EC0 - .4byte sub_80B6EE0 - .4byte sub_80B6F50 - .4byte sub_80B6F74 - .4byte sub_80B6F84 - .4byte sub_80B6FA8 - - .align 2 -gUnknown_0855C3FC:: @ 855C3FC - .4byte sub_80B7114 - .4byte sub_80B7190 - .4byte sub_80B71D0 - .4byte sub_80B7230 - .4byte sub_80B7270 - .4byte sub_80B72D0 - .4byte sub_80B72F4 - - .align 2 -gUnknown_0855C418:: @ 855C418 - .4byte sub_80B73D0 - .4byte waterfall_1_do_anim_probably - .4byte waterfall_2_wait_anim_finish_probably - .4byte sub_80B7450 - .4byte sub_80B7478 - - .align 2 -gUnknown_0855C42C:: @ 855C42C - .4byte dive_1_lock - .4byte dive_2_unknown - .4byte dive_3_unknown - - .align 2 -gUnknown_0855C438:: @ 855C438 - .4byte sub_80B764C - .4byte sub_80B7684 - .4byte sub_80B76B8 - .4byte sub_80B7704 - .4byte sub_80B77F8 - .4byte sub_80B7814 - - .align 2 -gUnknown_0855C450:: @ 855C450 - .4byte sub_80B78EC - .4byte sub_80B791C - .4byte sub_80B7968 - .4byte sub_80B79BC - - .align 2 -gUnknown_0855C460:: @ 855C460 - .4byte sub_80B7AE8 - .4byte sub_80B7B18 - .4byte sub_80B7B94 - .4byte sub_80B7BCC - .4byte sub_80B7BF4 - - .align 2 -gUnknown_0855C474:: @ 855C474 - .4byte sub_80B7D14 - .4byte sub_80B7D34 - -gUnknown_0855C47C:: @ 855C47C - .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0855C484:: @ 855C484 - .4byte sub_80B7EC4 - .4byte sub_80B7EE8 - - .align 2 -gUnknown_0855C48C:: @ 855C48C - .4byte sub_80B800C - .4byte sub_80B8034 - .4byte sub_80B80C4 - .4byte sub_80B8198 - - .align 2 -gUnknown_0855C49C:: @ 855C49C - .4byte sub_80B8280 - .4byte sub_80B830C - .4byte sub_80B8410 - - .align 2 -gUnknown_0855C4A8:: @ 855C4A8 - .4byte sub_80B8584 - .4byte sub_80B85F8 - .4byte sub_80B8660 - .4byte sub_80B86EC - .4byte sub_80B871C - .4byte sub_80B8770 - .4byte overworld_bg_setup_2 - - .align 2 -gUnknown_0855C4C4:: @ 855C4C4 - .4byte sub_80B88E4 - .4byte sub_80B8920 - .4byte sub_80B898C - .4byte sub_80B89DC - .4byte sub_80B8A0C - .4byte sub_80B8A44 - .4byte sub_80B8A64 - - .align 2 -gUnknown_0855C4E0:: @ 855C4E0 - .4byte sub_80B8DB4 - .4byte sub_80B8E14 - .4byte sub_80B8E60 - .4byte sub_80B8EA8 - .4byte sub_80B8F24 - - .align 2 -gUnknown_0855C4F4:: @ 855C4F4 - .4byte sub_80B9204 - .4byte sub_80B925C - .4byte sub_80B92A0 - .4byte sub_80B92F8 - .4byte sub_80B933C - .4byte sub_80B9390 - .4byte sub_80B9418 - .4byte sub_80B9474 - .4byte sub_80B9494 - - .align 2 -gUnknown_0855C518:: @ 855C518 - .2byte 0x0008, 0x0008, 0x00e2, 0x0000, 0x001c, 0x001c, 0x1e00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0855C530:: @ 855C530 - .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0xfff6, 0xfff6, 0x1600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0855C548:: @ 855C548 - .4byte gUnknown_0855C518 - .4byte gUnknown_0855C530 - - .align 2 -gUnknown_0855C550:: @ 855C550 - .4byte sub_80B9804 - .4byte sub_80B98B8 - .4byte sub_80B9924 - .4byte sub_80B9978 - .4byte sub_80B99F0 - .4byte sub_80B9A28 - .4byte sub_80B9A60 - -gUnknown_0855C56C:: @ 855C56C - .byte 0xfe, 0xff, 0xfc, 0xff, 0xfb, 0xff, 0xfa, 0xff, 0xf9, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf9, 0xff, 0xf9, 0xff, 0xfa, 0xff, 0xfb, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0x00, 0x00, 0x02, 0x00 - .byte 0x04, 0x00, 0x08, 0x00 - - .align 2 -gUnknown_0855C590:: @ 855C590 - .4byte sub_80B9C28 - .4byte sub_80B9C54 - .4byte sub_80B9CDC - - .align 2 -gUnknown_0855C59C:: @ 855C59C - obj_frame_tiles gUnknown_0855C170, 0x0020 - obj_frame_tiles gUnknown_0855C170 + 0x20, 0x0020 - obj_frame_tiles gUnknown_0855C170 + 0x40, 0x0020 - obj_frame_tiles gUnknown_0855C170 + 0x60, 0x0020 - - .align 2 -gUnknown_0855C5BC:: @ 855C5BC - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_0855C5C4:: @ 855C5C4 - .2byte 0x0001, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_0855C5CC:: @ 855C5CC - .2byte 0x0002, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_0855C5D4:: @ 855C5D4 - .2byte 0x0003, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_0855C5DC:: @ 855C5DC - .4byte gUnknown_0855C5BC - .4byte gUnknown_0855C5C4 - .4byte gUnknown_0855C5CC - .4byte gUnknown_0855C5D4 - - .align 2 -gUnknown_0855C5EC:: @ 855C5EC - spr_template 0xffff, 0x111a, gOamData_855C218, gUnknown_0855C5DC, gUnknown_0855C59C, gDummySpriteAffineAnimTable, sub_80B9DB8 - diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index c06497093..8dfbd6782 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -98,7 +98,7 @@ gFieldEffectScript_Ripple:: @ 82DBB02 field_eff_end gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C - field_eff_callnative sub_80B849C + field_eff_callnative FldEff_FieldMoveShowMon field_eff_end gFieldEffectScript_Ash:: @ 82DBB12 @@ -110,7 +110,7 @@ gFieldEffectScript_SurfBlob:: @ 82DBB1C field_eff_end gFieldEffectScript_UseSurf:: @ 82DBB22 - field_eff_callnative sub_80B8D44 + field_eff_callnative FldEff_UseSurf field_eff_end gFieldEffectScript_GroundImpactDust:: @ 82DBB28 @@ -175,7 +175,7 @@ gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC gFieldEffectScript_Unknown25:: @ 82DBBB6 field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B61A0 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal field_eff_end gFieldEffectScript_Unknown26:: @ 82DBBC5 @@ -195,15 +195,15 @@ gFieldEffectScript_MountainDisguise:: @ 82DBBD7 field_eff_end gFieldEffectScript_Unknown30:: @ 82DBBDD - field_eff_callnative sub_80B90CC + field_eff_callnative FldEff_NPCFlyOut field_eff_end gFieldEffectScript_UseFly:: @ 82DBBE3 - field_eff_callnative sub_80B91A4 + field_eff_callnative FldEff_UseFly field_eff_end gFieldEffectScript_FlyIn:: @ 82DBBE9 - field_eff_callnative sub_80B97C0 + field_eff_callnative FldEff_FlyIn field_eff_end gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF @@ -247,11 +247,11 @@ gFieldEffectScript_HotSpringsWater:: @ 82DBC35 field_eff_end gFieldEffectScript_Unknown43:: @ 82DBC3F - field_eff_callnative oei_waterfall + field_eff_callnative FldEff_UseWaterfall field_eff_end gFieldEffectScript_Unknown44:: @ 82DBC45 - field_eff_callnative sub_80B74D0 + field_eff_callnative FldEff_UseDive field_eff_end gFieldEffectScript_Unknown45:: @ 82DBC4B @@ -272,11 +272,11 @@ gFieldEffectScript_Unknown48:: @ 82DBC66 field_eff_end gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B7C48 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh field_eff_end gFieldEffectScript_Unknown50:: @ 82DBC76 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B79F4 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp field_eff_end gFieldEffectScript_Unknown51:: @ 82DBC80 @@ -312,7 +312,7 @@ gFieldEffectScript_Unknown58:: @ 82DBCC2 field_eff_end gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC - field_eff_callnative sub_80B84F8 + field_eff_callnative FldEff_FieldMoveShowMonInit field_eff_end gFieldEffectScript_Unknown60:: @ 82DBCD2 @@ -325,7 +325,7 @@ gFieldEffectScript_Unknown61:: @ 82DBCD8 gFieldEffectScript_Unknown62:: @ 82DBCDE field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, sub_80B62F4 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord field_eff_end gFieldEffectScript_Unknown63:: @ 82DBCED diff --git a/data/field_tasks.s b/data/field_tasks.s deleted file mode 100644 index 310fd0e2a..000000000 --- a/data/field_tasks.s +++ /dev/null @@ -1,99 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_08510348:: @ 8510348 - .4byte nullsub_34 - .4byte sub_809E3B4 - .4byte sub_809DEF0 - .4byte sub_809DCB4 - .4byte sub_809E224 - .4byte EndTruckSequence - .4byte sub_80EA3E4 - .4byte sub_809E4CC - -gUnknown_08510368:: @ 8510368 - .byte 0 - .byte 0 - .2byte 0x259 - .byte 0 - .byte 1 - .2byte 0x261 - .byte 0 - .byte 0xFF - .2byte 0x259 - .byte 0 - .byte 0 - .2byte 0x261 - .byte 0 - .byte 0 - .2byte 0x252 - .byte 1 - .byte 0 - .2byte 0x253 - .byte 0xFF - .byte 0 - .2byte 0x252 - .byte 0 - .byte 0 - .2byte 0x253 - -gUnknown_08510388:: @ 8510388 - .byte 0 - .byte 0 - .2byte 0x25A - .byte 0 - .byte 1 - .2byte 0x262 - .byte 0 - .byte 0xFF - .2byte 0x25A - .byte 0 - .byte 0 - .2byte 0x262 - .byte 0 - .byte 0 - .2byte 0x254 - .byte 1 - .byte 0 - .2byte 0x255 - .byte 0xFF - .byte 0 - .2byte 0x254 - .byte 0 - .byte 0 - .2byte 0x255 - -gUnknown_085103A8:: @ 85103A8 - .byte 0 - .byte 0 - .2byte 0x258 - .byte 0 - .byte 1 - .2byte 0x260 - .byte 0 - .byte 0xFF - .2byte 0x258 - .byte 0 - .byte 0 - .2byte 0x260 - .byte 0 - .byte 0 - .2byte 0x250 - .byte 1 - .byte 0 - .2byte 0x251 - .byte 0xFF - .byte 0 - .2byte 0x250 - .byte 0 - .byte 0 - .2byte 0x251 - -gUnknown_085103C8:: @ 85103C8 - .2byte 0, 0, 0, 0, 0, 0, 0x4001, 0x4002, 0x4003, 0x4004, 0, 0, 0x4005, 0x4006, 0x4007, 0, 0, 0x4008, 0x4009, 0x400a, 0, 0, 0, 0, 0, 0 - -gUnknown_085103FC:: @ 85103FC - .2byte 0xE8, 0xeb, 0xea, 0xe9 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 8a338a2bb..24f97a1ea 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -19,8 +19,8 @@ AquaHideout_B2F_MapWarps: @ 85355BC warp_def 32, 20, 3, 4, AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents: @ 853560C - coord_event 28, 17, 3, 0, VAR_0x4001, 0, 0, AquaHideout_B2F_EventScript_233DE5 - coord_event 28, 16, 3, 0, VAR_0x4001, 0, 0, AquaHideout_B2F_EventScript_233DE5 + coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 + coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 AquaHideout_B2F_MapEvents:: @ 853562C map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc index 40d5db12b..c7c3a36d0 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc @@ -3,13 +3,13 @@ BattleFrontier_BattlePikeRandomRoom1_MapObjects: @ 853CD54 object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 - coord_event 4, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 - coord_event 3, 6, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 3, 7, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 4, 6, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 5, 6, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 4, 7, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 5, 7, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D + coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 + coord_event 3, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 + coord_event 3, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D + coord_event 4, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 + coord_event 5, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 + coord_event 4, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D + coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 map_events BattleFrontier_BattlePikeRandomRoom1_MapObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc index d2988ab50..20e6cb085 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc @@ -1,11 +1,11 @@ BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 - coord_event 4, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 - coord_event 3, 18, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 4, 18, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 5, 18, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 3, 19, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 4, 19, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 5, 19, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 + coord_event 3, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 4, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 5, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 3, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 4, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 5, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc index 9345b5819..7894ab85a 100644 --- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc @@ -3,15 +3,15 @@ BattleFrontier_BattlePikeThreePathRoom_MapObjects: @ 853CC80 object_event 2, MAP_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 - coord_event 2, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E - coord_event 6, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 - coord_event 10, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 - coord_event 5, 10, 0, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 10, 0, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 9, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 5, 9, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 9, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 10, 0, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D + coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E + coord_event 6, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 + coord_event 10, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 + coord_event 5, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D + coord_event 6, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D + coord_event 6, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 + coord_event 5, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 + coord_event 7, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 + coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 map_events BattleFrontier_BattlePikeThreePathRoom_MapObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/events/BattleFrontier_BattlePyramidTop.inc index d06650789..79e4770ea 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidTop.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePyramidTop_MapObjects: @ 853C7C0 object_event 2, MAP_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 - coord_event 17, 9, 4, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 + coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 map_events BattleFrontier_BattlePyramidTop_MapObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index 401daaaf5..d1d4f0fef 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -5,10 +5,10 @@ DoubleBattleColosseum_MapWarps: @ 8539E88 warp_def 8, 8, 3, 127, NONE DoubleBattleColosseum_MapCoordEvents: @ 8539EA8 - coord_event 3, 4, 3, 0, VAR_0x4000, 0, 0, gUnknown_08277388 - coord_event 3, 6, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773BE - coord_event 10, 4, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773A3 - coord_event 10, 6, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773D9 + coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277388 + coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773BE + coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773A3 + coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773D9 DoubleBattleColosseum_MapEvents:: @ 8539EE8 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc index 47fec07ea..fb471b4ff 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/events/EverGrandeCity.inc @@ -5,17 +5,17 @@ EverGrandeCity_MapWarps: @ 8527588 warp_def 18, 27, 0, 1, VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents: @ 85275A8 - coord_event 17, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 16, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 18, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 19, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 20, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 21, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 22, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 23, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 24, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 25, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 26, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 EverGrandeCity_MapBGEvents: @ 8527658 bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_1E7D2B diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index 11d501116..e765a7390 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C warp_def 2, 1, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 - coord_event 10, 2, 3, 0, VAR_0x4001, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 + coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174 map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc index 385a05193..ad11733e1 100644 --- a/data/maps/events/MarineCave_End.inc +++ b/data/maps/events/MarineCave_End.inc @@ -5,7 +5,7 @@ MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MARINE_CAVE_ENTRANCE MarineCave_End_MapCoordEvents: @ 8537808 - coord_event 9, 26, 3, 0, VAR_0x4001, 1, 0, MarineCave_End_EventScript_23B01B + coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B MarineCave_End_MapEvents:: @ 8537818 map_events MarineCave_End_MapObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index acbbeccef..44ae41601 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -12,10 +12,10 @@ MauvilleCity_Gym_MapWarps: @ 852FE04 warp_def 5, 20, 0, 0, MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents: @ 852FE14 - coord_event 4, 12, 3, 0, VAR_0x4000, 0, 0, MauvilleCity_Gym_EventScript_20E01E - coord_event 3, 9, 3, 0, VAR_0x4000, 0, 0, MauvilleCity_Gym_EventScript_20E043 - coord_event 0, 15, 3, 0, VAR_0x4000, 0, 0, MauvilleCity_Gym_EventScript_20DFF9 - coord_event 8, 9, 3, 0, VAR_0x4000, 0, 0, MauvilleCity_Gym_EventScript_20E068 + coord_event 4, 12, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E01E + coord_event 3, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E043 + coord_event 0, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20DFF9 + coord_event 8, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E068 MauvilleCity_Gym_MapBGEvents: @ 852FE54 bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E14B diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index 5d3717531..d048ecb5d 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -30,10 +30,10 @@ MossdeepCity_MapWarps: @ 85271B0 warp_def 36, 24, 0, 0, MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents: @ 8527200 - coord_event 25, 25, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 26, 25, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 32, 27, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 33, 27, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_EventScript_1E4B38 + coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 + coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 + coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 + coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 coord_event 42, 21, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 coord_event 41, 22, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 coord_event 41, 23, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index cf3e42434..57a717638 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -53,15 +53,15 @@ MossdeepCity_Gym_MapWarps: @ 853284C warp_def 21, 10, 0, 12, MOSSDEEP_CITY_GYM MossdeepCity_Gym_MapCoordEvents: @ 85328BC - coord_event 2, 21, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C67 - coord_event 8, 10, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 6, 7, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 15, 34, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C93 - coord_event 23, 24, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 23, 21, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 8, 6, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220CBF - coord_event 21, 6, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220AF1 - coord_event 3, 30, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C67 + coord_event 2, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67 + coord_event 8, 10, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D + coord_event 6, 7, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D + coord_event 15, 34, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C93 + coord_event 23, 24, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9 + coord_event 23, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9 + coord_event 8, 6, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CBF + coord_event 21, 6, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220AF1 + coord_event 3, 30, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67 MossdeepCity_Gym_MapBGEvents: @ 853294C bg_event 4, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C33 diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc index 6fb99be16..695011311 100644 --- a/data/maps/events/NavelRock_Top.inc +++ b/data/maps/events/NavelRock_Top.inc @@ -5,7 +5,7 @@ NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, NAVEL_ROCK_UP_4 NavelRock_Top_MapCoordEvents: @ 853DB94 - coord_event 12, 10, 3, 0, VAR_0x4001, 0, 0, NavelRock_Top_EventScript_26916F + coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F NavelRock_Top_MapBGEvents: @ 853DBA4 bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0 diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index 74255c763..a2d81c9c1 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -12,15 +12,15 @@ NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents: @ 8536570 - coord_event 30, 38, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 18, 36, 3, 0, VAR_0x4002, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 4, 26, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 16, 22, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 25, 18, 3, 0, VAR_0x4002, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 2, 11, 3, 0, VAR_0x4002, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 6, 11, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 13, 10, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 17, 10, 3, 0, VAR_0x4002, 0, 0, NewMauville_Inside_EventScript_237471 + coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 + coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 + coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 + coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 + coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 + coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 + coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 + coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 + coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 coord_event 33, 6, 3, 0, VAR_0x40BA, 1, 0, NewMauville_Inside_EventScript_237725 NewMauville_Inside_MapBGEvents: @ 8536610 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index 67c2c56da..672abbbd4 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -8,10 +8,10 @@ RecordCorner_MapWarps: @ 8539E14 warp_def 10, 9, 3, 127, NONE RecordCorner_MapCoordEvents: @ 8539E34 - coord_event 6, 4, 3, 0, VAR_0x4000, 0, 0, gUnknown_0827741D - coord_event 6, 6, 3, 0, VAR_0x4000, 0, 0, gUnknown_08277447 - coord_event 13, 4, 3, 0, VAR_0x4000, 0, 0, gUnknown_08277432 - coord_event 13, 6, 3, 0, VAR_0x4000, 0, 0, gUnknown_0827745C + coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D + coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277447 + coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277432 + coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C RecordCorner_MapEvents:: @ 8539E74 map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc index ec107e176..37d3065c5 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 warp_def 13, 5, 0, 5, ROUTE_110 Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8 - coord_event 7, 4, 3, 0, VAR_0x4001, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84 - coord_event 5, 4, 3, 0, VAR_0x4001, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6 + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6 Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8 map_events Route110_SeasideCyclingRoadEntrance1_MapObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc index 23b8f7253..38e02b9ce 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 warp_def 13, 5, 0, 3, ROUTE_110 Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44 - coord_event 7, 4, 3, 0, VAR_0x4001, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0 - coord_event 5, 4, 3, 0, VAR_0x4001, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13 + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13 Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64 map_events Route110_SeasideCyclingRoadEntrance2_MapObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index 42ff2196c..34ebbc229 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 2, 1, 3, 0, ROUTE_110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 - coord_event 2, 2, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHouseEnd_EventScript_26B041 + coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_26B041 Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index 007be3861..92f2bad01 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -11,10 +11,10 @@ Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8 - coord_event 11, 12, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD - coord_event 0, 4, 0, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 - coord_event 14, 5, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 - coord_event 7, 11, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 + coord_event 11, 12, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD + coord_event 0, 4, 0, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 + coord_event 14, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 + coord_event 7, 11, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0 diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 88aedca9f..c3070fafe 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -13,10 +13,10 @@ Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8 - coord_event 4, 14, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD - coord_event 3, 11, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 - coord_event 12, 5, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 - coord_event 8, 2, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 + coord_event 4, 14, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD + coord_event 3, 11, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 + coord_event 12, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 + coord_event 8, 2, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7 diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index 7d15de921..801448b12 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -11,28 +11,28 @@ Route110_TrickHousePuzzle5_MapWarps: @ 853E538 warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 - coord_event 5, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 - coord_event 4, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 - coord_event 3, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF - coord_event 2, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB - coord_event 1, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC13 - coord_event 2, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F - coord_event 13, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B - coord_event 12, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC67 - coord_event 11, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC73 - coord_event 13, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC97 - coord_event 12, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3 - coord_event 11, 4, 3, 0, VAR_0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF - coord_event 1, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC07 - coord_event 3, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B - coord_event 4, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC37 - coord_event 5, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC43 - coord_event 6, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F - coord_event 10, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F - coord_event 9, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B - coord_event 11, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF - coord_event 10, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB - coord_event 9, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 + coord_event 5, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 + coord_event 4, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 + coord_event 3, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF + coord_event 2, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB + coord_event 1, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC13 + coord_event 2, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F + coord_event 13, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B + coord_event 12, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC67 + coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC73 + coord_event 13, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC97 + coord_event 12, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3 + coord_event 11, 4, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF + coord_event 1, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC07 + coord_event 3, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B + coord_event 4, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC37 + coord_event 5, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC43 + coord_event 6, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F + coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F + coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B + coord_event 11, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF + coord_event 10, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB + coord_event 9, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15 diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index 49003a63e..8da2bab85 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -25,10 +25,10 @@ Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 8, 12, 0, 11, ROUTE_110_TRICK_HOUSE_PUZZLE_7 Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8 - coord_event 8, 19, 0, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B - coord_event 0, 14, 0, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E331 - coord_event 6, 6, 0, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E347 - coord_event 9, 7, 0, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E35D + coord_event 8, 19, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B + coord_event 0, 14, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E331 + coord_event 6, 6, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E347 + coord_event 9, 7, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E35D Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0 diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 564b94797..9c79e2c52 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -55,21 +55,21 @@ Route111_MapWarps: @ 8529640 Route111_MapCoordEvents: @ 8529668 coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 61, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F0A - coord_event 12, 61, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F0A - coord_event 13, 61, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F0A + coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A + coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A + coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 44, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16 - coord_event 13, 43, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16 - coord_event 14, 42, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16 - coord_event 16, 40, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16 - coord_event 14, 61, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F0A + coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 + coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 + coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 + coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 + coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 39, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16 - coord_event 18, 38, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16 + coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 + coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index cad82a51a..258571e17 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -10,7 +10,7 @@ Route121_SafariZoneEntrance_MapWarps: @ 8533F24 warp_def 15, 13, 0, 0, ROUTE_121 Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44 - coord_event 8, 4, 3, 0, VAR_0x4001, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18 + coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18 Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21 diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 6672b1221..ad8a393d6 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -6,8 +6,8 @@ SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 7, 8, 3, 127, NONE SingleBattleColosseum_MapCoordEvents: @ 8539D6C - coord_event 3, 5, 3, 0, VAR_0x4000, 0, 0, gUnknown_08277374 - coord_event 10, 5, 3, 0, VAR_0x4000, 0, 0, gUnknown_0827737E + coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374 + coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E SingleBattleColosseum_MapEvents:: @ 8539D8C map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc index 2421cba40..0e3c0f0bb 100644 --- a/data/maps/events/TerraCave_End.inc +++ b/data/maps/events/TerraCave_End.inc @@ -5,7 +5,7 @@ TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, TERRA_CAVE_ENTRANCE TerraCave_End_MapCoordEvents: @ 8537870 - coord_event 17, 26, 3, 0, VAR_0x4001, 1, 0, TerraCave_End_EventScript_23B0EC + coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC TerraCave_End_MapEvents:: @ 8537880 map_events TerraCave_End_MapObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index ffb999b22..dea4f52c3 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -6,8 +6,8 @@ TradeCenter_MapWarps: @ 8539DB8 warp_def 6, 8, 3, 127, NONE TradeCenter_MapCoordEvents: @ 8539DC8 - coord_event 4, 5, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773F5 - coord_event 7, 5, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773FF + coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5 + coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF TradeCenter_MapEvents:: @ 8539DE8 map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/menu_helpers.s b/data/menu_helpers.s deleted file mode 100644 index 25ca66485..000000000 --- a/data/menu_helpers.s +++ /dev/null @@ -1,37 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0859F4E8:: @ 859F4E8 - .2byte 0x00 - .2byte 0x4000 - .2byte 0x00 - .2byte 0x00 - -gUnknown_0859F4F0:: @ 859F4F0 - obj_image_anim_frame 0x00, 0x00 - obj_image_anim_end - -gUnknown_0859F4F8:: @ 859F4F8 - obj_image_anim_frame 0x04, 0x00 - obj_image_anim_end - -gUnknown_0859F500:: @ 859F500 - obj_image_anim_frame 0x00, 0x40 - obj_image_anim_end - -gUnknown_0859F508:: @ 859F508 - .4byte gUnknown_0859F4F0 - .4byte gUnknown_0859F4F8 - .4byte gUnknown_0859F500 - -gUnknown_0859F514:: @ 859F514 - .4byte gBagSwapLineGfx, 0x6D0100 - -gUnknown_0859F51C:: @ 859F51C - .4byte gBagSwapLinePal, 0x6D - -gUnknown_0859F524:: @ 859F524 - spr_template 0x6D, 0x6D, gUnknown_0859F4E8, gUnknown_0859F508, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/menu_indicators.s b/data/menu_indicators.s deleted file mode 100644 index 24353b157..000000000 --- a/data/menu_indicators.s +++ /dev/null @@ -1,93 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_086141FC:: @ 86141FC - .byte 0, 2, 8, 0 - .byte 1, 2, -8, -1 - .byte 18, 2, 8, 0 - .byte 19, 2, -8, -1 - -gUnknown_0861420C:: @ 861420C - .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - -gUnknown_08614214:: @ 8614214 - obj_image_anim_frame 0, 30 - obj_image_anim_end - -gUnknown_0861421C:: @ 861421C - obj_image_anim_frame 0, 0x5e - obj_image_anim_end - -gUnknown_08614224:: @ 8614224 - obj_image_anim_frame 4, 30 - obj_image_anim_end - -gUnknown_0861422C:: @ 861422C - obj_image_anim_frame 4, 0x9e - obj_image_anim_end - -gUnknown_08614234:: @ 8614234 - .4byte gUnknown_08614214 - .4byte gUnknown_0861421C - .4byte gUnknown_08614224 - .4byte gUnknown_0861422C - -gUnknown_08614244:: @ 8614244 - spr_template 0, 0, gUnknown_0861420C, gUnknown_08614234, NULL, gDummySpriteAffineAnimTable, sub_81AF264 - -gUnknown_0861425C:: @ 861425C - .4byte 0x00000000 - -gUnknown_08614260:: @ 8614260 - .4byte 0x00100000 - -gUnknown_08614264:: @ 8614264 - .4byte 0x00200000 - -gUnknown_08614268:: @ 8614268 - .4byte 0x00300000 - -gUnknown_0861426C:: @ 861426C - .4byte 0x00400000 - -gUnknown_08614270:: @ 8614270 - .4byte 0x00500000 - -gUnknown_08614274:: @ 8614274 - .4byte 0x00600000 - -gUnknown_08614278:: @ 8614278 - .4byte 0x00700000 - -gUnknown_0861427C:: @ 861427C - .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - -gUnknown_08614284:: @ 8614284 - obj_image_anim_frame 0, 30 - obj_image_anim_end - -gUnknown_0861428C:: @ 861428C - .4byte gUnknown_08614284 - -gUnknown_08614290:: @ 8614290 - spr_template 0, 0, gUnknown_0861427C, gUnknown_0861428C, NULL, gDummySpriteAffineAnimTable, ObjectCB_RedArrowCursor - -gUnknown_086142A8:: @ 86142A8 - .incbin "graphics/interface/red_arrow.gbapal" - -gUnknown_086142C8:: @ 86142C8 - .incbin "graphics/interface/red_arrow_other.4bpp.lz" - -gUnknown_08614338:: @ 8614338 - .incbin "graphics/interface/selector_outline.4bpp.lz" - -gUnknown_08614378:: @ 8614378 - .incbin "graphics/interface/red_arrow.4bpp.lz" diff --git a/data/record_mixing.s b/data/record_mixing.s deleted file mode 100644 index 20a37145c..000000000 --- a/data/record_mixing.s +++ /dev/null @@ -1,37 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0858CF8C:: @ 858CF8C - .byte 1, 0 - -gUnknown_0858CF8E:: @ 858CF8E - .byte 1, 2, 0 - .byte 2, 0, 1 - -gUnknown_0858CF94:: @ 858CF94 - .byte 1, 0, 3 - .byte 2, 3, 0 - .byte 1, 2, 2 - .byte 0, 3, 1 - .byte 1, 3, 0 - .byte 2, 2, 3 - .byte 0, 1, 3 - .byte 2, 0, 1 - .byte 1, 2, 3 - .byte 0, 2, 3 - .byte 1, 0, 3 - .byte 2, 1, 0 - -gUnknown_0858CFB8:: @ 858CFB8 - .byte 0, 1 - .byte 1, 2 - .byte 2, 0 - -gUnknown_0858CFBE:: @ 858CFBE - .byte 0, 1, 2, 3 - .byte 0, 2, 1, 3 - .byte 0, 3, 2, 1 - .byte 0, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index bd633a115..9a34d2e61 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -880,7 +880,7 @@ gUnknown_0827741D:: @ 827741D setvar VAR_0x8005, 0 special sub_80E6BE8 waitstate - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -888,7 +888,7 @@ gUnknown_08277432:: @ 8277432 setvar VAR_0x8005, 1 special sub_80E6BE8 waitstate - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -896,7 +896,7 @@ gUnknown_08277447:: @ 8277447 setvar VAR_0x8005, 2 special sub_80E6BE8 waitstate - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -904,12 +904,12 @@ gUnknown_0827745C:: @ 827745C setvar VAR_0x8005, 3 special sub_80E6BE8 waitstate - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_277471 end RecordCorner_EventScript_277471:: @ 8277471 - bufferitemname 1, VAR_0x4001 + bufferitemname 1, VAR_TEMP_1 message RecordCorner_Text_27863C waitmessage waitbuttonpress @@ -950,7 +950,7 @@ TradeCenter_EventScript_2774B6:: @ 82774B6 end RecordCorner_EventScript_2774C6:: @ 82774C6 - compare VAR_0x4000, 0 + compare VAR_TEMP_0, 0 goto_if 5, RecordCorner_EventScript_2774E0 special sub_8098574 message RecordCorner_Text_27861C diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 7eb12ac1f..a6a0ebcc2 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -309,7 +309,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 compare VAR_0x8006, 4 goto_if 5, LinkContestRoom1_EventScript_27A0F5 call LinkContestRoom1_EventScript_27A230 - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_27A133:: @ 827A133 @@ -495,24 +495,24 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F call_if 1, LinkContestRoom1_EventScript_27A56E compare VAR_0x4088, 5 call_if 1, LinkContestRoom1_EventScript_27A5CC - setvar VAR_0x4001, 9 - setvar VAR_0x4002, 9 - setvar VAR_0x4003, 9 - setvar VAR_0x4004, 9 - setvar VAR_0x4005, 9 - setvar VAR_0x4006, 9 - setvar VAR_0x4007, 9 - setvar VAR_0x4008, 9 - compare VAR_0x4000, 0 + setvar VAR_TEMP_1, 9 + setvar VAR_TEMP_2, 9 + setvar VAR_TEMP_3, 9 + setvar VAR_TEMP_4, 9 + setvar VAR_TEMP_5, 9 + setvar VAR_TEMP_6, 9 + setvar VAR_TEMP_7, 9 + setvar VAR_TEMP_8, 9 + compare VAR_TEMP_0, 0 call_if 2, LinkContestRoom1_EventScript_27A3E5 - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 - setvar VAR_0x4005, 0 - setvar VAR_0x4006, 0 - setvar VAR_0x4007, 0 - setvar VAR_0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 return LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 @@ -534,7 +534,7 @@ LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 call_if 1, LinkContestRoom1_EventScript_27A732 compare VAR_RESULT, 7 call_if 1, LinkContestRoom1_EventScript_27A756 - compare VAR_0x4000, 0 + compare VAR_TEMP_0, 0 goto_if 2, LinkContestRoom1_EventScript_27A3E5 waitmovement 0 return @@ -556,7 +556,7 @@ LinkContestRoom1_EventScript_27A454:: @ 827A454 goto_if 2, LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 10 goto_if 2, LinkContestRoom1_EventScript_27A62A - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2 @@ -576,7 +576,7 @@ LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2 goto_if 2, LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 90 goto_if 2, LinkContestRoom1_EventScript_27A62A - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A510:: @ 827A510 @@ -596,7 +596,7 @@ LinkContestRoom1_EventScript_27A510:: @ 827A510 goto_if 2, LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_27A62A - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A56E:: @ 827A56E @@ -616,7 +616,7 @@ LinkContestRoom1_EventScript_27A56E:: @ 827A56E goto_if 2, LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_27A62A - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC @@ -636,140 +636,140 @@ LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC goto_if 2, LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 100 goto_if 2, LinkContestRoom1_EventScript_27A62A - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A62A:: @ 827A62A - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_27A630:: @ 827A630 - setvar VAR_0x4000, 2 + setvar VAR_TEMP_0, 2 return LinkContestRoom1_EventScript_27A636:: @ 827A636 - setvar VAR_0x4000, 3 + setvar VAR_TEMP_0, 3 return LinkContestRoom1_EventScript_27A63C:: @ 827A63C - setvar VAR_0x4000, 4 + setvar VAR_TEMP_0, 4 return LinkContestRoom1_EventScript_27A642:: @ 827A642 - setvar VAR_0x4000, 5 + setvar VAR_TEMP_0, 5 return LinkContestRoom1_EventScript_27A648:: @ 827A648 - setvar VAR_0x4000, 6 + setvar VAR_TEMP_0, 6 return LinkContestRoom1_EventScript_27A64E:: @ 827A64E - setvar VAR_0x4000, 7 + setvar VAR_TEMP_0, 7 return LinkContestRoom1_EventScript_27A654:: @ 827A654 - setvar VAR_0x4000, 8 + setvar VAR_TEMP_0, 8 return LinkContestRoom1_EventScript_27A65A:: @ 827A65A - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_eq LinkContestRoom1_EventScript_27A67D applymovement 6, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 - setvar VAR_0x4001, 1 - addvar VAR_0x4000, 65535 + setvar VAR_TEMP_1, 1 + addvar VAR_TEMP_0, 65535 return LinkContestRoom1_EventScript_27A67D:: @ 827A67D return LinkContestRoom1_EventScript_27A67E:: @ 827A67E - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_eq LinkContestRoom1_EventScript_27A6A1 applymovement 12, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 - setvar VAR_0x4002, 1 - addvar VAR_0x4000, 65535 + setvar VAR_TEMP_2, 1 + addvar VAR_TEMP_0, 65535 return LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1 return LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2 - compare VAR_0x4003, 1 + compare VAR_TEMP_3, 1 goto_eq LinkContestRoom1_EventScript_27A6C5 applymovement 7, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 - setvar VAR_0x4003, 1 - addvar VAR_0x4000, 65535 + setvar VAR_TEMP_3, 1 + addvar VAR_TEMP_0, 65535 return LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5 return LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6 - compare VAR_0x4004, 1 + compare VAR_TEMP_4, 1 goto_eq LinkContestRoom1_EventScript_27A6E9 applymovement 8, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 - setvar VAR_0x4004, 1 - addvar VAR_0x4000, 65535 + setvar VAR_TEMP_4, 1 + addvar VAR_TEMP_0, 65535 return LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9 return LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA - compare VAR_0x4005, 1 + compare VAR_TEMP_5, 1 goto_eq LinkContestRoom1_EventScript_27A70D applymovement 9, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 - setvar VAR_0x4005, 1 - addvar VAR_0x4000, 65535 + setvar VAR_TEMP_5, 1 + addvar VAR_TEMP_0, 65535 return LinkContestRoom1_EventScript_27A70D:: @ 827A70D return LinkContestRoom1_EventScript_27A70E:: @ 827A70E - compare VAR_0x4006, 1 + compare VAR_TEMP_6, 1 goto_eq LinkContestRoom1_EventScript_27A731 applymovement 10, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 - setvar VAR_0x4006, 1 - addvar VAR_0x4000, 65535 + setvar VAR_TEMP_6, 1 + addvar VAR_TEMP_0, 65535 return LinkContestRoom1_EventScript_27A731:: @ 827A731 return LinkContestRoom1_EventScript_27A732:: @ 827A732 - compare VAR_0x4007, 1 + compare VAR_TEMP_7, 1 goto_eq LinkContestRoom1_EventScript_27A755 applymovement 11, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 - setvar VAR_0x4007, 1 - addvar VAR_0x4000, 65535 + setvar VAR_TEMP_7, 1 + addvar VAR_TEMP_0, 65535 return LinkContestRoom1_EventScript_27A755:: @ 827A755 return LinkContestRoom1_EventScript_27A756:: @ 827A756 - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 goto_eq LinkContestRoom1_EventScript_27A779 applymovement 15, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 - setvar VAR_0x4008, 1 - addvar VAR_0x4000, 65535 + setvar VAR_TEMP_8, 1 + addvar VAR_TEMP_0, 65535 return LinkContestRoom1_EventScript_27A779:: @ 827A779 @@ -832,11 +832,11 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 waitmovement 0 releaseall call LinkContestRoom1_EventScript_27A133 - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 special sub_80F910C startcontest special sub_80F90DC - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 lockall applymovement 1, LinkContestRoom1_Movement_27AD19 applymovement 2, LinkContestRoom1_Movement_27AD15 @@ -888,9 +888,9 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 closemessage releaseall special sub_80F910C - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 showcontestresults - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 playbgm MUS_CON_FAN, 0 return @@ -956,19 +956,19 @@ LinkContestRoom1_EventScript_27A987:: @ 827A987 return LinkContestRoom1_EventScript_27A9BC:: @ 827A9BC - setvar VAR_0x4003, 3 + setvar VAR_TEMP_3, 3 return LinkContestRoom1_EventScript_27A9C2:: @ 827A9C2 - setvar VAR_0x4003, 4 + setvar VAR_TEMP_3, 4 return LinkContestRoom1_EventScript_27A9C8:: @ 827A9C8 - setvar VAR_0x4003, 5 + setvar VAR_TEMP_3, 5 return LinkContestRoom1_EventScript_27A9CE:: @ 827A9CE - setvar VAR_0x4003, 14 + setvar VAR_TEMP_3, 14 return LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 @@ -978,10 +978,10 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 buffernumberstring 1, VAR_0x8005 addvar VAR_0x8005, 65535 call LinkContestRoom1_EventScript_27AA00 - applymovement VAR_0x4003, LinkContestRoom1_Movement_27AD1D + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD1D waitmovement 0 playse SE_W227B - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 return LinkContestRoom1_EventScript_27AA00:: @ 827AA00 @@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14 return LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 lockall compare VAR_0x4088, 1 call_if 2, LinkContestRoom1_EventScript_27AA6F @@ -1008,7 +1008,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B applymovement 11, LinkContestRoom1_Movement_27AD3F applymovement 6, LinkContestRoom1_Movement_27AD37 applymovement 8, LinkContestRoom1_Movement_27AD33 - compare VAR_0x4001, 4 + compare VAR_TEMP_1, 4 goto_if 5, LinkContestRoom1_EventScript_27AA1B delay 30 return @@ -1094,7 +1094,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 call LinkContestRoom1_EventScript_27ABF8 call LinkContestRoom1_EventScript_27AC5E playse SE_W227B - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 call LinkContestRoom1_EventScript_27AA1B delay 30 special sub_80F88E8 @@ -1168,28 +1168,28 @@ LinkContestRoom1_EventScript_27ABF8:: @ 827ABF8 LinkContestRoom1_EventScript_27AC2A:: @ 827AC2A lockall - applymovement VAR_0x4003, LinkContestRoom1_Movement_27AD7A + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD7A waitmovement 0 releaseall return LinkContestRoom1_EventScript_27AC37:: @ 827AC37 lockall - applymovement VAR_0x4003, LinkContestRoom1_Movement_27AD7E + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD7E waitmovement 0 releaseall return LinkContestRoom1_EventScript_27AC44:: @ 827AC44 lockall - applymovement VAR_0x4003, LinkContestRoom1_Movement_27AD29 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD29 waitmovement 0 releaseall return LinkContestRoom1_EventScript_27AC51:: @ 827AC51 lockall - applymovement VAR_0x4003, LinkContestRoom1_Movement_27AD2D + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD2D waitmovement 0 releaseall return diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 23532b275..701b79fbf 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -3,20 +3,20 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F - map_script_2 VAR_0x4001, 0, AbandonedShip_HiddenFloorRooms_EventScript_238C59 + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_238C59 .2byte 0 AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 - setvar VAR_0x4001, 1 - getplayerxy VAR_0x4002, VAR_0x4003 - setvar VAR_0x4004, 1 - compare VAR_0x4002, 21 + setvar VAR_TEMP_1, 1 + getplayerxy VAR_TEMP_2, VAR_TEMP_3 + setvar VAR_TEMP_4, 1 + compare VAR_TEMP_2, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1 - compare VAR_0x4002, 36 + compare VAR_TEMP_2, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7 - compare VAR_0x4003, 2 + compare VAR_TEMP_3, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD - switch VAR_0x4004 + switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C case 3, AbandonedShip_HiddenFloorRooms_EventScript_238D0D @@ -26,15 +26,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 end AbandonedShip_HiddenFloorRooms_EventScript_238CD1:: @ 8238CD1 - addvar VAR_0x4004, 1 + addvar VAR_TEMP_4, 1 return AbandonedShip_HiddenFloorRooms_EventScript_238CD7:: @ 8238CD7 - addvar VAR_0x4004, 2 + addvar VAR_TEMP_4, 2 return AbandonedShip_HiddenFloorRooms_EventScript_238CDD:: @ 8238CDD - addvar VAR_0x4004, 3 + addvar VAR_TEMP_4, 3 return AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 85a94cc21..ccf8997d7 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -8,7 +8,7 @@ AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 end AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 @@ -19,7 +19,7 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 waitmovement 0 applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E waitmovement 0 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 88a0f9989..2f952936f 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -24,15 +24,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE return BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 - setvar VAR_0x4011, 100 + setvar VAR_OBJ_GFX_ID_1, 100 return BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC - setvar VAR_0x4011, 105 + setvar VAR_OBJ_GFX_ID_1, 105 return BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC .2byte 0 BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC @@ -47,7 +47,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 @@ -148,7 +148,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 setvar VAR_0x8004, 9 special sub_81A1780 - copyvar VAR_0x400F, VAR_RESULT + copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC setvar VAR_0x8004, 1 @@ -275,10 +275,10 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A end BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 message BattleFrontier_BattleArenaBattleRoom_Text_257FBB @@ -326,7 +326,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 waitmovement 0 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 - switch VAR_0x400F + switch VAR_TEMP_F case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5 case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 @@ -425,7 +425,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C closemessage - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 @@ -529,7 +529,7 @@ BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A step_end BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257C16 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257C16 .2byte 0 BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 @@ -537,7 +537,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 removeobject 7 call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 end BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc index ed7371dab..cecd5b44c 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc @@ -3,12 +3,12 @@ BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 .byte 0 BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleArenaCorridor_EventScript_2573C9 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_2573C9 .2byte 0 BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 delay 16 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_257417 waitmovement 0 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index 176b153f7..68ac57fcd 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -4,20 +4,20 @@ BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36 .byte 0 BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleArenaLobby_EventScript_255C4B + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_255C4B .2byte 0 BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleArenaLobby_EventScript_255C7F - map_script_2 VAR_0x4000, 1, BattleFrontier_BattleArenaLobby_EventScript_255C88 - map_script_2 VAR_0x4000, 2, BattleFrontier_BattleArenaLobby_EventScript_255DC0 - map_script_2 VAR_0x4000, 3, BattleFrontier_BattleArenaLobby_EventScript_255CCF - map_script_2 VAR_0x4000, 4, BattleFrontier_BattleArenaLobby_EventScript_255D2B + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_255C7F + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleArenaLobby_EventScript_255C88 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleArenaLobby_EventScript_255DC0 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleArenaLobby_EventScript_255CCF + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleArenaLobby_EventScript_255D2B .2byte 0 BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F @@ -41,7 +41,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -67,7 +67,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 call BattleFrontier_BattleArenaLobby_EventScript_255D59 msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -82,7 +82,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B call BattleFrontier_BattleArenaLobby_EventScript_255D59 msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -126,7 +126,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 goto BattleFrontier_BattleArenaLobby_EventScript_255F54 BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 @@ -178,7 +178,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 case 127, BattleFrontier_BattleArenaLobby_EventScript_255FF8 BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 @@ -200,7 +200,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 closemessage delay 2 call BattleFrontier_BattleArenaLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 @@ -219,7 +219,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 warp BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index fce85e7d3..52981a07d 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -11,7 +11,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - copyvar VAR_0x400F, VAR_RESULT + copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC @@ -27,15 +27,15 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC return BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 - setvar VAR_0x4011, 100 + setvar VAR_OBJ_GFX_ID_1, 100 return BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA - setvar VAR_0x4011, 105 + setvar VAR_OBJ_GFX_ID_1, 105 return BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A .2byte 0 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A @@ -49,9 +49,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 closemessage showobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM - compare VAR_0x400F, 3 + compare VAR_TEMP_F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E - compare VAR_0x400E, 0 + compare VAR_TEMP_E, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E @@ -65,9 +65,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitmovement 0 - compare VAR_0x400F, 3 + compare VAR_TEMP_F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 - compare VAR_0x400E, 0 + compare VAR_TEMP_E, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 @@ -86,12 +86,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 5 special sub_818E9AC call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 switch VAR_RESULT case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, 4 @@ -106,7 +106,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 delay 180 applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B waitmovement 0 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F setvar VAR_0x8004, 19 special sub_818E9AC @@ -118,11 +118,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F waitmovement 0 setvar VAR_0x8004, 4 special sub_818E9AC - compare VAR_0x4002, 0 + compare VAR_TEMP_2, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -165,9 +165,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 - compare VAR_0x4002, 0 + compare VAR_TEMP_2, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -302,9 +302,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9 - compare VAR_0x400F, 3 + compare VAR_TEMP_F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 - switch VAR_0x400E + switch VAR_TEMP_E case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 @@ -383,7 +383,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD return BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB - switch VAR_0x400E + switch VAR_TEMP_E case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC @@ -422,7 +422,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitse - switch VAR_0x400E + switch VAR_TEMP_E case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 @@ -520,7 +520,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436 - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7 BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 @@ -531,10 +531,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 special HealPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 special sub_8163AC4 waitstate - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 setvar VAR_0x8004, 17 special sub_818E9AC special HealPlayerParty @@ -543,14 +543,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 return BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B .2byte 0 BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B hideobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 @@ -559,7 +559,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF setvar VAR_0x8004, 9 special sub_81A1780 - copyvar VAR_0x400E, VAR_RESULT + copyvar VAR_TEMP_E, VAR_RESULT compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF call BattleFrontier_BattleDomeBattleRoom_EventScript_242170 @@ -572,7 +572,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF end BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC end @@ -581,13 +581,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC return BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502 - compare VAR_0x400F, 0 + compare VAR_TEMP_F, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F - compare VAR_0x400F, 1 + compare VAR_TEMP_F, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 - compare VAR_0x400F, 2 + compare VAR_TEMP_F, 2 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 - compare VAR_0x400F, 3 + compare VAR_TEMP_F, 3 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 return @@ -964,15 +964,15 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 - copyvar VAR_0x400D, VAR_RESULT - compare VAR_0x400D, 0 + copyvar VAR_TEMP_D, VAR_RESULT + compare VAR_TEMP_D, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E setobjectxyperm 6, 2, 0 setobjectmovementtype 6, 10 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 - compare VAR_0x400D, 0 + compare VAR_TEMP_D, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index 9cb4f3187..ad6204fd5 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -3,12 +3,12 @@ BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE .byte 0 BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E .2byte 0 BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E delay 16 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A1780 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index f985606de..35bf3f5a6 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -11,20 +11,20 @@ BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleDomeLobby_EventScript_249805 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805 .2byte 0 BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleDomeLobby_EventScript_249839 - map_script_2 VAR_0x4000, 1, BattleFrontier_BattleDomeLobby_EventScript_249842 - map_script_2 VAR_0x4000, 2, BattleFrontier_BattleDomeLobby_EventScript_2499F9 - map_script_2 VAR_0x4000, 3, BattleFrontier_BattleDomeLobby_EventScript_24989B - map_script_2 VAR_0x4000, 4, BattleFrontier_BattleDomeLobby_EventScript_249940 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_249839 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleDomeLobby_EventScript_249842 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleDomeLobby_EventScript_2499F9 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleDomeLobby_EventScript_24989B + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleDomeLobby_EventScript_249940 .2byte 0 BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 @@ -52,7 +52,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -143,7 +143,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4 BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -161,7 +161,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 goto BattleFrontier_BattleDomeLobby_EventScript_249BC2 BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35 @@ -231,7 +231,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF case 127, BattleFrontier_BattleDomeLobby_EventScript_249C61 BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 @@ -249,7 +249,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 closemessage delay 2 call BattleFrontier_BattleDomeLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A setvar VAR_0x8004, 22 @@ -267,7 +267,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 call BattleFrontier_BattleDomeLobby_EventScript_249C6E special HealPlayerParty warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index a9b6af7f7..f3693e179 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -4,16 +4,16 @@ BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9 .byte 0 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E .2byte 0 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222 .2byte 0 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 @@ -23,7 +23,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special sub_81A1780 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 lockall @@ -180,7 +180,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D closedoor 5, 1 waitdooranim warp BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end @@ -241,7 +241,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4 special LoadPlayerParty setvar VAR_0x8004, 3 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index 7d1c57f66..bd76e111d 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -14,7 +14,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B setvar VAR_0x8004, 9 special sub_81A1780 - copyvar VAR_0x400F, VAR_RESULT + copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 end @@ -25,13 +25,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3 end BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A .2byte 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 hideobjectat 255, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM - compare VAR_0x400F, 0 + compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 hideobjectat 2, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM @@ -39,15 +39,15 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 end BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25 - setvar VAR_0x401F, 100 + setvar VAR_OBJ_GFX_ID_F, 100 return BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B - setvar VAR_0x401F, 105 + setvar VAR_OBJ_GFX_ID_F, 105 return BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67 .2byte 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B @@ -62,7 +62,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B end BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 - compare VAR_0x400F, 0 + compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B @@ -77,7 +77,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 waitmovement 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 - compare VAR_0x400F, 0 + compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C setvar VAR_0x8004, 5 special sub_8195960 @@ -144,7 +144,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C - switch VAR_0x400F + switch VAR_TEMP_F case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051 case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 4a52743a5..640e96b4d 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -4,20 +4,20 @@ BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8 .byte 0 BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleFactoryLobby_EventScript_2583FD + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2583FD .2byte 0 BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleFactoryLobby_EventScript_258431 - map_script_2 VAR_0x4000, 1, BattleFrontier_BattleFactoryLobby_EventScript_25843A - map_script_2 VAR_0x4000, 2, BattleFrontier_BattleFactoryLobby_EventScript_258592 - map_script_2 VAR_0x4000, 3, BattleFrontier_BattleFactoryLobby_EventScript_25849B - map_script_2 VAR_0x4000, 4, BattleFrontier_BattleFactoryLobby_EventScript_258506 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258431 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleFactoryLobby_EventScript_25843A + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleFactoryLobby_EventScript_258592 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleFactoryLobby_EventScript_25849B + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleFactoryLobby_EventScript_258506 .2byte 0 BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 @@ -47,7 +47,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -118,7 +118,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582 msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -135,7 +135,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 setvar VAR_0x8006, 2 goto BattleFrontier_BattleFactoryLobby_EventScript_25871A @@ -191,7 +191,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879A BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_81A5E74 setvar VAR_0x8004, 2 @@ -209,7 +209,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 closemessage delay 2 call BattleFrontier_BattleFactoryLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 setvar VAR_0x8006, 0 @@ -226,7 +226,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 2f5cdeef2..93a5f2caf 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -4,11 +4,11 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA .byte 0 BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF .2byte 0 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 compare VAR_0x8006, 1 goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA setobjectxy 1, 8, 7 @@ -19,13 +19,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA end BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9 .2byte 0 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A waitmovement 0 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 8393d7501..5aff5ad81 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -19,17 +19,17 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B - setvar VAR_0x4011, 100 - setvar VAR_0x4010, 100 + setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_0, 100 return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856 - setvar VAR_0x4011, 105 - setvar VAR_0x4010, 105 + setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_0, 105 return BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B .2byte 0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B @@ -42,7 +42,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B waitmovement 0 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 @@ -105,7 +105,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A setvar VAR_0x8004, 9 special sub_81A1780 - copyvar VAR_0x400F, VAR_RESULT + copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 setvar VAR_0x8004, 1 @@ -198,10 +198,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 message BattleFrontier_BattlePalaceBattleRoom_Text_25014A @@ -240,7 +240,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7 applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2 waitmovement 0 - switch VAR_0x400F + switch VAR_TEMP_F case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 @@ -332,7 +332,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7 VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 closemessage - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 @@ -350,13 +350,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 return BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E .2byte 0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E hideobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 removeobject 2 applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 5c71cf4d6..91fb31ad3 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3 .byte 0 BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3 .2byte 0 BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index 11fc42ced..067e18fa2 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -4,20 +4,20 @@ BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E .byte 0 BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D793 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D793 .2byte 0 BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D7C7 - map_script_2 VAR_0x4000, 1, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0 - map_script_2 VAR_0x4000, 2, BattleFrontier_BattlePalaceLobby_EventScript_24D908 - map_script_2 VAR_0x4000, 3, BattleFrontier_BattlePalaceLobby_EventScript_24D817 - map_script_2 VAR_0x4000, 4, BattleFrontier_BattlePalaceLobby_EventScript_24D873 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D7C7 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePalaceLobby_EventScript_24D908 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePalaceLobby_EventScript_24D817 + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePalaceLobby_EventScript_24D873 .2byte 0 BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 @@ -41,7 +41,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -67,7 +67,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -82,7 +82,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -127,7 +127,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3 BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944 @@ -202,7 +202,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 @@ -224,7 +224,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 closemessage delay 2 call BattleFrontier_BattlePalaceLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A @@ -237,7 +237,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC warp BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc index 06335dddf..5293b6cfa 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc @@ -4,7 +4,7 @@ BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771 .byte 0 BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786 .2byte 0 BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 @@ -37,11 +37,11 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 end BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801 .2byte 0 BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index f78cec646..0cee28347 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -4,18 +4,18 @@ BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6 .byte 0 BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707 - map_script_2 VAR_0x4000, 1, BattleFrontier_BattlePikeLobby_EventScript_25B710 - map_script_2 VAR_0x4000, 3, BattleFrontier_BattlePikeLobby_EventScript_25B762 - map_script_2 VAR_0x4000, 4, BattleFrontier_BattlePikeLobby_EventScript_25B806 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeLobby_EventScript_25B710 + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePikeLobby_EventScript_25B762 + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePikeLobby_EventScript_25B806 .2byte 0 BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattlePikeLobby_EventScript_25B6FD + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_25B6FD .2byte 0 BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end @@ -43,7 +43,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -89,7 +89,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D waitse msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -118,7 +118,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 waitse msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -171,8 +171,8 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA73 BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C - setvar VAR_0x4000, 0 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_0, 0 + setvar VAR_TEMP_1, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 @@ -196,7 +196,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C closemessage delay 2 call BattleFrontier_BattlePikeLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 26 special sub_81A703C compare VAR_RESULT, 0 @@ -213,7 +213,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special HealPlayerParty call BattleFrontier_BattlePikeLobby_EventScript_25BB49 warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index 30245d984..3461f8275 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -6,11 +6,11 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 .byte 0 BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171 .2byte 0 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 5 special sub_81A703C switch VAR_RESULT diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc index 22f4614d3..14f543284 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc @@ -4,7 +4,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 .byte 0 BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7 .2byte 0 BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 @@ -29,11 +29,11 @@ BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB step_end BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE - map_script_2 VAR_0x4004, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8 + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8 .2byte 0 BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 - setvar VAR_0x4004, 1 + setvar VAR_TEMP_4, 1 turnobject 255, 2 end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc index c651a9e68..d93913df2 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc @@ -5,12 +5,12 @@ BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A .byte 0 BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C - map_script_2 VAR_0x4001, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C + map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A .2byte 0 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 6 special sub_81A703C end @@ -25,11 +25,11 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A end BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466 - map_script_2 VAR_0x4004, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470 + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470 .2byte 0 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 - setvar VAR_0x4004, 1 + setvar VAR_TEMP_4, 1 turnobject 255, 2 end @@ -45,6 +45,6 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A end BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index d4723acc7..6952412f2 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -5,19 +5,19 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 .byte 0 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891 - map_script_2 VAR_0x4000, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A - map_script_2 VAR_0x4000, 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4 - map_script_2 VAR_0x4005, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78 - map_script_2 VAR_0x4005, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4 + map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78 + map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97 .2byte 0 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D - map_script_2 VAR_0x4004, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887 + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887 .2byte 0 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 - setvar VAR_0x4004, 1 + setvar VAR_TEMP_4, 1 turnobject 255, 2 end @@ -44,7 +44,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 @@ -170,11 +170,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 special sub_81A703C compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 - setvar VAR_0x4005, 255 + setvar VAR_TEMP_5, 255 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91:: @ 825CA91 - setvar VAR_0x4005, 1 + setvar VAR_TEMP_5, 1 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 @@ -185,7 +185,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 releaseall applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5 waitmovement 0 - setvar VAR_0x4005, 255 + setvar VAR_TEMP_5, 255 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc index 2a39d844b..5bb6a87e0 100644 --- a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -13,23 +13,23 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A - specialvar VAR_0x4001, sub_813AA04 - compare VAR_0x4001, VAR_0x8008 + specialvar VAR_TEMP_1, sub_813AA04 + compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, 4 - compare VAR_0x4002, 0 + compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9 - compare VAR_0x4002, 0 + compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A end @@ -44,7 +44,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 special sub_813A8FC playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, 4 - compare VAR_0x4002, 0 + compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end @@ -65,7 +65,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A special sub_813A8FC playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, 4 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end @@ -79,7 +79,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173 lock faceplayer - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 end @@ -198,7 +198,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C lock faceplayer - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end @@ -267,7 +267,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F lock faceplayer - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 end @@ -346,7 +346,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0 lock faceplayer - setvar VAR_0x4002, 3 + setvar VAR_TEMP_2, 3 call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index 29485ef12..148ea97c1 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -5,9 +5,9 @@ BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 .byte 0 BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 - map_script_2 VAR_0x400D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D - map_script_2 VAR_0x400E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98 - map_script_2 VAR_0x400F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F + map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D + map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98 + map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F .2byte 0 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D @@ -23,18 +23,18 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 delay 2 compare VAR_RESULT, 2 goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 - setvar VAR_0x400D, 0 + setvar VAR_TEMP_D, 0 releaseall end BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F special ShowMapNamePopup - setvar VAR_0x400F, 0 + setvar VAR_TEMP_F, 0 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 playbgm MUS_PYRAMID, 0 - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 end BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 @@ -42,7 +42,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 special sub_81A8E7C setvar VAR_0x8004, 0 special sub_81A1780 - switch VAR_0x4000 + switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D @@ -64,7 +64,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 special sub_81A1780 - setvar VAR_0x400D, 1 + setvar VAR_TEMP_D, 1 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 setvar VAR_0x8004, 17 @@ -109,12 +109,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 end BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA call BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index eab2bb18c..2862722ce 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -4,20 +4,20 @@ BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 .byte 0 BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattlePyramidLobby_EventScript_25072B + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_25072B .2byte 0 BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F - map_script_2 VAR_0x4000, 1, BattleFrontier_BattlePyramidLobby_EventScript_250768 - map_script_2 VAR_0x4000, 2, BattleFrontier_BattlePyramidLobby_EventScript_2508AC - map_script_2 VAR_0x4000, 3, BattleFrontier_BattlePyramidLobby_EventScript_2507B1 - map_script_2 VAR_0x4000, 4, BattleFrontier_BattlePyramidLobby_EventScript_250852 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePyramidLobby_EventScript_250768 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePyramidLobby_EventScript_2508AC + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePyramidLobby_EventScript_2507B1 + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePyramidLobby_EventScript_250852 .2byte 0 BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F @@ -44,7 +44,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -90,7 +90,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA waitse msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -119,7 +119,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 waitse msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -175,7 +175,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 @@ -201,7 +201,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 closemessage delay 2 call BattleFrontier_BattlePyramidLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA @@ -220,7 +220,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 setvar VAR_RESULT, 0 special HealPlayerParty warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 07e66efa8..d071639f8 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -10,17 +10,17 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 setvar VAR_0x8005, 200 setvar VAR_0x8006, 0 special sub_81A8E7C - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 end BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE - map_script_2 VAR_0x4001, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8 .2byte 0 BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 - compare VAR_0x400C, 0 + compare VAR_TEMP_C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3 setobjectxyperm 2, 0, 0 @@ -35,10 +35,10 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 call BattleFrontier_BattlePyramidTop_EventScript_242170 BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C - copyvar VAR_0x400C, VAR_RESULT + copyvar VAR_TEMP_C, VAR_RESULT setvar VAR_0x8004, 0 special sub_81A1780 - switch VAR_0x4000 + switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66 case 2, BattleFrontier_BattlePyramidTop_EventScript_255193 @@ -54,18 +54,18 @@ BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C end BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E - map_script_2 VAR_0x400E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180 - map_script_2 VAR_0x400F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A + map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180 + map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A .2byte 0 BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 playbgm MUS_PYRAMID_TOP, 0 - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 end BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A special ShowMapNamePopup - setvar VAR_0x400F, 0 + setvar VAR_TEMP_F, 0 end BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 @@ -82,15 +82,15 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special sub_81A1780 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 end BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 lock faceplayer - compare VAR_0x400D, 0 + compare VAR_TEMP_D, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 - compare VAR_0x400C, 0 + compare VAR_TEMP_C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4 closemessage @@ -123,13 +123,13 @@ BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236 BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 msgbox BattleFrontier_BattlePyramidTop_Text_25551F, 4 applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD - setvar VAR_0x400D, 1 + setvar VAR_TEMP_D, 1 closemessage end BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 lockall - switch VAR_0x400C + switch VAR_TEMP_C case 2, BattleFrontier_BattlePyramidTop_EventScript_255335 case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0 case 4, BattleFrontier_BattlePyramidTop_EventScript_255388 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 7ed448c9a..63306af2a 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -4,20 +4,20 @@ BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 .byte 0 BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55 .2byte 0 BattleFrontier_BattleTowerBattleRoom_EventScript_241B55:: @ 8241B55 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_242198 end BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C .2byte 0 BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242179 waitmovement 0 setvar VAR_0x8004, 1 @@ -29,7 +29,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C waitmovement 0 applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 @@ -89,7 +89,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F setvar VAR_0x8004, 9 special sub_81A1780 - copyvar VAR_0x400F, VAR_RESULT + copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A setvar VAR_0x8004, 1 @@ -178,8 +178,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 end BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44 - copyvar VAR_0x400F, VAR_RESULT - switch VAR_0x400F + copyvar VAR_TEMP_F, VAR_RESULT + switch VAR_TEMP_F case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E90 case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241E97 case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E @@ -245,10 +245,10 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 return BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 message BattleFrontier_BattleTowerBattleRoom_Text_242542 @@ -282,7 +282,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF addobject 1 applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2 waitmovement 0 - switch VAR_0x400F + switch VAR_TEMP_F case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085 case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 @@ -356,7 +356,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E closemessage - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index ec2994591..f22b0de26 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -17,11 +17,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F checkplayergender compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 - setvar VAR_0x401F, 0 + setvar VAR_OBJ_GFX_ID_F, 0 return BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29 - setvar VAR_0x401F, 89 + setvar VAR_OBJ_GFX_ID_F, 89 return BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F @@ -29,7 +29,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F return BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D @@ -37,11 +37,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D end BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E waitmovement 0 @@ -258,8 +258,8 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E - copyvar VAR_0x400F, VAR_RESULT - switch VAR_0x400F + copyvar VAR_TEMP_F, VAR_RESULT + switch VAR_TEMP_F case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354 case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362 @@ -298,8 +298,8 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377 return BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E - copyvar VAR_0x400F, VAR_RESULT - switch VAR_0x400F + copyvar VAR_TEMP_F, VAR_RESULT + switch VAR_TEMP_F case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6 case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index fc1327f41..a1dfa2abc 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -16,11 +16,11 @@ BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3 end BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0 .2byte 0 BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A @@ -34,7 +34,7 @@ BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 waitmovement 0 BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index cd81b47fd..af2c67eac 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -17,11 +17,11 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 checkplayergender compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B - setvar VAR_0x401F, 0 + setvar VAR_OBJ_GFX_ID_F, 0 return BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B - setvar VAR_0x401F, 89 + setvar VAR_OBJ_GFX_ID_F, 89 return BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 @@ -29,7 +29,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 return BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F @@ -40,7 +40,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F end BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC @@ -81,7 +81,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC closedoor 7, 1 waitdooranim delay 30 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call BattleFrontier_BattleTowerCorridor2_EventScript_248E71 releaseall end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index fe824b1ea..095e75394 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -4,11 +4,11 @@ BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB .byte 0 BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0 .2byte 0 BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A8A waitmovement 0 @@ -81,11 +81,11 @@ BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92 step_end BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0 .2byte 0 BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index 774507df9..9f2099b32 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -31,20 +31,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1 goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0 BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3 .2byte 0 BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD - map_script_2 VAR_0x4000, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707 - map_script_2 VAR_0x4000, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710 - map_script_2 VAR_0x4000, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE - map_script_2 VAR_0x4000, 3, BattleFrontier_BattleTowerLobby_EventScript_23E758 - map_script_2 VAR_0x4000, 4, BattleFrontier_BattleTowerLobby_EventScript_23E7F2 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707 + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710 + map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE + map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleTowerLobby_EventScript_23E758 + map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleTowerLobby_EventScript_23E7F2 .2byte 0 BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 @@ -69,7 +69,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 release end @@ -114,7 +114,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 release end @@ -143,7 +143,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830 call BattleFrontier_BattleTowerLobby_EventScript_23E84D msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 release end @@ -288,7 +288,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_8161F74 setvar VAR_0x8004, 2 @@ -303,7 +303,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A closemessage delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 @@ -368,7 +368,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_8161F74 setvar VAR_0x8004, 2 @@ -383,7 +383,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 closemessage delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 @@ -449,7 +449,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_8161F74 setvar VAR_0x8004, 2 @@ -464,7 +464,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF closemessage delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 @@ -529,7 +529,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_8161F74 setvar VAR_0x8004, 2 @@ -547,7 +547,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8005, 0 special sub_8161F74 call BattleFrontier_BattleTowerLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 @@ -748,7 +748,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 clearflag FLAG_0x077 warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index e334e2413..e6c99541d 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -26,21 +26,21 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA - setvar VAR_0x4010, 7 - setvar VAR_0x4011, 7 - setvar VAR_0x4012, 7 - setvar VAR_0x4013, 7 - setvar VAR_0x4014, 7 - setvar VAR_0x4015, 7 - setvar VAR_0x4016, 7 - setvar VAR_0x4017, 7 - setvar VAR_0x4001, 1 - setvar VAR_0x4003, 1 + setvar VAR_OBJ_GFX_ID_0, 7 + setvar VAR_OBJ_GFX_ID_1, 7 + setvar VAR_OBJ_GFX_ID_2, 7 + setvar VAR_OBJ_GFX_ID_3, 7 + setvar VAR_OBJ_GFX_ID_4, 7 + setvar VAR_OBJ_GFX_ID_5, 7 + setvar VAR_OBJ_GFX_ID_6, 7 + setvar VAR_OBJ_GFX_ID_7, 7 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_3, 1 setobjectxyperm 1, 10, 2 end BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14 - map_script_2 VAR_0x4003, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E + map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E .2byte 0 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E @@ -48,13 +48,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E end BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 - map_script_2 VAR_0x4001, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41 - map_script_2 VAR_0x4003, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41 + map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35 .2byte 0 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35 lockall - setvar VAR_0x4003, 0 + setvar VAR_TEMP_3, 0 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5 end @@ -69,7 +69,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4 special HealPlayerParty - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -161,7 +161,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 lock faceplayer - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 end @@ -246,49 +246,49 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB:: @ 8243FFB lock faceplayer - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008:: @ 8244008 lock faceplayer - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015:: @ 8244015 lock faceplayer - setvar VAR_0x4002, 3 + setvar VAR_TEMP_2, 3 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022:: @ 8244022 lock faceplayer - setvar VAR_0x4002, 4 + setvar VAR_TEMP_2, 4 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F:: @ 824402F lock faceplayer - setvar VAR_0x4002, 5 + setvar VAR_TEMP_2, 5 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C:: @ 824403C lock faceplayer - setvar VAR_0x4002, 6 + setvar VAR_TEMP_2, 6 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049:: @ 8244049 lock faceplayer - setvar VAR_0x4002, 7 + setvar VAR_TEMP_2, 7 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 end diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/scripts/maps/BattleFrontier_Lounge3.inc index 4568dd2c8..2638541b2 100644 --- a/data/scripts/maps/BattleFrontier_Lounge3.inc +++ b/data/scripts/maps/BattleFrontier_Lounge3.inc @@ -57,8 +57,8 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46 end BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 - specialvar VAR_0x4001, sub_813AA04 - compare VAR_0x4001, VAR_0x8008 + specialvar VAR_TEMP_1, sub_813AA04 + compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 msgbox BattleFrontier_Lounge3_Text_262B6E, 4 message BattleFrontier_Lounge3_Text_262B42 diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/scripts/maps/BattleFrontier_Lounge7.inc index f6f957cae..0b810d4f7 100644 --- a/data/scripts/maps/BattleFrontier_Lounge7.inc +++ b/data/scripts/maps/BattleFrontier_Lounge7.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge7_MapScripts:: @ 8265254 BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 lock faceplayer - setvar VAR_0x400C, 9 + setvar VAR_TEMP_C, 9 checkflag FLAG_0x15A goto_eq BattleFrontier_Lounge7_EventScript_265276 msgbox BattleFrontier_Lounge7_Text_2656ED, 4 @@ -21,12 +21,12 @@ BattleFrontier_Lounge7_EventScript_265284:: @ 8265284 message BattleFrontier_Lounge7_Text_2658EF waitmessage special sub_813A958 - setvar VAR_0x400E, 0 + setvar VAR_TEMP_E, 0 setvar VAR_0x8004, 9 setvar VAR_0x8006, 0 special sub_813A128 waitstate - copyvar VAR_0x400D, VAR_RESULT + copyvar VAR_TEMP_D, VAR_RESULT switch VAR_RESULT case 0, BattleFrontier_Lounge7_EventScript_2653D7 case 1, BattleFrontier_Lounge7_EventScript_2653E2 @@ -45,12 +45,12 @@ BattleFrontier_Lounge7_EventScript_265284:: @ 8265284 BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F message BattleFrontier_Lounge7_Text_2658EF waitmessage - setvar VAR_0x400E, 0 + setvar VAR_TEMP_E, 0 setvar VAR_0x8004, 9 setvar VAR_0x8006, 1 special sub_813A128 waitstate - copyvar VAR_0x400D, VAR_RESULT + copyvar VAR_TEMP_D, VAR_RESULT switch VAR_RESULT case 0, BattleFrontier_Lounge7_EventScript_2653D7 case 1, BattleFrontier_Lounge7_EventScript_2653E2 @@ -119,7 +119,7 @@ BattleFrontier_Lounge7_EventScript_26543A:: @ 826543A BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 lock faceplayer - setvar VAR_0x400C, 10 + setvar VAR_TEMP_C, 10 checkflag FLAG_0x15B goto_eq BattleFrontier_Lounge7_EventScript_265466 msgbox BattleFrontier_Lounge7_Text_265A6C, 4 @@ -136,12 +136,12 @@ BattleFrontier_Lounge7_EventScript_265474:: @ 8265474 message BattleFrontier_Lounge7_Text_2658EF waitmessage special sub_813A958 - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 setvar VAR_0x8004, 10 setvar VAR_0x8006, 0 special sub_813A128 waitstate - copyvar VAR_0x400D, VAR_RESULT + copyvar VAR_TEMP_D, VAR_RESULT switch VAR_RESULT case 0, BattleFrontier_Lounge7_EventScript_2655C7 case 1, BattleFrontier_Lounge7_EventScript_2655D2 @@ -160,12 +160,12 @@ BattleFrontier_Lounge7_EventScript_265474:: @ 8265474 BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F message BattleFrontier_Lounge7_Text_2658EF waitmessage - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 setvar VAR_0x8004, 10 setvar VAR_0x8006, 1 special sub_813A128 waitstate - copyvar VAR_0x400D, VAR_RESULT + copyvar VAR_TEMP_D, VAR_RESULT switch VAR_RESULT case 0, BattleFrontier_Lounge7_EventScript_2655C7 case 1, BattleFrontier_Lounge7_EventScript_2655D2 @@ -244,16 +244,16 @@ BattleFrontier_Lounge7_EventScript_265645:: @ 8265645 end BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F - copyvar VAR_0x8004, VAR_0x400D - copyvar VAR_0x8005, VAR_0x400E + copyvar VAR_0x8004, VAR_TEMP_D + copyvar VAR_0x8005, VAR_TEMP_E special sub_813AC7C buffernumberstring 1, VAR_0x8008 - copyvar VAR_0x8004, VAR_0x400C + copyvar VAR_0x8004, VAR_TEMP_C msgbox BattleFrontier_Lounge7_Text_265921, 5 compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_2656CA - specialvar VAR_0x4001, sub_813AA04 - compare VAR_0x4001, VAR_0x8008 + specialvar VAR_TEMP_1, sub_813AA04 + compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_Lounge7_EventScript_265696 msgbox BattleFrontier_Lounge7_Text_265997, 4 goto BattleFrontier_Lounge7_EventScript_2656CA @@ -276,7 +276,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 end BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA - compare VAR_0x400E, 0 + compare VAR_TEMP_E, 0 goto_eq BattleFrontier_Lounge7_EventScript_26532F goto BattleFrontier_Lounge7_EventScript_26551F end diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 0435692f4..6fd637461 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -10,7 +10,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 setflag FLAG_0x8D3 - setvar VAR_0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_0x4034, 0 setvar VAR_0x4035, 0 checkflag FLAG_0x1AD diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index 1fe66a56c..178621217 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -21,7 +21,7 @@ EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D EverGrandeCity_EventScript_1E7D46:: @ 81E7D46 setflag FLAG_VISITED_EVER_GRANDE_CITY - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 end EverGrandeCity_Text_1E7D4F: @ 81E7D4F diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index f8dab1f3b..71410a43f 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF end EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 - map_script_2 VAR_0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F @@ -17,7 +17,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F end EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 - map_script_2 VAR_0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E @@ -27,7 +27,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E delay 40 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228A42 waitmovement 0 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_228A45 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index a5274bbe5..4c90417af 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C .byte 0 EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC - map_script_2 VAR_0x4001, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index e05b82e2e..f1d846f03 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 - map_script_2 VAR_0x4001, 0, EverGrandeCity_GlaciasRoom_EventScript_22842C + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_22842C .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C diff --git a/data/scripts/maps/EverGrandeCity_Hall1.inc b/data/scripts/maps/EverGrandeCity_Hall1.inc index 9a570e6e0..960918662 100644 --- a/data/scripts/maps/EverGrandeCity_Hall1.inc +++ b/data/scripts/maps/EverGrandeCity_Hall1.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall1_MapScripts:: @ 8229569 .byte 0 EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F - map_script_2 VAR_0x4001, 0, EverGrandeCity_Hall1_EventScript_229579 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_229579 .2byte 0 EverGrandeCity_Hall1_EventScript_229579:: @ 8229579 diff --git a/data/scripts/maps/EverGrandeCity_Hall2.inc b/data/scripts/maps/EverGrandeCity_Hall2.inc index e6bed41c8..1d76e3695 100644 --- a/data/scripts/maps/EverGrandeCity_Hall2.inc +++ b/data/scripts/maps/EverGrandeCity_Hall2.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall2_MapScripts:: @ 822957E .byte 0 EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 - map_script_2 VAR_0x4001, 0, EverGrandeCity_Hall2_EventScript_22958E + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_22958E .2byte 0 EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E diff --git a/data/scripts/maps/EverGrandeCity_Hall3.inc b/data/scripts/maps/EverGrandeCity_Hall3.inc index 505a9f6ac..a100487f5 100644 --- a/data/scripts/maps/EverGrandeCity_Hall3.inc +++ b/data/scripts/maps/EverGrandeCity_Hall3.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall3_MapScripts:: @ 8229593 .byte 0 EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 - map_script_2 VAR_0x4001, 0, EverGrandeCity_Hall3_EventScript_2295A3 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_2295A3 .2byte 0 EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3 diff --git a/data/scripts/maps/EverGrandeCity_Hall4.inc b/data/scripts/maps/EverGrandeCity_Hall4.inc index bae904c35..a7c730594 100644 --- a/data/scripts/maps/EverGrandeCity_Hall4.inc +++ b/data/scripts/maps/EverGrandeCity_Hall4.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall4_MapScripts:: @ 82295A8 .byte 0 EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE - map_script_2 VAR_0x4001, 0, EverGrandeCity_Hall4_EventScript_2295B8 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_2295B8 .2byte 0 EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8 diff --git a/data/scripts/maps/EverGrandeCity_Hall5.inc b/data/scripts/maps/EverGrandeCity_Hall5.inc index cc987a4cf..9ca9991e4 100644 --- a/data/scripts/maps/EverGrandeCity_Hall5.inc +++ b/data/scripts/maps/EverGrandeCity_Hall5.inc @@ -3,7 +3,7 @@ EverGrandeCity_Hall5_MapScripts:: @ 82295BD .byte 0 EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 - map_script_2 VAR_0x4001, 0, EverGrandeCity_Hall5_EventScript_2295CD + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_2295CD .2byte 0 EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 5cb4ee7fd..de29dca0f 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -4,7 +4,7 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 822982C .byte 0 EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 - map_script_2 VAR_0x4001, 0, EverGrandeCity_HallOfFame_EventScript_229841 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841 .2byte 0 EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 @@ -12,7 +12,7 @@ EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 end EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 - map_script_2 VAR_0x4001, 0, EverGrandeCity_HallOfFame_EventScript_229850 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850 .2byte 0 EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 @@ -41,7 +41,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 dofieldeffect 62 waitfieldeffect 62 delay 40 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EverGrandeCity_HallOfFame_EventScript_2717C1 checkplayergender compare VAR_RESULT, 0 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index b838cc25b..679e4f663 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 - map_script_2 VAR_0x4001, 0, EverGrandeCity_PhoebesRoom_EventScript_22818E + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_22818E .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index 0a174bf0c..4fd73b3bf 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -50,10 +50,10 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 lockall checkflag FLAG_0x107 goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB - getplayerxy VAR_0x4000, VAR_0x4001 - compare VAR_0x4000, 11 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 11 call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698 - compare VAR_0x4000, 8 + compare VAR_TEMP_0, 8 call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 message EverGrandeCity_PokemonLeague_1F_Text_2296E8 waitmessage diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 46c471e4e..b2db55e36 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -27,7 +27,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F38:: @ 8227F38 EverGrandeCity_DrakesRoom_MapScript2_227F3E: @ 8227F3E EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E - map_script_2 VAR_0x4001, 0, EverGrandeCity_SidneysRoom_EventScript_227F48 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_227F48 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index 16cb9fff5..f6750009d 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -17,17 +17,17 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF return FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 - setvar VAR_0x4011, 100 - setvar VAR_0x4010, 100 + setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_0, 100 return FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2 - setvar VAR_0x4011, 105 - setvar VAR_0x4010, 105 + setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_0, 105 return FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD - map_script_2 VAR_0x4000, 0, FallarborTown_BattleTentBattleRoom_EventScript_2008E7 + map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_2008E7 .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 @@ -256,13 +256,13 @@ FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB step_end FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 - map_script_2 VAR_0x4001, 0, FallarborTown_BattleTentBattleRoom_EventScript_200BBA + map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_200BBA .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM removeobject 3 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc index d413e4ec6..1325b0332 100644 --- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc +++ b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc @@ -3,12 +3,12 @@ FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7 .byte 0 FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD - map_script_2 VAR_0x4000, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7 + map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7 .2byte 0 FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 lockall - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB applymovement 255, FallarborTown_BattleTentCorridor_Movement_2006FB waitmovement 0 diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 78a067a55..327221120 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -4,20 +4,20 @@ FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66 .byte 0 FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 - map_script_2 VAR_0x4001, 0, FallarborTown_BattleTentLobby_EventScript_1FFE7B + map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_1FFE7B .2byte 0 FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 - map_script_2 VAR_0x4000, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF - map_script_2 VAR_0x4000, 1, FallarborTown_BattleTentLobby_EventScript_1FFEB8 - map_script_2 VAR_0x4000, 2, FallarborTown_BattleTentLobby_EventScript_1FFFCD - map_script_2 VAR_0x4000, 3, FallarborTown_BattleTentLobby_EventScript_1FFEED - map_script_2 VAR_0x4000, 4, FallarborTown_BattleTentLobby_EventScript_1FFF93 + map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF + map_script_2 VAR_TEMP_0, 1, FallarborTown_BattleTentLobby_EventScript_1FFEB8 + map_script_2 VAR_TEMP_0, 2, FallarborTown_BattleTentLobby_EventScript_1FFFCD + map_script_2 VAR_TEMP_0, 3, FallarborTown_BattleTentLobby_EventScript_1FFEED + map_script_2 VAR_TEMP_0, 4, FallarborTown_BattleTentLobby_EventScript_1FFF93 .2byte 0 FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF @@ -33,7 +33,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 @@ -74,7 +74,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 waitfanfare msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -82,7 +82,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4 waitmessage closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -107,7 +107,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 waitse msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -124,7 +124,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 goto FallarborTown_BattleTentLobby_EventScript_20013C FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 @@ -174,7 +174,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D case 127, FallarborTown_BattleTentLobby_EventScript_2001C2 FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 @@ -192,7 +192,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 closemessage delay 2 call FallarborTown_BattleTentLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB @@ -205,7 +205,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF warp FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index 23bdac560..42b18983f 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -41,7 +41,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 setvar VAR_0x403A, 0 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 checkflag FLAG_0x1CA call_if 0, FarawayIsland_Interior_EventScript_267D86 end @@ -50,11 +50,11 @@ FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 checkflag FLAG_0x1C7 goto_eq FarawayIsland_Interior_EventScript_27374E clearflag FLAG_0x2CE - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 return FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 - map_script_2 VAR_0x4001, 0, FarawayIsland_Interior_EventScript_267DA2 + map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_267DA2 .2byte 0 FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 @@ -67,7 +67,7 @@ FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 applymovement 1, FarawayIsland_Interior_Movement_267DCE waitmovement 0 moveobjectoffscreen 1 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index b8b800286..1b1100cf3 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -8,7 +8,7 @@ FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 end FortreeCity_Gym_MapScript2_2165BA: @ 82165BA - map_script_2 VAR_0x4000, 16384, FortreeCity_Gym_EventScript_2165C4 + map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_2165C4 .2byte 0 FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index cd34c3d81..1d317d43b 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -8,29 +8,29 @@ LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA end LavaridgeTown_Gym_1F_EventScript_1FE705:: @ 81FE705 - setvar VAR_0x400B, 0 - setvar VAR_0x400C, 0 - setvar VAR_0x400D, 0 - setvar VAR_0x400E, 0 - setvar VAR_0x400F, 0 + setvar VAR_TEMP_B, 0 + setvar VAR_TEMP_C, 0 + setvar VAR_TEMP_D, 0 + setvar VAR_TEMP_E, 0 + setvar VAR_TEMP_F, 0 checktrainerflag TRAINER_COLE goto_eq LavaridgeTown_Gym_1F_EventScript_1FE72C - setvar VAR_0x400B, 1 + setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1FE72C:: @ 81FE72C checktrainerflag TRAINER_GERALD goto_eq LavaridgeTown_Gym_1F_EventScript_1FE73A - setvar VAR_0x400C, 1 + setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1FE73A:: @ 81FE73A checktrainerflag TRAINER_AXLE goto_eq LavaridgeTown_Gym_1F_EventScript_1FE748 - setvar VAR_0x400D, 1 + setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1FE748:: @ 81FE748 checktrainerflag TRAINER_DANIELLE goto_eq LavaridgeTown_Gym_1F_EventScript_1FE756 - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 return diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/scripts/maps/LavaridgeTown_Gym_B1F.inc index 88b0e66e7..ad2be83ea 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_B1F.inc @@ -8,28 +8,28 @@ LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 end LavaridgeTown_Gym_B1F_EventScript_1FF88F:: @ 81FF88F - setvar VAR_0x4007, 0 - setvar VAR_0x4008, 0 - setvar VAR_0x4009, 0 - setvar VAR_0x400A, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 + setvar VAR_TEMP_A, 0 checktrainerflag TRAINER_KEEGAN goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1 - setvar VAR_0x4007, 1 + setvar VAR_TEMP_7, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8B1:: @ 81FF8B1 checktrainerflag TRAINER_JACE goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF - setvar VAR_0x4008, 1 + setvar VAR_TEMP_8, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8BF:: @ 81FF8BF checktrainerflag TRAINER_JEFF goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8CD:: @ 81FF8CD checktrainerflag TRAINER_ELI goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB - setvar VAR_0x400A, 1 + setvar VAR_TEMP_A, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 4a7279fb2..1c4d21970 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -649,7 +649,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD waitmessage - specialvar VAR_0x400D, sub_80093CC + specialvar VAR_TEMP_D, sub_80093CC multichoice 0, 0, 85, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_21A8BB @@ -659,13 +659,13 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 end LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB - setvar VAR_0x400C, 0 + setvar VAR_TEMP_C, 0 goto LilycoveCity_ContestLobby_EventScript_21A8DC end LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 - setvar VAR_0x400C, 1 - compare VAR_0x400D, 1 + setvar VAR_TEMP_C, 1 + compare VAR_TEMP_D, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC goto LilycoveCity_ContestLobby_EventScript_21A8DC end @@ -754,18 +754,18 @@ LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A end LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 - compare VAR_0x400D, 1 + compare VAR_TEMP_D, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B - compare VAR_0x400D, 2 + compare VAR_TEMP_D, 2 goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27BF85 waitmessage copyvar VAR_0x8004, VAR_RESULT - compare VAR_0x400C, 0 + compare VAR_TEMP_C, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB - compare VAR_0x400C, 1 + compare VAR_TEMP_C, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 - compare VAR_0x400C, 2 + compare VAR_TEMP_C, 2 goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F compare VAR_RESULT, 4 goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index e38f3a276..da97bbf81 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -77,8 +77,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295 LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 multichoice 16, 0, 42, 0 - copyvar VAR_0x4001, VAR_RESULT - switch VAR_0x4001 + copyvar VAR_TEMP_1, VAR_RESULT + switch VAR_TEMP_1 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4 case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA @@ -87,17 +87,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 end LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4:: @ 82202E4 - setvar VAR_0x4000, 26 + setvar VAR_TEMP_0, 26 goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F end LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF:: @ 82202EF - setvar VAR_0x4000, 27 + setvar VAR_TEMP_0, 27 goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F end LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA:: @ 82202FA - setvar VAR_0x4000, 28 + setvar VAR_TEMP_0, 28 goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F end @@ -126,54 +126,54 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328 return LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220305 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22030C - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 - checkitemspace VAR_0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220321 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220328 updatemoneybox 0, 0 nop - bufferitemname 0, VAR_0x4000 + bufferitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, 4 - giveitem VAR_0x4000, 1 - bufferitemname 1, VAR_0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox gUnknown_08272A9A, 4 random 64 compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 - checkitemspace VAR_0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 - giveitem VAR_0x4000, 1 - bufferitemname 1, VAR_0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox gUnknown_08272A9A, 4 random 64 compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 - checkitemspace VAR_0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 - giveitem VAR_0x4000, 1 - bufferitemname 1, VAR_0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox gUnknown_08272A9A, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 7f0e41d03..f57ca14b5 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -17,23 +17,23 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F call LilycoveCity_Harbor_EventScript_21E22A call LilycoveCity_Harbor_EventScript_21E25C call LilycoveCity_Harbor_EventScript_21E2A6 - compare VAR_0x400C, 2 + compare VAR_TEMP_C, 2 goto_eq LilycoveCity_Harbor_EventScript_21E350 - compare VAR_0x400B, 1 + compare VAR_TEMP_B, 1 goto_eq LilycoveCity_Harbor_EventScript_21E2F0 - compare VAR_0x400B, 2 + compare VAR_TEMP_B, 2 goto_eq LilycoveCity_Harbor_EventScript_21E320 - compare VAR_0x400B, 4 + compare VAR_TEMP_B, 4 goto_eq LilycoveCity_Harbor_EventScript_21E350 - compare VAR_0x400B, 8 + compare VAR_TEMP_B, 8 goto_eq LilycoveCity_Harbor_EventScript_21E41D - compare VAR_0x400B, 0 + compare VAR_TEMP_B, 0 goto_if 5, LilycoveCity_Harbor_EventScript_21E44D goto LilycoveCity_Harbor_EventScript_21E080 end LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 - compare VAR_0x400A, 0 + compare VAR_TEMP_A, 0 goto_eq LilycoveCity_Harbor_EventScript_21E557 msgbox LilycoveCity_Harbor_Text_21E758, 4 message LilycoveCity_Harbor_Text_21E7ED @@ -107,111 +107,111 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 end LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 - setvar VAR_0x400E, 0 + setvar VAR_TEMP_E, 0 checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 checkflag FLAG_0x1AE goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_0x400E, 2 + setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 - setvar VAR_0x400D, 0 + setvar VAR_TEMP_D, 0 checkflag FLAG_0x8D5 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_0x400D, 1 + setvar VAR_TEMP_D, 1 checkflag FLAG_0x1AF goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_0x400D, 2 + setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 - setvar VAR_0x400C, 0 + setvar VAR_TEMP_C, 0 checkflag FLAG_0x8D6 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_0x400C, 1 + setvar VAR_TEMP_C, 1 checkflag FLAG_0x1B0 goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_0x400C, 2 + setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 checkflag FLAG_0x8E0 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 checkflag FLAG_0x1DB goto_eq LilycoveCity_Harbor_EventScript_27374E - setvar VAR_0x4009, 2 + setvar VAR_TEMP_9, 2 return LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C - setvar VAR_0x400B, 0 - compare VAR_0x400E, 2 + setvar VAR_TEMP_B, 0 + compare VAR_TEMP_E, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E28E - compare VAR_0x400D, 2 + compare VAR_TEMP_D, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E294 - compare VAR_0x400C, 2 + compare VAR_TEMP_C, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E29A - compare VAR_0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 return LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E - addvar VAR_0x400B, 1 + addvar VAR_TEMP_B, 1 return LilycoveCity_Harbor_EventScript_21E294:: @ 821E294 - addvar VAR_0x400B, 2 + addvar VAR_TEMP_B, 2 return LilycoveCity_Harbor_EventScript_21E29A:: @ 821E29A - addvar VAR_0x400B, 4 + addvar VAR_TEMP_B, 4 return LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 - addvar VAR_0x400B, 8 + addvar VAR_TEMP_B, 8 return LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 - setvar VAR_0x400A, 0 - compare VAR_0x400E, 1 + setvar VAR_TEMP_A, 0 + compare VAR_TEMP_E, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 - compare VAR_0x400D, 1 + compare VAR_TEMP_D, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2DE - compare VAR_0x400C, 1 + compare VAR_TEMP_C, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2EA return LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8 - addvar VAR_0x400A, 1 + addvar VAR_TEMP_A, 1 return LilycoveCity_Harbor_EventScript_21E2DE:: @ 821E2DE - addvar VAR_0x400A, 2 + addvar VAR_TEMP_A, 2 return LilycoveCity_Harbor_EventScript_21E2E4:: @ 821E2E4 - addvar VAR_0x400A, 4 + addvar VAR_TEMP_A, 4 return LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA - addvar VAR_0x400A, 8 + addvar VAR_TEMP_A, 8 return LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index f82befbcf..38210196e 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -4,7 +4,7 @@ LilycoveCity_House3_MapScripts:: @ 821EE3C LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 random 4 - copyvar VAR_0x4001, VAR_RESULT + copyvar VAR_TEMP_1, VAR_RESULT end LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B @@ -41,7 +41,7 @@ LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A LilycoveCity_House3_EventScript_21EEA1:: @ 821EEA1 lock faceplayer - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_21EF71 case 1, LilycoveCity_House3_EventScript_21EF7B case 2, LilycoveCity_House3_EventScript_21EF85 @@ -51,7 +51,7 @@ LilycoveCity_House3_EventScript_21EEA1:: @ 821EEA1 LilycoveCity_House3_EventScript_21EED5:: @ 821EED5 lock faceplayer - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_21EF71 case 1, LilycoveCity_House3_EventScript_21EF7B case 2, LilycoveCity_House3_EventScript_21EF85 @@ -61,7 +61,7 @@ LilycoveCity_House3_EventScript_21EED5:: @ 821EED5 LilycoveCity_House3_EventScript_21EF09:: @ 821EF09 lock faceplayer - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_21EF71 case 1, LilycoveCity_House3_EventScript_21EF7B case 2, LilycoveCity_House3_EventScript_21EF85 @@ -71,7 +71,7 @@ LilycoveCity_House3_EventScript_21EF09:: @ 821EF09 LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D lock faceplayer - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_21EF71 case 1, LilycoveCity_House3_EventScript_21EF7B case 2, LilycoveCity_House3_EventScript_21EF85 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 433db24d2..c7d968d78 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -335,7 +335,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C bufferspeciesname 0, SPECIES_CYNDAQUIL - setvar VAR_0x4001, 155 + setvar VAR_TEMP_1, 155 givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 @@ -380,7 +380,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D bufferspeciesname 0, SPECIES_TOTODILE - setvar VAR_0x4001, 158 + setvar VAR_TEMP_1, 158 givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 @@ -425,7 +425,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE bufferspeciesname 0, SPECIES_CHIKORITA - setvar VAR_0x4001, 152 + setvar VAR_TEMP_1, 152 givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc index 7d2588a0a..c8e7c6fad 100644 --- a/data/scripts/maps/MarineCave_End.inc +++ b/data/scripts/maps/MarineCave_End.inc @@ -22,7 +22,7 @@ MarineCave_End_MapScript1_23B008: @ 823B008 MarineCave_End_EventScript_23B012:: @ 823B012 clearflag FLAG_0x30E - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return MarineCave_End_EventScript_23B01B:: @ 823B01B @@ -41,7 +41,7 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, sub_8138B80 compare VAR_RESULT, 1 goto_eq MarineCave_End_EventScript_23B084 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6d3e0c317..400a24c24 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -31,8 +31,8 @@ MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C end MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9950 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x3e8, 0 compare VAR_RESULT, 0 @@ -52,8 +52,8 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 end MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9500 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x2710, 0 compare VAR_RESULT, 0 @@ -117,7 +117,7 @@ MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 MauvilleCity_GameCorner_EventScript_20FD0D:: @ 820FD0D message MauvilleCity_GameCorner_Text_21060D waitmessage - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 showcoinsbox 1, 1 goto MauvilleCity_GameCorner_EventScript_20FD2B @@ -137,17 +137,17 @@ MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B end MauvilleCity_GameCorner_EventScript_20FD67:: @ 820FD67 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_20FD91 MauvilleCity_GameCorner_EventScript_20FD75:: @ 820FD75 - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_20FD91 MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_20FD91 @@ -155,15 +155,15 @@ MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 msgbox MauvilleCity_GameCorner_Text_210705, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE92 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_20FDCB case 2, MauvilleCity_GameCorner_EventScript_20FE05 case 3, MauvilleCity_GameCorner_EventScript_20FE3F end MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB - checkcoins VAR_0x4002 - compare VAR_0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 88 checkdecorspace 88 @@ -178,8 +178,8 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB end MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 - checkcoins VAR_0x4002 - compare VAR_0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 89 checkdecorspace 89 @@ -194,8 +194,8 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 end MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F - checkcoins VAR_0x4002 - compare VAR_0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 90 checkdecorspace 90 @@ -238,7 +238,7 @@ MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F MauvilleCity_GameCorner_EventScript_20FEBB:: @ 820FEBB message MauvilleCity_GameCorner_Text_21060D waitmessage - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 showcoinsbox 1, 1 goto MauvilleCity_GameCorner_EventScript_20FED9 @@ -260,31 +260,31 @@ MauvilleCity_GameCorner_EventScript_20FED9:: @ 820FED9 end MauvilleCity_GameCorner_EventScript_20FF2B:: @ 820FF2B - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 bufferitemname 0, ITEM_TM32 setvar VAR_0x8004, 320 goto MauvilleCity_GameCorner_EventScript_20FF8A MauvilleCity_GameCorner_EventScript_20FF3E:: @ 820FF3E - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 bufferitemname 0, ITEM_TM29 setvar VAR_0x8004, 317 goto MauvilleCity_GameCorner_EventScript_20FF8A MauvilleCity_GameCorner_EventScript_20FF51:: @ 820FF51 - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 bufferitemname 0, ITEM_TM35 setvar VAR_0x8004, 323 goto MauvilleCity_GameCorner_EventScript_20FF8A MauvilleCity_GameCorner_EventScript_20FF64:: @ 820FF64 - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 bufferitemname 0, ITEM_TM24 setvar VAR_0x8004, 312 goto MauvilleCity_GameCorner_EventScript_20FF8A MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 bufferitemname 0, ITEM_TM13 setvar VAR_0x8004, 301 goto MauvilleCity_GameCorner_EventScript_20FF8A @@ -294,7 +294,7 @@ MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A msgbox MauvilleCity_GameCorner_Text_210629, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210118 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_20FFDD case 2, MauvilleCity_GameCorner_EventScript_210017 case 3, MauvilleCity_GameCorner_EventScript_210051 @@ -303,8 +303,8 @@ MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A end MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD - checkcoins VAR_0x4002 - compare VAR_0x4002, 1500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM32, 1 compare VAR_RESULT, 0 @@ -318,8 +318,8 @@ MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD end MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 - checkcoins VAR_0x4002 - compare VAR_0x4002, 3500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM29, 1 compare VAR_RESULT, 0 @@ -333,8 +333,8 @@ MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 end MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 - checkcoins VAR_0x4002 - compare VAR_0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM35, 1 compare VAR_RESULT, 0 @@ -348,8 +348,8 @@ MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 end MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B - checkcoins VAR_0x4002 - compare VAR_0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM24, 1 compare VAR_RESULT, 0 @@ -363,8 +363,8 @@ MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B end MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 - checkcoins VAR_0x4002 - compare VAR_0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM13, 1 compare VAR_RESULT, 0 @@ -477,8 +477,8 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D checkflag FLAG_0x0E1 goto_eq MauvilleCity_GameCorner_EventScript_21026B - checkcoins VAR_0x4001 - compare VAR_0x4001, 1 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_21026B setflag FLAG_0x0E1 givecoins 20 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 111281931..4e8531a4e 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -73,7 +73,7 @@ MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F MossdeepCity_EventScript_1E4B38:: @ 81E4B38 setflag FLAG_VISITED_MOSSDEEP_CITY - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 end MossdeepCity_EventScript_1E4B41:: @ 81E4B41 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 91bf06c48..fb2665e8b 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -85,7 +85,7 @@ MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B end MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 - setvar VAR_0x4001, 398 + setvar VAR_TEMP_1, 398 givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_222895 diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 7142f1f06..8f757ebb4 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -7,8 +7,8 @@ MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 end MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 - getplayerxy VAR_0x4000, VAR_0x4001 - compare VAR_0x4001, 12 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 12 goto_if 0, MtPyre_Exterior_EventScript_231FE9 return diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index 07a90e7b7..6193a092e 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -11,15 +11,15 @@ NavelRock_Top_MapScript1_26911E: @ 826911E end NavelRock_Top_EventScript_269131:: @ 8269131 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setflag FLAG_0x321 return NavelRock_Top_EventScript_26913A:: @ 826913A - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 checkflag FLAG_0x1DC goto_eq NavelRock_Top_EventScript_27374E - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 clearflag FLAG_0x321 return @@ -37,7 +37,7 @@ NavelRock_Top_EventScript_26915B:: @ 826915B NavelRock_Top_EventScript_26916F:: @ 826916F lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 special SpawnScriptFieldObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 301df7801..81b21287d 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 82373D7 .byte 0 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, NewMauville_Inside_EventScript_237489 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, NewMauville_Inside_EventScript_2375D7 checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_237407 @@ -21,8 +21,8 @@ NewMauville_Inside_EventScript_237407:: @ 8237407 return NewMauville_Inside_MapScript1_23741B: @ 823741B - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_0x1C1 call_if 0, NewMauville_Inside_EventScript_237441 checkflag FLAG_0x1C2 @@ -50,8 +50,8 @@ NewMauville_Inside_MapScript1_23744D: @ 823744D NewMauville_Inside_EventScript_237459:: @ 8237459 lockall - setvar VAR_0x4001, 1 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 0 playse SE_PIN call NewMauville_Inside_EventScript_237489 special DrawWholeMapView @@ -60,8 +60,8 @@ NewMauville_Inside_EventScript_237459:: @ 8237459 NewMauville_Inside_EventScript_237471:: @ 8237471 lockall - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 1 playse SE_PIN call NewMauville_Inside_EventScript_2375D7 special DrawWholeMapView diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 053183b28..5087d304c 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -14,7 +14,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -33,7 +33,7 @@ Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4 Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6 lockall clearflag FLAG_SYS_CYCLING_ROAD - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index 602373825..97e7452ec 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC setflag FLAG_SYS_CYCLING_ROAD - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -52,7 +52,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13 lockall setvar VAR_0x40A9, 0 clearflag FLAG_SYS_CYCLING_ROAD - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index a0aa5856c..b8db4697b 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,18 +6,18 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF .byte 0 Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D end Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE - map_script_2 VAR_0x4002, 0, Route110_TrickHouseEnd_EventScript_26ACE8 + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26ACE8 .2byte 0 Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8 @@ -27,11 +27,11 @@ Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8 end Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5 - map_script_2 VAR_0x4001, 0, Route110_TrickHouseEnd_EventScript_26ACFF + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_26ACFF .2byte 0 Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call Route110_TrickHouseEnd_EventScript_26AD0D special DrawWholeMapView end @@ -44,7 +44,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 lock faceplayer msgbox Route110_TrickHouseEnd_Text_26B08D, 4 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 switch VAR_0x4044 case 0, Route110_TrickHouseEnd_EventScript_26AD84 case 1, Route110_TrickHouseEnd_EventScript_26ADC0 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index fd8c42f84..b724b986d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,21 +4,21 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC29 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC3C - compare VAR_0x4003, 1 + compare VAR_TEMP_3, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC4F - compare VAR_0x4004, 1 + compare VAR_TEMP_4, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC62 end Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 end Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2 Route110_TrickHousePuzzle2_EventScript_26BBDD:: @ 826BBDD lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_26BC29 special DrawWholeMapView @@ -44,7 +44,7 @@ Route110_TrickHousePuzzle2_EventScript_26BBDD:: @ 826BBDD Route110_TrickHousePuzzle2_EventScript_26BBF0:: @ 826BBF0 lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_26BC3C special DrawWholeMapView @@ -53,7 +53,7 @@ Route110_TrickHousePuzzle2_EventScript_26BBF0:: @ 826BBF0 Route110_TrickHousePuzzle2_EventScript_26BC03:: @ 826BC03 lockall - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_26BC4F special DrawWholeMapView @@ -62,7 +62,7 @@ Route110_TrickHousePuzzle2_EventScript_26BC03:: @ 826BC03 Route110_TrickHousePuzzle2_EventScript_26BC16:: @ 826BC16 lockall - setvar VAR_0x4004, 1 + setvar VAR_TEMP_4, 1 playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_26BC62 special DrawWholeMapView diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index b5302e551..9956f9889 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,19 +5,19 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 call Route110_TrickHousePuzzle3_EventScript_26BF1E - compare VAR_0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 end Route110_TrickHousePuzzle3_MapScript1_26BEFF: @ 826BEFF - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 - setvar VAR_0x4008, 0 - setvar VAR_0x4009, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 end Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E @@ -25,13 +25,13 @@ Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E setmetatile 3, 11, 600, 0 setmetatile 12, 5, 600, 0 setmetatile 8, 2, 600, 0 - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF6F - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF79 - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF83 - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF8D return @@ -207,25 +207,25 @@ Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232 Route110_TrickHousePuzzle3_EventScript_26C4CD:: @ 826C4CD lockall - setvar VAR_0x4008, 1 + setvar VAR_TEMP_8, 1 goto Route110_TrickHousePuzzle3_EventScript_26C4FD end Route110_TrickHousePuzzle3_EventScript_26C4D9:: @ 826C4D9 lockall - setvar VAR_0x4008, 2 + setvar VAR_TEMP_8, 2 goto Route110_TrickHousePuzzle3_EventScript_26C4FD end Route110_TrickHousePuzzle3_EventScript_26C4E5:: @ 826C4E5 lockall - setvar VAR_0x4008, 3 + setvar VAR_TEMP_8, 3 goto Route110_TrickHousePuzzle3_EventScript_26C4FD end Route110_TrickHousePuzzle3_EventScript_26C4F1:: @ 826C4F1 lockall - setvar VAR_0x4008, 4 + setvar VAR_TEMP_8, 4 goto Route110_TrickHousePuzzle3_EventScript_26C4FD end @@ -237,55 +237,55 @@ Route110_TrickHousePuzzle3_EventScript_26C4FD:: @ 826C4FD end Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510 - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 - compare VAR_0x4008, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C551 - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C557 - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C55D - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C563 return Route110_TrickHousePuzzle3_EventScript_26C551:: @ 826C551 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return Route110_TrickHousePuzzle3_EventScript_26C557:: @ 826C557 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 return Route110_TrickHousePuzzle3_EventScript_26C55D:: @ 826C55D - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 return Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563 - setvar VAR_0x4004, 1 + setvar VAR_TEMP_4, 1 return Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 - compare VAR_0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 special DrawWholeMapView - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 goto_eq Route110_TrickHousePuzzle3_EventScript_26C599 - compare VAR_0x4009, 0 + compare VAR_TEMP_9, 0 goto_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 end Route110_TrickHousePuzzle3_EventScript_26C599:: @ 826C599 - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 releaseall end Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 5e14d3add..cd14f0060 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -3,12 +3,12 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 .byte 0 Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 - setvar VAR_0x4005, 0 - setvar VAR_0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_8, 0 end Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 @@ -27,9 +27,9 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CCEB end @@ -37,9 +37,9 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end @@ -47,9 +47,9 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare VAR_0x4003, 1 + compare VAR_TEMP_3, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 end @@ -57,9 +57,9 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare VAR_0x4004, 1 + compare VAR_TEMP_4, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end @@ -67,165 +67,165 @@ Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare VAR_0x4005, 1 + compare VAR_TEMP_5, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CEF2 end Route110_TrickHousePuzzle5_EventScript_26CBD7:: @ 826CBD7 lockall - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CCEB end Route110_TrickHousePuzzle5_EventScript_26CBE3:: @ 826CBE3 lockall - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_26CCEB end Route110_TrickHousePuzzle5_EventScript_26CBEF:: @ 826CBEF lockall - setvar VAR_0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_26CCEB end Route110_TrickHousePuzzle5_EventScript_26CBFB:: @ 826CBFB lockall - setvar VAR_0x4009, 3 + setvar VAR_TEMP_9, 3 goto Route110_TrickHousePuzzle5_EventScript_26CCEB end Route110_TrickHousePuzzle5_EventScript_26CC07:: @ 826CC07 lockall - setvar VAR_0x4009, 4 + setvar VAR_TEMP_9, 4 goto Route110_TrickHousePuzzle5_EventScript_26CCEB end Route110_TrickHousePuzzle5_EventScript_26CC13:: @ 826CC13 lockall - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end Route110_TrickHousePuzzle5_EventScript_26CC1F:: @ 826CC1F lockall - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end Route110_TrickHousePuzzle5_EventScript_26CC2B:: @ 826CC2B lockall - setvar VAR_0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end Route110_TrickHousePuzzle5_EventScript_26CC37:: @ 826CC37 lockall - setvar VAR_0x4009, 3 + setvar VAR_TEMP_9, 3 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end Route110_TrickHousePuzzle5_EventScript_26CC43:: @ 826CC43 lockall - setvar VAR_0x4009, 4 + setvar VAR_TEMP_9, 4 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end Route110_TrickHousePuzzle5_EventScript_26CC4F:: @ 826CC4F lockall - setvar VAR_0x4009, 5 + setvar VAR_TEMP_9, 5 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end Route110_TrickHousePuzzle5_EventScript_26CC5B:: @ 826CC5B lockall - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 end Route110_TrickHousePuzzle5_EventScript_26CC67:: @ 826CC67 lockall - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 end Route110_TrickHousePuzzle5_EventScript_26CC73:: @ 826CC73 lockall - setvar VAR_0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 end Route110_TrickHousePuzzle5_EventScript_26CC7F:: @ 826CC7F lockall - setvar VAR_0x4009, 3 + setvar VAR_TEMP_9, 3 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 end Route110_TrickHousePuzzle5_EventScript_26CC8B:: @ 826CC8B lockall - setvar VAR_0x4009, 4 + setvar VAR_TEMP_9, 4 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 end Route110_TrickHousePuzzle5_EventScript_26CC97:: @ 826CC97 lockall - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end Route110_TrickHousePuzzle5_EventScript_26CCA3:: @ 826CCA3 lockall - setvar VAR_0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end Route110_TrickHousePuzzle5_EventScript_26CCAF:: @ 826CCAF lockall - setvar VAR_0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end Route110_TrickHousePuzzle5_EventScript_26CCBB:: @ 826CCBB lockall - setvar VAR_0x4009, 3 + setvar VAR_TEMP_9, 3 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7 lockall - setvar VAR_0x4009, 4 + setvar VAR_TEMP_9, 4 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3 lockall - setvar VAR_0x4009, 5 + setvar VAR_TEMP_9, 5 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF lockall - setvar VAR_0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CEF2 end Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB - setvar VAR_0x4001, 1 - setvar VAR_0x4008, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_8, 1 playse SE_PIN applymovement 1, Route110_TrickHousePuzzle5_Movement_272598 waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare VAR_0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare VAR_0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare VAR_0x4009, 4 + compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4 random 3 @@ -236,22 +236,22 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB end Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A - setvar VAR_0x4002, 1 - setvar VAR_0x4008, 2 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_8, 2 playse SE_PIN applymovement 2, Route110_TrickHousePuzzle5_Movement_272598 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC - compare VAR_0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304 - compare VAR_0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C - compare VAR_0x4009, 4 + compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 - compare VAR_0x4009, 5 + compare VAR_TEMP_9, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4 random 3 @@ -262,20 +262,20 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A end Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 - setvar VAR_0x4003, 1 - setvar VAR_0x4008, 3 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_8, 3 playse SE_PIN applymovement 3, Route110_TrickHousePuzzle5_Movement_272598 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare VAR_0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare VAR_0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare VAR_0x4009, 4 + compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4 random 3 @@ -286,20 +286,20 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 end Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 - setvar VAR_0x4004, 1 - setvar VAR_0x4008, 4 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_8, 4 playse SE_PIN applymovement 4, Route110_TrickHousePuzzle5_Movement_272598 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare VAR_0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare VAR_0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare VAR_0x4009, 4 + compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4 random 3 @@ -310,8 +310,8 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 end Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 - setvar VAR_0x4005, 1 - setvar VAR_0x4008, 5 + setvar VAR_TEMP_5, 1 + setvar VAR_TEMP_8, 5 playse SE_PIN applymovement 5, Route110_TrickHousePuzzle5_Movement_272598 waitmovement 0 @@ -475,132 +475,132 @@ Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA end Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4 - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4 - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405 - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410 return Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426 - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431 - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447 return Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224 - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452 - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468 - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473 - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E return Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489 - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494 - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5 return Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294 - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0 - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6 - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1 - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC return Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7 - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502 - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518 - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523 return Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304 - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539 - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544 - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A return Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565 - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570 - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586 - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591 return Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374 - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7 - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2 - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8 return Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC - compare VAR_0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3 - compare VAR_0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE - compare VAR_0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9 - compare VAR_0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4 - compare VAR_0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 0a0e025af..0f20aac1f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 end Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6 - map_script_2 VAR_0x4000, 16384, Route110_TrickHousePuzzle6_EventScript_26DDC0 + map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_26DDC0 .2byte 0 Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index a23565c14..37d77d095 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -62,24 +62,24 @@ Route111_EventScript_1F0DC2:: @ 81F0DC2 return Route111_EventScript_1F0DDA:: @ 81F0DDA - setvar VAR_0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, 100 return Route111_EventScript_1F0DE0:: @ 81F0DE0 - setvar VAR_0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, 105 return Route111_EventScript_1F0DE6:: @ 81F0DE6 - getplayerxy VAR_0x4000, VAR_0x4001 - compare VAR_0x4001, 34 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 34 goto_if 0, Route111_EventScript_1F0E25 - compare VAR_0x4001, 107 + compare VAR_TEMP_1, 107 goto_if 2, Route111_EventScript_1F0E25 - compare VAR_0x4001, 72 + compare VAR_TEMP_1, 72 goto_if 2, Route111_EventScript_1F0E22 - compare VAR_0x4000, 2000 + compare VAR_TEMP_0, 2000 goto_if 2, Route111_EventScript_1F0E25 - compare VAR_0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, Route111_EventScript_1F0E25 Route111_EventScript_1F0E22:: @ 81F0E22 @@ -208,7 +208,7 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E checkitem ITEM_GO_GOGGLES, 1 compare VAR_RESULT, 0 goto_eq Route111_EventScript_1F0F45 - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 releaseall end @@ -266,7 +266,7 @@ Route111_EventScript_1F0FB0:: @ 81F0FB0 setweather 2 fadenewbgm MUS_DOORO_X1 doweather - setvar VAR_0x4003, 0 + setvar VAR_TEMP_3, 0 end Route111_EventScript_1F0FBD:: @ 81F0FBD diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index d990527a6..63dc6c47f 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -13,10 +13,10 @@ Route113_MapScript1_1F2161: @ 81F2161 end Route113_EventScript_1F216A:: @ 81F216A - getplayerxy VAR_0x4000, VAR_0x4001 - compare VAR_0x4000, 19 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 19 goto_if 0, Route113_EventScript_1F2189 - compare VAR_0x4000, 84 + compare VAR_TEMP_0, 84 goto_if 2, Route113_EventScript_1F2189 setweather 7 return diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 5f60851b4..41e0fbbfe 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -30,12 +30,12 @@ Route119_EventScript_1F4466:: @ 81F4466 return Route119_EventScript_1F4472:: @ 81F4472 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto Route119_EventScript_1F4488 end Route119_EventScript_1F447D:: @ 81F447D - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto Route119_EventScript_1F4488 end @@ -48,16 +48,16 @@ Route119_EventScript_1F4488:: @ 81F4488 compare VAR_RESULT, 1 call_if 1, Route119_EventScript_1F4506 delay 65 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F46C6 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1F46D1 applymovement 255, Route119_Movement_2725AA waitmovement 0 delay 30 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F4700 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1F470F removeobject 25 addobject 16 @@ -145,25 +145,25 @@ Route119_EventScript_1F45FF:: @ 81F45FF Route119_EventScript_1F460F:: @ 81F460F closemessage - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F4700 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1F470F removeobject 16 addobject 25 delay 30 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F46DC - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1F46EE removeobject 25 setvar VAR_0x4072, 1 savebgm MUS_DUMMY fadedefaultbgm delay 60 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F46A0 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1F46A8 addobject 43 applymovement 43, Route119_Movement_1F4752 @@ -171,9 +171,9 @@ Route119_EventScript_1F460F:: @ 81F460F addvar VAR_0x40D1, 1 msgbox Route119_Text_1F4E60, 4 closemessage - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F46B0 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1F46BB removeobject 43 releaseall diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index c8f24f33d..0bd6c12f2 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -84,7 +84,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D msgbox Route119_WeatherInstitute_2F_Text_270650, 4 - setvar VAR_0x4001, 385 + setvar VAR_TEMP_1, 385 givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_270085 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index b3475a3ed..461823e47 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -70,12 +70,12 @@ Route120_MapScript1_1F54CD: @ 81F54CD end Route120_EventScript_1F54D8:: @ 81F54D8 - getplayerxy VAR_0x4000, VAR_0x4001 - compare VAR_0x4001, 14 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 14 goto_if 3, Route120_EventScript_1F5503 - compare VAR_0x4001, 60 + compare VAR_TEMP_1, 60 goto_if 3, Route120_EventScript_1F5507 - compare VAR_0x4001, 61 + compare VAR_TEMP_1, 61 goto_if 4, Route120_EventScript_1F54FF return @@ -88,9 +88,9 @@ Route120_EventScript_1F5503:: @ 81F5503 return Route120_EventScript_1F5507:: @ 81F5507 - compare VAR_0x4000, 7 + compare VAR_TEMP_0, 7 goto_if 3, Route120_EventScript_1F5523 - compare VAR_0x4000, 19 + compare VAR_TEMP_0, 19 goto_if 3, Route120_EventScript_1F5503 goto Route120_EventScript_1F5523 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index dd5218e1d..0892b216a 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,13 +23,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C call Route124_DivingTreasureHuntersHouse_EventScript_270A72 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0 end Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AB8 @@ -45,19 +45,19 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 return Route124_DivingTreasureHuntersHouse_EventScript_270AB8:: @ 8270AB8 - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 return Route124_DivingTreasureHuntersHouse_EventScript_270ABE:: @ 8270ABE - addvar VAR_0x4001, 2 + addvar VAR_TEMP_1, 2 return Route124_DivingTreasureHuntersHouse_EventScript_270AC4:: @ 8270AC4 - addvar VAR_0x4001, 4 + addvar VAR_TEMP_1, 4 return Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA - addvar VAR_0x4001, 8 + addvar VAR_TEMP_1, 8 return Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0 @@ -68,7 +68,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0 Route124_DivingTreasureHuntersHouse_EventScript_270ADE:: @ 8270ADE message Route124_DivingTreasureHuntersHouse_Text_271117 waitmessage - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270B8F case 2, Route124_DivingTreasureHuntersHouse_EventScript_270BB5 case 3, Route124_DivingTreasureHuntersHouse_EventScript_270BDB @@ -263,7 +263,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 giveitem_std VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_271158, 4 call Route124_DivingTreasureHuntersHouse_EventScript_270A72 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, 5 compare VAR_RESULT, 1 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 8798a586a..f8426a7eb 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -8,13 +8,13 @@ RustboroCity_MapScript1_1E06C8: @ 81E06C8 call RustboroCity_EventScript_271ED7 compare VAR_0x405A, 6 call_if 1, RustboroCity_EventScript_1E0707 - getplayerxy VAR_0x4000, VAR_0x4001 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_0x405A, 6 goto_eq RustboroCity_EventScript_1E06EC end RustboroCity_EventScript_1E06EC:: @ 81E06EC - compare VAR_0x4000, 11 + compare VAR_TEMP_0, 11 goto_eq RustboroCity_EventScript_1E06FF setobjectxyperm 15, 12, 15 end @@ -459,42 +459,42 @@ RustboroCity_EventScript_1E0ADD:: @ 81E0ADD RustboroCity_EventScript_1E0AF2:: @ 81E0AF2 waitse - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 goto RustboroCity_EventScript_1E0C5B end RustboroCity_EventScript_1E0AFE:: @ 81E0AFE lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_1E0B2E end RustboroCity_EventScript_1E0B0A:: @ 81E0B0A lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_1E0B2E end RustboroCity_EventScript_1E0B16:: @ 81E0B16 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_1E0B2E end RustboroCity_EventScript_1E0B22:: @ 81E0B22 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_1E0B2E end RustboroCity_EventScript_1E0B2E:: @ 81E0B2E - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_1E0B6F - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_1E0B9B - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_1E0BC7 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_1E0BF3 setflag FLAG_0x09F setvar VAR_0x405A, 3 @@ -559,38 +559,38 @@ RustboroCity_Movement_1E0C29: @ 81E0C29 RustboroCity_EventScript_1E0C2B:: @ 81E0C2B lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_1E0C5B end RustboroCity_EventScript_1E0C37:: @ 81E0C37 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_1E0C5B end RustboroCity_EventScript_1E0C43:: @ 81E0C43 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_1E0C5B end RustboroCity_EventScript_1E0C4F:: @ 81E0C4F lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_1E0C5B end RustboroCity_EventScript_1E0C5B:: @ 81E0C5B - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_1E0CDC - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_1E0D08 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_1E0D34 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_1E0D60 - compare VAR_0x4001, 4 + compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_1E0D96 msgbox RustboroCity_Text_1E194D, 4 giveitem_std ITEM_GREAT_BALL diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 5543b297a..88f0c2e73 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -158,7 +158,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C end RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E - setvar VAR_0x4001, 388 + setvar VAR_TEMP_1, 388 givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A6E @@ -207,7 +207,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 end RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 - setvar VAR_0x4001, 390 + setvar VAR_TEMP_1, 390 givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B11 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index e4e362234..52dca4c95 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -51,35 +51,35 @@ RusturfTunnel_EventScript_22CE99:: @ 822CE99 RusturfTunnel_EventScript_22CEAE:: @ 822CEAE lockall - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CFA7 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_22CFBC - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFC7 call RusturfTunnel_EventScript_22CFFF msgbox RusturfTunnel_Text_22D65C, 4 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_22CFC8 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 setflag FLAG_0x06A msgbox RusturfTunnel_Text_22D6D2, 4 closemessage - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CF5D - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_22CF6F - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CF8B msgbox RusturfTunnel_Text_22D745, 4 closemessage - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CFD4 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_22CFE6 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFE6 call RusturfTunnel_EventScript_272216 releaseall @@ -268,15 +268,15 @@ RusturfTunnel_Movement_22D06C: @ 822D06C step_end RusturfTunnel_EventScript_22D071:: @ 822D071 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 end RusturfTunnel_EventScript_22D077:: @ 822D077 - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 end RusturfTunnel_EventScript_22D07D:: @ 822D07D - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 end RusturfTunnel_EventScript_22D083:: @ 822D083 diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index e52828a19..4c5aa0371 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -17,25 +17,25 @@ SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 return SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E - setvar VAR_0x4011, 100 + setvar VAR_OBJ_GFX_ID_1, 100 return SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994 - setvar VAR_0x4011, 105 + setvar VAR_OBJ_GFX_ID_1, 105 return SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A - map_script_2 VAR_0x4001, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099A4 + map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099A4 .2byte 0 SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 2, SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4 - map_script_2 VAR_0x4000, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099BE + map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099BE .2byte 0 SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index b293dc140..47ca641ce 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -4,11 +4,11 @@ SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26 .byte 0 SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 - map_script_2 VAR_0x4001, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B + map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B .2byte 0 SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 compare VAR_0x8006, 1 goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56 setobjectxy 1, 2, 2 @@ -19,13 +19,13 @@ SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56 end SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B - map_script_2 VAR_0x4000, 0, SlateportCity_BattleTentCorridor_EventScript_208E65 + map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_208E65 .2byte 0 SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 compare VAR_0x8006, 1 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059 waitmovement 0 diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index e5f510179..6353856e3 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -4,20 +4,20 @@ SlateportCity_BattleTentLobby_MapScripts:: @ 8208730 .byte 0 SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B - map_script_2 VAR_0x4001, 0, SlateportCity_BattleTentLobby_EventScript_208745 + map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_208745 .2byte 0 SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F - map_script_2 VAR_0x4000, 0, SlateportCity_BattleTentLobby_EventScript_208779 - map_script_2 VAR_0x4000, 1, SlateportCity_BattleTentLobby_EventScript_208782 - map_script_2 VAR_0x4000, 2, SlateportCity_BattleTentLobby_EventScript_208871 - map_script_2 VAR_0x4000, 3, SlateportCity_BattleTentLobby_EventScript_2087B7 - map_script_2 VAR_0x4000, 4, SlateportCity_BattleTentLobby_EventScript_208837 + map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_208779 + map_script_2 VAR_TEMP_0, 1, SlateportCity_BattleTentLobby_EventScript_208782 + map_script_2 VAR_TEMP_0, 2, SlateportCity_BattleTentLobby_EventScript_208871 + map_script_2 VAR_TEMP_0, 3, SlateportCity_BattleTentLobby_EventScript_2087B7 + map_script_2 VAR_TEMP_0, 4, SlateportCity_BattleTentLobby_EventScript_208837 .2byte 0 SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 @@ -33,7 +33,7 @@ SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 @@ -94,7 +94,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861 msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -111,7 +111,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 setvar VAR_0x8006, 2 goto SlateportCity_BattleTentLobby_EventScript_2089AC @@ -149,7 +149,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 case 127, SlateportCity_BattleTentLobby_EventScript_208A2B SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 @@ -166,7 +166,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 closemessage delay 2 call SlateportCity_BattleTentLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentLobby_EventScript_208A14 setvar VAR_0x8006, 0 @@ -176,7 +176,7 @@ SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC closemessage call SlateportCity_BattleTentLobby_EventScript_2089C9 warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 5fb080363..a66e0e6d9 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -4,7 +4,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D SlateportCity_Harbor_MapScript1_20C983: @ 820C983 setescapewarp SLATEPORT_CITY, 255, 28, 13 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 compare VAR_0x40A0, 1 call_if 1, SlateportCity_Harbor_EventScript_20C9A9 checkflag FLAG_SYS_GAME_CLEAR @@ -331,7 +331,7 @@ SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 end SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_eq SlateportCity_Harbor_EventScript_20CE11 checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 @@ -400,7 +400,7 @@ SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05 end SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SlateportCity_Harbor_Text_20D970, 4 release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 192870003..307f42af5 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -22,7 +22,7 @@ SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 end SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_0x0CC call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 checkflag FLAG_0x0CB @@ -33,7 +33,7 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 checkflag FLAG_0x0C8 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - compare VAR_0x4002, 5 + compare VAR_TEMP_2, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA compare VAR_0x40B7, 2 goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B @@ -48,7 +48,7 @@ SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 msgbox SlateportCity_PokemonFanClub_Text_20A65F, 4 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checkflag FLAG_0x0CC call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B checkflag FLAG_0x0CB @@ -60,7 +60,7 @@ SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 checkflag FLAG_0x0C8 call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0DF bufferleadmonspeciesname 0 - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_209FD6 case 1, SlateportCity_PokemonFanClub_EventScript_209FE0 case 2, SlateportCity_PokemonFanClub_EventScript_20A011 @@ -75,7 +75,7 @@ SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA return SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 - addvar VAR_0x4002, 1 + addvar VAR_TEMP_2, 1 return SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 @@ -150,7 +150,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF return SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 @@ -160,7 +160,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 return SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 return SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D @@ -170,7 +170,7 @@ SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D return SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 return SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 @@ -180,7 +180,7 @@ SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 return SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 return SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B @@ -190,7 +190,7 @@ SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B return SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 return SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 362ae269c..6a53dc57c 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -15,7 +15,7 @@ SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67 SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A call SootopolisCity_Gym_1F_EventScript_224E73 - special sub_809E1C8 + special SetSootopolisGymCrackedIceMetatiles end SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index eaca36e59..54ade5181 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -13,7 +13,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E end SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, 8 setmaplayoutindex 441 @@ -78,7 +78,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 special sub_81A1780 compare VAR_RESULT, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 release diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 0dec00967..5a4a09735 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A end SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E - map_script_2 VAR_0x4001, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68 + map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68 .2byte 0 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 @@ -33,7 +33,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 waitmovement 0 special LoadPlayerParty - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 waitstate releaseall diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index cbaaa905a..b7d4e101c 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -24,13 +24,13 @@ SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E end SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A - setvar VAR_0x4011, 188 - setvar VAR_0x4004, 408 + setvar VAR_OBJ_GFX_ID_1, 188 + setvar VAR_TEMP_4, 408 return SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 - setvar VAR_0x4011, 187 - setvar VAR_0x4004, 407 + setvar VAR_OBJ_GFX_ID_1, 187 + setvar VAR_TEMP_4, 407 return SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 @@ -42,11 +42,11 @@ SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 end SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 - setvar VAR_0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, 100 return SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE - setvar VAR_0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, 105 return SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 @@ -71,7 +71,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 waitmovement 0 delay 50 waitse - playmoncry VAR_0x4004, 0 + playmoncry VAR_TEMP_4, 0 delay 30 waitmoncry addobject 2 @@ -103,12 +103,12 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 SouthernIsland_Interior_EventScript_242B81:: @ 8242B81 setflag FLAG_0x1C8 - copyvar VAR_0x8004, VAR_0x4004 + copyvar VAR_0x8004, VAR_TEMP_4 goto SouthernIsland_Interior_EventScript_273776 end SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F - copyvar VAR_0x8004, VAR_0x4004 + copyvar VAR_0x8004, VAR_TEMP_4 goto SouthernIsland_Interior_EventScript_273776 end diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc index 63fc07f5b..be532733d 100644 --- a/data/scripts/maps/TerraCave_End.inc +++ b/data/scripts/maps/TerraCave_End.inc @@ -22,7 +22,7 @@ TerraCave_End_MapScript1_23B0D9: @ 823B0D9 TerraCave_End_EventScript_23B0E3:: @ 823B0E3 clearflag FLAG_0x30F - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return TerraCave_End_EventScript_23B0EC:: @ 823B0EC @@ -41,7 +41,7 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, sub_8138B80 compare VAR_RESULT, 1 goto_eq TerraCave_End_EventScript_23B155 diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index c3644e0de..7886f91b8 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -3,7 +3,7 @@ TrainerHill_Elevator_MapScripts:: @ 826934F .byte 0 TrainerHill_Elevator_MapScript2_269355: @ 8269355 - map_script_2 VAR_0x4004, 0, TrainerHill_Elevator_EventScript_269375 + map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_269375 .2byte 0 TrainerHill_Elevator_EventScript_26935F:: @ 826935F diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index eb12efb4b..6dc934f3c 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -8,7 +8,7 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 setflag FLAG_LANDMARK_TRAINER_HILL - getplayerxy VAR_0x400D, VAR_RESULT + getplayerxy VAR_TEMP_D, VAR_RESULT end TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF @@ -17,7 +17,7 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 setvar VAR_0x8004, 4 special sp194_trainer_tower - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 9 special sp194_trainer_tower compare VAR_RESULT, 0 @@ -45,7 +45,7 @@ TrainerHill_Entrance_MapScript1_26811B: @ 826811B end TrainerHill_Entrance_MapScript1_268128: @ 8268128 - compare VAR_0x400D, 17 + compare VAR_TEMP_D, 17 call_if 1, TrainerHill_Entrance_EventScript_268134 end @@ -54,10 +54,10 @@ TrainerHill_Entrance_EventScript_268134:: @ 8268134 return TrainerHill_Entrance_MapScript2_26813E: @ 826813E - map_script_2 VAR_0x4000, 0, TrainerHill_Entrance_EventScript_268182 - map_script_2 VAR_0x400D, 17, TrainerHill_Entrance_EventScript_268160 - map_script_2 VAR_0x4005, 1, TrainerHill_Entrance_EventScript_268229 - map_script_2 VAR_0x4001, 1, TrainerHill_Entrance_EventScript_2C83DF + map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_268182 + map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_268160 + map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_268229 + map_script_2 VAR_TEMP_1, 1, TrainerHill_Entrance_EventScript_2C83DF .2byte 0 TrainerHill_Entrance_EventScript_268160:: @ 8268160 @@ -68,12 +68,12 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160 special DrawWholeMapView playse SE_TK_KASYA waitse - setvar VAR_0x400D, 0 + setvar VAR_TEMP_D, 0 releaseall end TrainerHill_Entrance_EventScript_268182:: @ 8268182 - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 6 special sp194_trainer_tower switch VAR_RESULT @@ -173,7 +173,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 copyvar VAR_0x8005, VAR_RESULT special sp194_trainer_tower setvar VAR_0x40D6, 1 - setvar VAR_0x4005, 0 + setvar VAR_TEMP_5, 0 special HealPlayerParty msgbox TrainerHill_Entrance_Text_26862A, 4 setvar VAR_0x8004, 0 @@ -182,7 +182,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 end TrainerHill_Entrance_EventScript_268314:: @ 8268314 - setvar VAR_0x4005, 0 + setvar VAR_TEMP_5, 0 msgbox TrainerHill_Entrance_Text_26866F, 4 closemessage applymovement 255, TrainerHill_Entrance_Movement_268381 @@ -194,7 +194,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E msgbox TrainerHill_Entrance_Text_26851C, 4 setvar VAR_0x8004, 14 special sp194_trainer_tower - setvar VAR_0x4005, 1 + setvar VAR_TEMP_5, 1 call TrainerHill_Entrance_EventScript_27134F compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_26835C diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 65f62498e..e92087ebd 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -12,7 +12,7 @@ LinkContestRoom1_MapScript1_23B79B: @ 823B79B LinkContestRoom1_MapScript1_23B79F: @ 823B79F call LinkContestRoom1_EventScript_23B7AF - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 call LinkContestRoom1_EventScript_23B842 end @@ -52,7 +52,7 @@ LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF return LinkContestRoom1_MapScript1_23B803: @ 823B803 - compare VAR_0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, LinkContestRoom1_EventScript_23B80F end @@ -82,12 +82,12 @@ LinkContestRoom1_EventScript_23B834:: @ 823B834 LinkContestRoom1_EventScript_23B842:: @ 823B842 call LinkContestRoom1_EventScript_23B8F8 call LinkContestRoom1_EventScript_23B858 - compare VAR_0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, LinkContestRoom1_EventScript_23B842 return LinkContestRoom1_EventScript_23B858:: @ 823B858 - switch VAR_0x4000 + switch VAR_TEMP_0 case 1, LinkContestRoom1_EventScript_23B8AB case 2, LinkContestRoom1_EventScript_23B8B6 case 3, LinkContestRoom1_EventScript_23B8C1 @@ -98,38 +98,38 @@ LinkContestRoom1_EventScript_23B858:: @ 823B858 end LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB - copyvar VAR_0x4014, VAR_0x4001 - addvar VAR_0x4000, 1 + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6 - copyvar VAR_0x4015, VAR_0x4001 - addvar VAR_0x4000, 1 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1 - copyvar VAR_0x4016, VAR_0x4001 - addvar VAR_0x4000, 1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC - copyvar VAR_0x4017, VAR_0x4001 - addvar VAR_0x4000, 1 + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7 - copyvar VAR_0x4018, VAR_0x4001 - addvar VAR_0x4000, 1 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2 - copyvar VAR_0x4019, VAR_0x4001 - addvar VAR_0x4000, 1 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED - copyvar VAR_0x401A, VAR_0x4001 - addvar VAR_0x4000, 1 + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 @@ -172,131 +172,131 @@ LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 end LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 return LinkContestRoom1_EventScript_23BA71:: @ 823BA71 - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_23BA77:: @ 823BA77 - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 return LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 return LinkContestRoom1_EventScript_23BA83:: @ 823BA83 - setvar VAR_0x4001, 10 + setvar VAR_TEMP_1, 10 return LinkContestRoom1_EventScript_23BA89:: @ 823BA89 - setvar VAR_0x4001, 11 + setvar VAR_TEMP_1, 11 return LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F - setvar VAR_0x4001, 12 + setvar VAR_TEMP_1, 12 return LinkContestRoom1_EventScript_23BA95:: @ 823BA95 - setvar VAR_0x4001, 13 + setvar VAR_TEMP_1, 13 return LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B - setvar VAR_0x4001, 14 + setvar VAR_TEMP_1, 14 return LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1 - setvar VAR_0x4001, 15 + setvar VAR_TEMP_1, 15 return LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7 - setvar VAR_0x4001, 17 + setvar VAR_TEMP_1, 17 return LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD - setvar VAR_0x4001, 18 + setvar VAR_TEMP_1, 18 return LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3 - setvar VAR_0x4001, 19 + setvar VAR_TEMP_1, 19 return LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9 - setvar VAR_0x4001, 20 + setvar VAR_TEMP_1, 20 return LinkContestRoom1_EventScript_23BABF:: @ 823BABF - setvar VAR_0x4001, 21 + setvar VAR_TEMP_1, 21 return LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5 - setvar VAR_0x4001, 22 + setvar VAR_TEMP_1, 22 return LinkContestRoom1_EventScript_23BACB:: @ 823BACB - setvar VAR_0x4001, 25 + setvar VAR_TEMP_1, 25 return LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1 - setvar VAR_0x4001, 26 + setvar VAR_TEMP_1, 26 return LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7 - setvar VAR_0x4001, 27 + setvar VAR_TEMP_1, 27 return LinkContestRoom1_EventScript_23BADD:: @ 823BADD - setvar VAR_0x4001, 47 + setvar VAR_TEMP_1, 47 return LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3 - setvar VAR_0x4001, 30 + setvar VAR_TEMP_1, 30 return LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9 - setvar VAR_0x4001, 31 + setvar VAR_TEMP_1, 31 return LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF - setvar VAR_0x4001, 32 + setvar VAR_TEMP_1, 32 return LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5 - setvar VAR_0x4001, 33 + setvar VAR_TEMP_1, 33 return LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB - setvar VAR_0x4001, 34 + setvar VAR_TEMP_1, 34 return LinkContestRoom1_EventScript_23BB01:: @ 823BB01 - setvar VAR_0x4001, 35 + setvar VAR_TEMP_1, 35 return LinkContestRoom1_EventScript_23BB07:: @ 823BB07 - setvar VAR_0x4001, 36 + setvar VAR_TEMP_1, 36 return LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D - setvar VAR_0x4001, 37 + setvar VAR_TEMP_1, 37 return LinkContestRoom1_EventScript_23BB13:: @ 823BB13 - setvar VAR_0x4001, 38 + setvar VAR_TEMP_1, 38 return LinkContestRoom1_EventScript_23BB19:: @ 823BB19 - setvar VAR_0x4001, 44 + setvar VAR_TEMP_1, 44 return LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F - setvar VAR_0x4001, 45 + setvar VAR_TEMP_1, 45 return LinkContestRoom1_EventScript_23BB25:: @ 823BB25 - setvar VAR_0x4001, 46 + setvar VAR_TEMP_1, 46 return LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B @@ -449,10 +449,10 @@ LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 return LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE - setvar VAR_0x4013, 100 + setvar VAR_OBJ_GFX_ID_3, 100 return LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 - setvar VAR_0x4013, 105 + setvar VAR_OBJ_GFX_ID_3, 105 return diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index ad2749ba8..24c319337 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -17,17 +17,17 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 return VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 - setvar VAR_0x4011, 100 - setvar VAR_0x4010, 100 + setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_0, 100 return VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333 - setvar VAR_0x4011, 105 - setvar VAR_0x4010, 105 + setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_0, 105 return VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E - map_script_2 VAR_0x4000, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_202348 + map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_202348 .2byte 0 VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 @@ -150,13 +150,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F end VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 - map_script_2 VAR_0x4001, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20254B + map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20254B .2byte 0 VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B hideobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 255, VerdanturfTown_BattleTentBattleRoom_Movement_202573 removeobject 2 end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc index a44e98ed8..0d0470fc1 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc @@ -3,12 +3,12 @@ VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A .byte 0 VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090 - map_script_2 VAR_0x4000, 0, VerdanturfTown_BattleTentCorridor_EventScript_20209A + map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_20209A .2byte 0 VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A lockall - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020DE waitmovement 0 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 6f1624a2d..85c5f33c7 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -4,20 +4,20 @@ VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0 .byte 0 VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB - map_script_2 VAR_0x4001, 0, VerdanturfTown_BattleTentLobby_EventScript_2016E5 + map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_2016E5 .2byte 0 VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF - map_script_2 VAR_0x4000, 0, VerdanturfTown_BattleTentLobby_EventScript_201719 - map_script_2 VAR_0x4000, 1, VerdanturfTown_BattleTentLobby_EventScript_201722 - map_script_2 VAR_0x4000, 2, VerdanturfTown_BattleTentLobby_EventScript_201837 - map_script_2 VAR_0x4000, 3, VerdanturfTown_BattleTentLobby_EventScript_201757 - map_script_2 VAR_0x4000, 4, VerdanturfTown_BattleTentLobby_EventScript_2017FD + map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_201719 + map_script_2 VAR_TEMP_0, 1, VerdanturfTown_BattleTentLobby_EventScript_201722 + map_script_2 VAR_TEMP_0, 2, VerdanturfTown_BattleTentLobby_EventScript_201837 + map_script_2 VAR_TEMP_0, 3, VerdanturfTown_BattleTentLobby_EventScript_201757 + map_script_2 VAR_TEMP_0, 4, VerdanturfTown_BattleTentLobby_EventScript_2017FD .2byte 0 VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 @@ -33,7 +33,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 @@ -74,7 +74,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 waitfanfare msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -82,7 +82,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4 waitmessage closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -107,7 +107,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD waitse msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 closemessage - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 releaseall end @@ -125,7 +125,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special sub_81A1780 - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 goto VerdanturfTown_BattleTentLobby_EventScript_2019AE VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 @@ -175,7 +175,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF case 127, VerdanturfTown_BattleTentLobby_EventScript_201A34 VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 @@ -193,7 +193,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 closemessage delay 2 call VerdanturfTown_BattleTentLobby_EventScript_27134F - setvar VAR_0x4000, 255 + setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D @@ -206,7 +206,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 warp VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 6bae599fc..8f8d493f8 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, 4 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, 4 closemessage - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_292866 @@ -198,7 +198,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, 4 msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, 4 closemessage - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_292866 @@ -322,7 +322,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A19 checkflag FLAG_0x052 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 compare VAR_0x4092, 7 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 diff --git a/data/specials.inc b/data/specials.inc index a056de629..1fa17b908 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -319,7 +319,7 @@ gSpecials:: @ 81DBA64 def_special sub_8139B60 def_special sub_80FAC78 def_special IsPokerusInParty - def_special sub_809E1C8 + def_special SetSootopolisGymCrackedIceMetatiles def_special sub_8139560 def_special StartGroudonKyogreBattle def_special BattleSetup_StartLegendaryBattle |