diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-27 12:51:10 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-27 12:51:10 -0500 |
| commit | cb90f22c5e632cf8161ae2c3246d8d1f205ce39f (patch) | |
| tree | 5b507a61b43ecfe02bf4b474b0857ac92e0992a8 /data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc | |
| parent | f559fa3fe26910056e84315370cb13ec8501af18 (diff) | |
| parent | 70d1f54ab96235b0e0d07d40526f16449e7cb1e7 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 35b082c76..c0017b150 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -12,23 +12,22 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC + call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx end -BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC +BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC checkplayergender compare VAR_RESULT, MALE - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale compare VAR_RESULT, FEMALE - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale return -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 +BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: @ 824BCF4 setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA +BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return @@ -511,9 +510,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC + call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx setvar VAR_TEMP_1, 1 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible frontier_get FRONTIER_DATA_BATTLE_NUM compare VAR_RESULT, 3 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF @@ -626,8 +625,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH return -BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 -BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773 +BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773 set_invisible step_end |