ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use macros for FRONTIER_DATA_6, fix offset comment

Browse Source
This commit is contained in:
GriffinR 2019-11-25 16:43:43 -05:00 committed by huderlem
parent cc81b5032b
commit 0db46e84bc
11 changed files with 15 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
View File

@ -45,10 +45,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
setvar VAR_TEMP_2, 1
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 1
goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
@ -394,10 +391,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C
FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
closemessage
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 0
special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_ARENA
setvar VAR_0x8005, 0

5
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@ -489,10 +489,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7
BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 0
special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_DOME
setvar VAR_0x8005, 0

5
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
View File

@ -19,10 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 1
setvar VAR_TEMP_0, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
waitmovement 0

10
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View File

@ -83,10 +83,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
closemessage
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 0
special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0
@ -191,10 +188,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
closemessage
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 0
special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0

5
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
View File

@ -235,10 +235,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
setvar VAR_0x8004, 10
setvar VAR_0x8005, 0
special CallBattleFactoryFunction
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 1
special CalculatePlayerPartyCount
goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13

10
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
View File

@ -40,10 +40,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
waitmovement 0
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
setvar VAR_TEMP_2, 1
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 1
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
@ -299,10 +296,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7
VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
closemessage
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 0
special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_PALACE
setvar VAR_0x8005, 0

10
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
View File

@ -28,10 +28,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
waitmovement 0
setvar VAR_TEMP_2, 1
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 1
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
@ -323,10 +320,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E
BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
closemessage
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 0
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 0
special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_TOWER
setvar VAR_0x8005, 0

5
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
View File

@ -54,10 +54,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
waitmovement 0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 1
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4

4
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@ -181,9 +181,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0
BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0
BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0
BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
special CallFrontierUtilFunc
frontier_get FRONTIER_DATA_6
return
BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE

5
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
View File

@ -94,10 +94,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
setvar VAR_0x8005, FRONTIER_DATA_6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
frontier_set FRONTIER_DATA_6, 1
goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03
end

2
include/global.h
View File

@ -336,7 +336,7 @@ struct BattleFrontier
/*0xCA9*/ u8 unused_CA9_d:1;
/*0xCA9*/ u8 unused_CA9_e:1;
/*0xCA9*/ u8 unused_CA9_f:1;
/*0xCB0*/ u16 selectedPartyMons[MAX_FRONTIER_PARTY_SIZE];
/*0xCAA*/ u16 selectedPartyMons[MAX_FRONTIER_PARTY_SIZE];
/*0xCB2*/ u16 curChallengeBattleNum; // Battle number / room number (Pike) / floor number (Pyramid)
/*0xCB4*/ u16 trainerIds[20];
/*0xCDC*/ u32 winStreakActiveFlags;