Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-14 04:36:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Document System Var-related Frontier scrcmds (#1183)

Browse Source
This commit is contained in:
VicSevenT
2026-06-04 01:34:48 -05:00
committed by GitHub
parent 346f8de62c
commit fd5f383e26
12 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
asm/macros/frscrcmd.inc
View File

@@ -352,14 +352,14 @@
.short \unused
.endm
.macro FrontierScrCmd_3D destVar, value
.short FRSCRCMD_3D
.macro SetSystemVar destVar, value
.short FRSCRCMD_SETSYSTEMVAR
.short \destVar
.short \value
.endm
.macro FrontierScrCmd_3E srcVar, destVar
.short FRSCRCMD_3E
.macro GetSystemVar srcVar, destVar
.short FRSCRCMD_GETSYSTEMVAR
.short \srcVar
.short \destVar
.endm

4
include/data/scripts/frscrcmd.h
View File

@@ -66,8 +66,8 @@ ScriptCommand(FRSCRCMD_HEALPARTY, FrontierScrCmd_HealPart
ScriptCommand(FRSCRCMD_WAITABPRESS, FrontierScrCmd_WaitABPress)
ScriptCommand(FRSCRCMD_WAITABPRESSTIME, FrontierScrCmd_WaitABPressTime)
ScriptCommand(FRSCRCMD_DUMMY3C, FrontierScrCmd_Dummy3C)
ScriptCommand(FRSCRCMD_3D, FrontierScrCmd_3D)
ScriptCommand(FRSCRCMD_3E, FrontierScrCmd_3E)
ScriptCommand(FRSCRCMD_SETSYSTEMVAR, FrontierScrCmd_SetSystemVar)
ScriptCommand(FRSCRCMD_GETSYSTEMVAR, FrontierScrCmd_GetSystemVar)
ScriptCommand(FRSCRCMD_3F, FrontierScrCmd_3F)
ScriptCommand(FRSCRCMD_GETPLAYEROBJEVENTGFX, FrontierScrCmd_GetPlayerObjEventGfx)
ScriptCommand(FRSCRCMD_INITPARTICLESYSTEM, FrontierScrCmd_InitParticleSystem)

26
res/field/frontier_scripts/frontier_scripts_battle_arcade.s
View File

@@ -884,11 +884,11 @@ _065C:
EndMovement
_0662:
FrontierScrCmd_3E VAR_BATTLE_ARCADE_CHALLENGE_TYPE, VAR_0x8001
FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003
FrontierScrCmd_3E VAR_MAP_LOCAL_2, VAR_0x8004
FrontierScrCmd_3E VAR_MAP_LOCAL_5, VAR_0x8005
FrontierScrCmd_3E VAR_MAP_LOCAL_6, VAR_0x8006
GetSystemVar VAR_BATTLE_ARCADE_CHALLENGE_TYPE, VAR_0x8001
GetSystemVar VAR_MAP_LOCAL_3, VAR_0x8003
GetSystemVar VAR_MAP_LOCAL_2, VAR_0x8004
GetSystemVar VAR_MAP_LOCAL_5, VAR_0x8005
GetSystemVar VAR_MAP_LOCAL_6, VAR_0x8006
InitNewBattleRecording
FrontierScrCmd_B8 VAR_0x8003, VAR_0x8001, VAR_0x8004, VAR_0x8005, VAR_0x8006, VAR_0x8008
GetPlayerObjEventGfx VAR_0x8007
@@ -2694,7 +2694,7 @@ _278C:
_279A:
CallBattleArcadeFunction BA_FUNC_UNK_22, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 1
SetSystemVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 1
Message BattleArcadeScene_Text_BPEarned
BufferPlayerName 0
CallBattleArcadeFunction BA_FUNC_UNK_45, 0, 0, VAR_0x8008
@@ -2986,7 +2986,7 @@ _2C5A:
End
_2C78:
FrontierScrCmd_3D VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 2
SetSystemVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 2
CallBattleArcadeFunction BA_FUNC_UNK_10, 0, 0, VAR_0x8008
FreeBattleRecording
FrontierScrCmd_BA
@@ -3033,7 +3033,7 @@ _2D19:
_2D31:
CallBattleArcadeFunction BA_FUNC_UNK_21, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 3
GoTo _2E0A
End
@@ -3071,7 +3071,7 @@ _2DB5:
_2DBD:
CallBattleArcadeFunction BA_FUNC_UNK_21, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 3
GoTo _2DD4
End
@@ -3291,7 +3291,7 @@ _3198:
_31DE:
Call _32A0
BufferNumber 0, VAR_0x8008
FrontierScrCmd_3E VAR_BATTLE_ARCADE_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_ARCADE_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 0, _320A
Message BattleArcadeScene_Text_BeatDahlia
CloseMessage
@@ -3299,13 +3299,13 @@ _31DE:
End
_320A:
FrontierScrCmd_3D VAR_BATTLE_ARCADE_PRINT_STATE, 1
SetSystemVar VAR_BATTLE_ARCADE_PRINT_STATE, 1
Return
_3212:
Call _32A0
BufferNumber 0, VAR_0x8008
FrontierScrCmd_3E VAR_BATTLE_ARCADE_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_ARCADE_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 2, _323E
Message BattleArcadeScene_Text_BeatDahliaGold
CloseMessage
@@ -3313,7 +3313,7 @@ _3212:
End
_323E:
FrontierScrCmd_3D VAR_BATTLE_ARCADE_PRINT_STATE, 3
SetSystemVar VAR_BATTLE_ARCADE_PRINT_STATE, 3
Return
_3246:

26
res/field/frontier_scripts/frontier_scripts_battle_castle.s
View File

@@ -566,11 +566,11 @@ _03BC:
EndMovement
_03C2:
FrontierScrCmd_3E VAR_BATTLE_CASTLE_CHALLENGE_TYPE, VAR_0x8001
FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003
FrontierScrCmd_3E VAR_MAP_LOCAL_2, VAR_0x8004
FrontierScrCmd_3E VAR_MAP_LOCAL_5, VAR_0x8005
FrontierScrCmd_3E VAR_MAP_LOCAL_6, VAR_0x8006
GetSystemVar VAR_BATTLE_CASTLE_CHALLENGE_TYPE, VAR_0x8001
GetSystemVar VAR_MAP_LOCAL_3, VAR_0x8003
GetSystemVar VAR_MAP_LOCAL_2, VAR_0x8004
GetSystemVar VAR_MAP_LOCAL_5, VAR_0x8005
GetSystemVar VAR_MAP_LOCAL_6, VAR_0x8006
GetPlayerObjEventGfx VAR_0x8007
SetVar FR_VAR_0x800E, 0
GoToIfEq VAR_0x8001, FRONTIER_CHALLENGE_MULTI, _041E
@@ -1425,7 +1425,7 @@ _12C5:
_12D3:
CallBattleCastleFunction BC_FUNC_UNK_22, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 1
SetSystemVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 1
BufferPlayerName 0
Message BattleCastleScene_Text_BPEarned
BufferPlayerName 0
@@ -1691,7 +1691,7 @@ _1720:
End
_173E:
FrontierScrCmd_3D VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 2
SetSystemVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 2
CallBattleCastleFunction BC_FUNC_UNK_10, 0, 0, VAR_0x8008
FreeBattleRecording
FrontierScrCmd_99
@@ -1738,7 +1738,7 @@ _17D9:
_17F1:
CallBattleCastleFunction BC_FUNC_UNK_21, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 3
GoTo _18E4
End
@@ -1779,7 +1779,7 @@ _1893:
_189B:
CallBattleCastleFunction BC_FUNC_UNK_21, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 3
GoTo _18B0
End
@@ -1928,7 +1928,7 @@ _1ADC:
_1AF8:
Call _1B75
BufferNumber 0, VAR_0x8008
FrontierScrCmd_3E VAR_BATTLE_CASTLE_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_CASTLE_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 0, _1B27
BufferPlayerName 0
Message BattleCastleScene_Text_BeatDarach
@@ -1937,13 +1937,13 @@ _1AF8:
End
_1B27:
FrontierScrCmd_3D VAR_BATTLE_CASTLE_PRINT_STATE, 1
SetSystemVar VAR_BATTLE_CASTLE_PRINT_STATE, 1
Return
_1B2F:
Call _1B75
BufferNumber 0, VAR_0x8008
FrontierScrCmd_3E VAR_BATTLE_CASTLE_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_CASTLE_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 2, _1B5B
Message BattleCastleScene_Text_BeatDarachGold
CloseMessage
@@ -1951,7 +1951,7 @@ _1B2F:
End
_1B5B:
FrontierScrCmd_3D VAR_BATTLE_CASTLE_PRINT_STATE, 3
SetSystemVar VAR_BATTLE_CASTLE_PRINT_STATE, 3
Return
_1B63:

24
res/field/frontier_scripts/frontier_scripts_battle_factory.s
View File

@@ -427,9 +427,9 @@ _02A8:
EndMovement
_02D6:
FrontierScrCmd_3E VAR_BATTLE_FACTORY_CHALLENGE_TYPE, VAR_0x8001
FrontierScrCmd_3E VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, VAR_0x8002
FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003
GetSystemVar VAR_BATTLE_FACTORY_CHALLENGE_TYPE, VAR_0x8001
GetSystemVar VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, VAR_0x8002
GetSystemVar VAR_MAP_LOCAL_3, VAR_0x8003
GetPlayerObjEventGfx VAR_0x8007
GoToIfEq VAR_0x8001, FRONTIER_CHALLENGE_MULTI, _0320
GoToIfEq VAR_0x8001, FRONTIER_CHALLENGE_MULTI_WFC, _0320
@@ -923,7 +923,7 @@ _0BCB:
_0BD9:
CallBattleFactoryFunction BF_FUNC_UNK_22, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 1
SetSystemVar VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 1
Message BattleFactoryScene_Text_BPEarned
BufferPlayerName 0
CallBattleFactoryFunction BF_FUNC_UNK_35, 0, 0, VAR_0x8008
@@ -1230,7 +1230,7 @@ _10B7:
SetVar VAR_0x8003, 1
MessageInstant BattleFactoryScene_Text_Saving
ShowSavingIcon
FrontierScrCmd_3E VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, VAR_0x8008
GetSystemVar VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, VAR_0x8008
GoToIfEq VAR_0x8008, 0, _10DE
GoTo _10F7
End
@@ -1275,7 +1275,7 @@ _113E:
End
_115C:
FrontierScrCmd_3D VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 2
SetSystemVar VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 2
CallBattleFactoryFunction BF_FUNC_UNK_10, 0, 0, VAR_0x8008
Call _137B
CloseMessage
@@ -1323,7 +1323,7 @@ _11FE:
_1216:
CallBattleFactoryFunction BF_FUNC_UNK_21, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 3
GoTo _12F3
End
@@ -1360,7 +1360,7 @@ _12A2:
_12AA:
CallBattleFactoryFunction BF_FUNC_UNK_21, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 3
GoTo _12BF
End
@@ -1544,7 +1544,7 @@ _154A:
_15AA:
Call _1612
BufferNumber 0, VAR_0x8008
FrontierScrCmd_3E VAR_BATTLE_FACTORY_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_FACTORY_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 0, _15D6
Message BattleFactoryScene_Text_BeatThorton
CloseMessage
@@ -1552,13 +1552,13 @@ _15AA:
End
_15D6:
FrontierScrCmd_3D VAR_BATTLE_FACTORY_PRINT_STATE, 1
SetSystemVar VAR_BATTLE_FACTORY_PRINT_STATE, 1
Return
_15DE:
Call _1612
BufferNumber 0, VAR_0x8008
FrontierScrCmd_3E VAR_BATTLE_FACTORY_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_FACTORY_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 2, _160A
Message BattleFactoryScene_Text_BeatThortonGold
CloseMessage
@@ -1566,7 +1566,7 @@ _15DE:
End
_160A:
FrontierScrCmd_3D VAR_BATTLE_FACTORY_PRINT_STATE, 3
SetSystemVar VAR_BATTLE_FACTORY_PRINT_STATE, 3
Return
_1612:

24
res/field/frontier_scripts/frontier_scripts_battle_hall.s
View File

@@ -464,10 +464,10 @@ _0320:
EndMovement
_0326:
FrontierScrCmd_3E VAR_BATTLE_HALL_CHALLENGE_TYPE, VAR_0x8001
FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003
FrontierScrCmd_3E VAR_MAP_LOCAL_2, VAR_0x8002
FrontierScrCmd_3E VAR_MAP_LOCAL_5, VAR_0x8000
GetSystemVar VAR_BATTLE_HALL_CHALLENGE_TYPE, VAR_0x8001
GetSystemVar VAR_MAP_LOCAL_3, VAR_0x8003
GetSystemVar VAR_MAP_LOCAL_2, VAR_0x8002
GetSystemVar VAR_MAP_LOCAL_5, VAR_0x8000
GetPlayerObjEventGfx VAR_0x800A
SetVar FR_VAR_0x800E, 0
InitNewBattleRecording
@@ -880,7 +880,7 @@ _0AC8:
_0AD6:
CallBattleHallFunction BH_FUNC_UNK_22, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 1
SetSystemVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 1
CallBattleHallFunction BH_FUNC_UNK_15, 0, 0, VAR_0x8008
BufferSpeciesName 0, VAR_0x8008
Message BattleHallScene_Text_BPEarned
@@ -1123,7 +1123,7 @@ _0E7B:
End
_0E99:
FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 2
SetSystemVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 2
CallBattleHallFunction BH_FUNC_UNK_10, 0, 0, VAR_0x8008
Call _1087
FreeBattleRecording
@@ -1167,7 +1167,7 @@ _0F30:
_0F40:
CallBattleHallFunction BH_FUNC_UNK_21, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 3
GoTo _100D
End
@@ -1202,7 +1202,7 @@ _0FC0:
_0FC8:
CallBattleHallFunction BH_FUNC_UNK_21, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 3
GoTo _0FDD
End
@@ -1414,7 +1414,7 @@ _1333:
Call _1173
WaitForParticleSystemEmitters
FreeParticleSystem 0
FrontierScrCmd_3E VAR_BATTLE_HALL_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_HALL_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 0, _1373
Message BattleHallScene_Text_BeatArgenta
CloseMessage
@@ -1422,7 +1422,7 @@ _1333:
End
_1373:
FrontierScrCmd_3D VAR_BATTLE_HALL_PRINT_STATE, 1
SetSystemVar VAR_BATTLE_HALL_PRINT_STATE, 1
Return
_137B:
@@ -1432,7 +1432,7 @@ _137B:
Call _1173
WaitForParticleSystemEmitters
FreeParticleSystem 0
FrontierScrCmd_3E VAR_BATTLE_HALL_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_HALL_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 2, _13BB
Message BattleHallScene_Text_BeatArgentaGold
CloseMessage
@@ -1440,7 +1440,7 @@ _137B:
End
_13BB:
FrontierScrCmd_3D VAR_BATTLE_HALL_PRINT_STATE, 3
SetSystemVar VAR_BATTLE_HALL_PRINT_STATE, 3
Return
_13C3:

26
res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s
View File

@@ -130,7 +130,7 @@ _00D4:
_00E2:
InitNewBattleRecording
FrontierScrCmd_3E VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, VAR_0x8001
GetSystemVar VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, VAR_0x8001
Call _0176
Call _018F
CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
@@ -174,8 +174,8 @@ _019E:
Return
_01A0:
FrontierScrCmd_3D VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, 3
FrontierScrCmd_3E VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, VAR_0x8001
SetSystemVar VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, 3
GetSystemVar VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, VAR_0x8001
CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, VAR_0x8008
GoToIfEq VAR_0x8008, 1, _03EF
Call _03CF
@@ -292,8 +292,8 @@ _0382:
Return
_0394:
FrontierScrCmd_3D VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, 3
FrontierScrCmd_3E VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, VAR_0x8001
SetSystemVar VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, 3
GetSystemVar VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, VAR_0x8001
SetVar VAR_0x8003, 1
CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, VAR_0x8008
GoToIfEq VAR_0x8008, 1, _03EF
@@ -316,7 +316,7 @@ _03DB:
_03EF:
FreeBattleRecording
WaitTime 30, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1
SetSystemVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1
CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
SetVar FR_VAR_0x8010, VAR_0x8008
GoToIfEq FR_VAR_0x8010, BATTLE_TOWER_MODE_WIFI, _043F
@@ -335,8 +335,8 @@ _043F:
FrontierScrCmd_02
_0459:
FrontierScrCmd_3D VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, 0
FrontierScrCmd_3E VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, VAR_0x8001
SetSystemVar VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, 0
GetSystemVar VAR_BATTLE_TOWER_BATTLE_ROOM_LOAD_ACTION, VAR_0x8001
Call _046D
End
@@ -484,7 +484,7 @@ _06B3:
End
_06D3:
FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2
SetSystemVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2
CallBattleTowerFunction BT_FUNC_UNK_39, 0, VAR_0x8008
FreeTowerStruct
Message BattleTowerBattleRoom_Text_Saving
@@ -579,7 +579,7 @@ _086E:
GoToIfEq VAR_0x800C, 0, _020F
CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008
GoToIfEq VAR_0x8008, 48, _08FD
FrontierScrCmd_3E VAR_BATTLE_TOWER_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_TOWER_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 0, _08D9
Message BattleTowerBattleRoom_Text_BeatPalmer
CallBattleTowerFunction BT_FUNC_SET_BEAT_PALMER, 1, VAR_0x8008
@@ -587,7 +587,7 @@ _086E:
End
_08D9:
FrontierScrCmd_3D VAR_BATTLE_TOWER_PRINT_STATE, 1
SetSystemVar VAR_BATTLE_TOWER_PRINT_STATE, 1
Return
_08E1:
@@ -602,7 +602,7 @@ _08F1:
End
_08FD:
FrontierScrCmd_3E VAR_BATTLE_TOWER_PRINT_STATE, VAR_0x8008
GetSystemVar VAR_BATTLE_TOWER_PRINT_STATE, VAR_0x8008
CallIfEq VAR_0x8008, 2, _0924
Message BattleTowerBattleRoom_Text_BeatPalmerGold
CallBattleTowerFunction BT_FUNC_SET_BEAT_PALMER, 2, VAR_0x8008
@@ -610,7 +610,7 @@ _08FD:
End
_0924:
FrontierScrCmd_3D VAR_BATTLE_TOWER_PRINT_STATE, 3
SetSystemVar VAR_BATTLE_TOWER_PRINT_STATE, 3
Return
_092C:

2
res/field/frontier_scripts/frontier_scripts_battle_tower_corridor.s
View File

@@ -132,7 +132,7 @@ _010C:
FrontierScrCmd_2A _0028
FrontierScrCmd_2C _002C
FadeScreenIn
FrontierScrCmd_3E VAR_BATTLE_TOWER_CORRIDOR_LOAD_ACTION, VAR_0x8001
GetSystemVar VAR_BATTLE_TOWER_CORRIDOR_LOAD_ACTION, VAR_0x8001
GoToIfEq VAR_0x8001, 1, _0161
End

2
res/field/frontier_scripts/frontier_scripts_battle_tower_corridor_multi.s
View File

@@ -188,7 +188,7 @@ _0138:
EndMovement
_0142:
FrontierScrCmd_3E VAR_BATTLE_TOWER_CORRIDOR_MULTI_LOAD_ACTION, VAR_0x8001
GetSystemVar VAR_BATTLE_TOWER_CORRIDOR_MULTI_LOAD_ACTION, VAR_0x8001
Call _0278
Call _0344
SetVar FR_VAR_0x800F, 232

18
res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s
View File

@@ -250,13 +250,13 @@ _01CE:
_01F8:
FadeScreenIn
FrontierScrCmd_3E VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, VAR_0x8008
GetSystemVar VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, VAR_0x8008
GoToIfEq VAR_0x8008, 1, _0226
GoToIfEq VAR_0x8008, 2, _04FB
End
_0226:
FrontierScrCmd_3D VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, 3
Call _025C
CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_LINK_MULTI, _0270
@@ -347,7 +347,7 @@ _03DD:
GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_LINK_MULTI, _0437
GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_6, _0443
WaitTime 30, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1
SetSystemVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1
FadeScreenOut
FrontierScrCmd_25 0
FrontierScrCmd_25 1
@@ -365,7 +365,7 @@ _0437:
_0443:
WaitTime 30, VAR_0x8008
FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1
SetSystemVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1
ClearReceivedTempDataAllPlayers
SyncConnectedPlayers 6
CallIfEq VAR_0x8004, 100, _04D1
@@ -411,7 +411,7 @@ _04F7:
Return
_04FB:
FrontierScrCmd_3D VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, 3
SetSystemVar VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, 3
SetVar VAR_0x8006, 1
Call _025C
Call _051B
@@ -535,7 +535,7 @@ _06E7:
End
_0707:
FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2
SetSystemVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2
CallBattleTowerFunction BT_FUNC_UNK_39, 0, VAR_0x8008
FreeTowerStruct
Message BattleTowerMultiBattleRoom_Text_ThanksForParticipating
@@ -813,7 +813,7 @@ _0B91:
End
_0BCF:
FrontierScrCmd_3E VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, VAR_0x8008
GetSystemVar VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, VAR_0x8008
GoToIfEq VAR_0x8008, 0, _0C01
GoToIfEq VAR_0x8000, 1, _0C03
CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, BT_PARAM_PLAYER_GRAPHICS_ID, VAR_0x8009
@@ -829,13 +829,13 @@ _0C03:
Return
_0C15:
FrontierScrCmd_3E VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, VAR_0x8008
GetSystemVar VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, VAR_0x8008
CallIfNe VAR_0x8008, 0, _0C4B
GoTo _0C30
End
_0C30:
FrontierScrCmd_3E VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, VAR_0x8008
GetSystemVar VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, VAR_0x8008
GoToIfEq VAR_0x8008, 3, _0C4D
GoTo _0C55
End

30
res/field/frontier_scripts/frontier_scripts_unknown_10.s
View File

@@ -86,13 +86,13 @@ _010E:
FrontierScrCmd_B2 7, 1, 0, VAR_0x8008
SetVar VAR_0x8004, 0
SetVar VAR_0x8009, 1
FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0
SetSystemVar VAR_MAP_LOCAL_3, 0
GoTo _0254
End
_012F:
FrontierScrCmd_3D VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC
FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0
SetSystemVar VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC
SetSystemVar VAR_MAP_LOCAL_3, 0
GoTo _0143
End
@@ -113,7 +113,7 @@ _0188:
FrontierScrCmd_B2 7, 2, 0, VAR_0x8008
SetVar VAR_0x8004, 0
SetVar VAR_0x8009, 2
FrontierScrCmd_3D VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 0
SetSystemVar VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 0
GoTo _0254
End
@@ -121,7 +121,7 @@ _01A9:
FrontierScrCmd_B2 7, 3, 0, VAR_0x8008
SetVar VAR_0x8004, 0
SetVar VAR_0x8009, 3
FrontierScrCmd_3D VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 1
SetSystemVar VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 1
GoTo _0254
End
@@ -129,8 +129,8 @@ _01CA:
FrontierScrCmd_B2 7, 4, 0, VAR_0x8008
SetVar VAR_0x8004, 0
SetVar VAR_0x8009, 4
FrontierScrCmd_3D VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC
FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0
SetSystemVar VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC
SetSystemVar VAR_MAP_LOCAL_3, 0
GoTo _0254
End
@@ -138,8 +138,8 @@ _01F1:
FrontierScrCmd_B2 7, 5, 0, VAR_0x8008
SetVar VAR_0x8004, 0
SetVar VAR_0x8009, 5
FrontierScrCmd_3D VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC
FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0
SetSystemVar VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC
SetSystemVar VAR_MAP_LOCAL_3, 0
GoTo _0254
End
@@ -147,8 +147,8 @@ _0218:
FrontierScrCmd_B2 7, 6, 0, VAR_0x8008
SetVar VAR_0x8004, 0
SetVar VAR_0x8009, 6
FrontierScrCmd_3D VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC
FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0
SetSystemVar VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC
SetSystemVar VAR_MAP_LOCAL_3, 0
GoTo _0254
End
@@ -223,8 +223,8 @@ _037E:
FrontierScrCmd_AF VAR_0x8009, 1, VAR_0x8008
GoToIfEq VAR_0x8008, 2, _0366
FrontierScrCmd_B0 VAR_0x8002, VAR_0x8005
FrontierScrCmd_3D VAR_MAP_LOCAL_2, VAR_0x8002
FrontierScrCmd_3D VAR_MAP_LOCAL_5, VAR_0x8005
SetSystemVar VAR_MAP_LOCAL_2, VAR_0x8002
SetSystemVar VAR_MAP_LOCAL_5, VAR_0x8005
FadeScreenIn
GoTo _03C1
End
@@ -414,7 +414,7 @@ _0758:
_0766:
FrontierScrCmd_B2 12, 0, 0, VAR_0x8008
FrontierScrCmd_3D VAR_WIFI_FRONTIER_CLEARED, VAR_0x8008
SetSystemVar VAR_WIFI_FRONTIER_CLEARED, VAR_0x8008
ClearReceivedTempDataAllPlayers
SyncConnectedPlayers 175
ClearReceivedTempDataAllPlayers
@@ -458,7 +458,7 @@ _0838:
_0842:
FrontierScrCmd_B3
FrontierScrCmd_3D VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, 1
SetSystemVar VAR_BATTLE_TOWER_MULTI_BATTLE_ROOM_LOAD_ACTION, 1
Call _08D3
GoTo _0858
End

12
src/overlay104/frscrcmd.c
View File

@@ -217,8 +217,8 @@ static BOOL CheckABPress(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_WaitABPressTime(FrontierScriptContext *ctx);
static BOOL DecrementABPressTimer(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_Dummy3C(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_3D(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_3E(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_SetSystemVar(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_GetSystemVar(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_2A(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_2B(FrontierScriptContext *ctx);
static BOOL FrontierScrCmd_2C(FrontierScriptContext *ctx);
@@ -1686,7 +1686,7 @@ static BOOL FrontierScrCmd_Dummy3C(FrontierScriptContext *ctx)
return TRUE;
}
BOOL FrontierScrCmd_3D(FrontierScriptContext *ctx)
BOOL FrontierScrCmd_SetSystemVar(FrontierScriptContext *ctx)
{
u16 destVarID = FrontierScriptContext_ReadHalfWord(ctx);
u16 value = FrontierScriptContext_GetVar(ctx);
@@ -1698,14 +1698,14 @@ BOOL FrontierScrCmd_3D(FrontierScriptContext *ctx)
return FALSE;
}
BOOL FrontierScrCmd_3E(FrontierScriptContext *ctx)
BOOL FrontierScrCmd_GetSystemVar(FrontierScriptContext *ctx)
{
u16 srcVarID = FrontierScriptContext_ReadHalfWord(ctx);
u16 *destVar = FrontierScriptContext_TryGetVarPointer(ctx);
u16 *dest = FrontierScriptContext_TryGetVarPointer(ctx);
UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(ctx->scriptMan->unk_00);
u16 *srcVar = VarsFlags_GetVarAddress(SaveData_GetVarsFlags(v3->saveData), srcVarID);
*destVar = *srcVar;
*dest = *srcVar;
return FALSE;
}