diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-25 19:59:47 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-25 19:59:47 +0200 |
| commit | edcf04b665a9fa13d086dd486c4fe7b1649a7bbf (patch) | |
| tree | 6db4c00f307e8b083535c4f6ad3bdb4406576165 | |
| parent | 62a645abafdd17b737562b4ab6b40739d13722c2 (diff) | |
Document battle dome.
37 files changed, 548 insertions, 545 deletions
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index a376bfe22..9ef9a2812 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -133,7 +133,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 3 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index e853afda0..3d5704dba 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 setvar VAR_0x8004, 10 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 @@ -72,7 +72,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 4 - special sub_818E9AC + special CallBattleDomeFunction msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4 closemessage applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B @@ -84,7 +84,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 msgbox 0x2021fc4, 4 closemessage setvar VAR_0x8004, 5 - special sub_818E9AC + special CallBattleDomeFunction call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440 setvar VAR_TEMP_2, 0 switch VAR_RESULT @@ -109,7 +109,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 compare VAR_TEMP_2, 2 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F setvar VAR_0x8004, 19 - special sub_818E9AC + special CallBattleDomeFunction switch VAR_RESULT case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 @@ -117,7 +117,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 setvar VAR_0x8004, 4 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_TEMP_2, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 compare VAR_TEMP_2, 1 @@ -131,7 +131,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D setvar VAR_0x8004, 12 setvar VAR_0x8005, 2 - special sub_818E9AC + special CallBattleDomeFunction BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A setvar VAR_0x8004, 2 @@ -173,10 +173,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E delay 60 setvar VAR_0x8004, 3 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 @@ -227,17 +227,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9 @@ -446,7 +446,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 12 special sub_81A1780 compare VAR_RESULT, 0 @@ -485,7 +485,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 12 special sub_81A1780 compare VAR_RESULT, 2 @@ -536,10 +536,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 waitstate setvar VAR_TEMP_9, 0 setvar VAR_0x8004, 17 - special sub_818E9AC + special CallBattleDomeFunction special HealPlayerParty setvar VAR_0x8004, 16 - special sub_818E9AC + special CallBattleDomeFunction return BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 @@ -950,7 +950,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 - copyvar VAR_RESULT, VAR_0x40CE + copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 1e50357bc..6a879df16 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 setvar VAR_0x8004, 21 - special sub_818E9AC + special CallBattleDomeFunction end BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB @@ -39,15 +39,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 @@ -85,15 +85,15 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction special LoadPlayerParty special HealPlayerParty goto BattleFrontier_BattleDomeLobby_EventScript_249991 @@ -112,18 +112,18 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction special LoadPlayerParty special HealPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 setvar VAR_0x8004, 13 setvar VAR_0x8005, 0 - special sub_818E9AC + special CallBattleDomeFunction playse SE_SAVE waitse call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 @@ -154,7 +154,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 waitmessage setvar VAR_0x8004, 13 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction playse SE_SAVE waitse setvar VAR_0x8004, 2 @@ -168,7 +168,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35 lock faceplayer setvar VAR_FRONTIER_FACILITY, 1 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 goto BattleFrontier_BattleDomeLobby_EventScript_249A59 end @@ -176,21 +176,21 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 lock faceplayer setvar VAR_FRONTIER_FACILITY, 1 - setvar VAR_0x40CE, 1 + setvar VAR_FRONTIER_BATTLE_MODE, 1 goto BattleFrontier_BattleDomeLobby_EventScript_249A59 end BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 special SavePlayerParty - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 waitmessage multichoice 17, 6, 23, 0 @@ -236,7 +236,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 setvar VAR_0x8005, 4 special sub_81A1780 setvar VAR_0x8004, 0 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 @@ -253,7 +253,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A setvar VAR_0x8004, 22 - special sub_818E9AC + special CallBattleDomeFunction BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 special SavePlayerParty @@ -261,7 +261,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 setvar VAR_0x8005, 3 special sub_81A1780 setvar VAR_0x8004, 15 - special sub_818E9AC + special CallBattleDomeFunction msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E @@ -272,9 +272,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 end BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 goto BattleFrontier_BattleDomeLobby_EventScript_249A72 @@ -309,26 +309,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C end BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 waitdooranim - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F waitdooranim return @@ -433,7 +433,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 setvar VAR_0x8004, 1 setvar VAR_0x8005, 9 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 compare VAR_RESULT, 1 @@ -444,7 +444,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 fadescreen 1 setvar VAR_0x8004, 8 - special sub_818E9AC + special CallBattleDomeFunction waitstate end @@ -466,7 +466,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4 BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED setvar VAR_0x8004, 20 - special sub_818E9AC + special CallBattleDomeFunction msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2 end diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 024162cee..e004eafac 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -87,7 +87,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9 setvar VAR_0x8004, 12 setvar VAR_0x8005, 9 - special sub_818E9AC + special CallBattleDomeFunction goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB @@ -95,7 +95,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB waitmessage setvar VAR_0x8004, 13 setvar VAR_0x8005, 2 - special sub_818E9AC + special CallBattleDomeFunction playse SE_SAVE waitse fadescreen 1 @@ -107,7 +107,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4 fadescreen 1 setvar VAR_0x8004, 6 - special sub_818E9AC + special CallBattleDomeFunction waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F @@ -115,7 +115,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A fadescreen 1 setvar VAR_0x8004, 7 - special sub_818E9AC + special CallBattleDomeFunction waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F @@ -162,11 +162,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 setvar VAR_0x8005, 8 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 18 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 9 - special sub_818E9AC + special CallBattleDomeFunction msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4 closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F @@ -253,7 +253,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 fadescreen 1 setvar VAR_0x8004, 11 - special sub_818E9AC + special CallBattleDomeFunction waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 5b6a674fb..2968e2c0f 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -291,7 +291,7 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 - copyvar VAR_RESULT, VAR_0x40CE + copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index ec2483390..7846da874 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -143,27 +143,27 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB lock faceplayer setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED end BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 1 + setvar VAR_FRONTIER_BATTLE_MODE, 1 goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED end BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED special SavePlayerParty - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 waitmessage multichoice 17, 6, 23, 0 @@ -218,9 +218,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A special SavePlayerParty msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 closemessage - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC @@ -239,9 +239,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762 return BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 goto BattleFrontier_BattleFactoryLobby_EventScript_258606 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 2ae154927..372b5da76 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -459,7 +459,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 step_end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB - copyvar VAR_RESULT, VAR_0x40CE + copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 91c1abd0f..b86ffa2fb 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -134,7 +134,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944 lock faceplayer setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 goto BattleFrontier_BattlePalaceLobby_EventScript_24D968 end @@ -142,7 +142,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956 lock faceplayer setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 1 + setvar VAR_FRONTIER_BATTLE_MODE, 1 goto BattleFrontier_BattlePalaceLobby_EventScript_24D968 end @@ -153,15 +153,15 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 special SavePlayerParty - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 waitmessage multichoice 17, 6, 23, 0 @@ -242,7 +242,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 end BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 @@ -298,24 +298,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6 return BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 waitdooranim return diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 5323c4a6b..0b356792f 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -126,7 +126,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 lock faceplayer setvar VAR_FRONTIER_FACILITY, 5 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 07b9fee47..ccc7b1032 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -130,7 +130,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 lock faceplayer setvar VAR_FRONTIER_FACILITY, 6 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index f684e215d..d687f83dd 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -366,7 +366,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E setvar VAR_0x8005, 0 special sub_8163AC4 waitstate - copyvar VAR_0x8004, VAR_0x40CE + copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE compare VAR_0x8004, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A setvar VAR_0x8004, 18 @@ -484,7 +484,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 - copyvar VAR_RESULT, VAR_0x40CE + copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 compare VAR_RESULT, 2 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index d1b07451c..556d4499a 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -5,9 +5,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 .byte 0 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F end @@ -70,7 +70,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E waitmovement 0 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 @@ -142,7 +142,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 @@ -157,7 +157,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 special sub_81A1780 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 playfanfare MUS_ME_ASA waitfanfare @@ -168,7 +168,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 setvar VAR_0x8005, 2 special sub_81A1780 call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 compare VAR_RESULT, 1 @@ -256,7 +256,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB end BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E copyvar VAR_TEMP_F, VAR_RESULT switch VAR_TEMP_F diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 36cf93ada..d28fa105d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -5,9 +5,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A .byte 0 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 end @@ -87,13 +87,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC end BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 return diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 072d27137..968d45772 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -24,13 +24,13 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 end BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 return diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 1cd2ff74a..2b07b7ea4 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -119,7 +119,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 end BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E checkflag FLAG_0x152 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E @@ -214,7 +214,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE lock faceplayer - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 message BattleFrontier_BattleTowerLobby_Text_23F737 waitmessage @@ -254,7 +254,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage multichoice 17, 6, 24, 0 @@ -334,7 +334,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED - setvar VAR_0x40CE, 1 + setvar VAR_FRONTIER_BATTLE_MODE, 1 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage multichoice 17, 6, 24, 0 @@ -415,7 +415,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 - setvar VAR_0x40CE, 2 + setvar VAR_FRONTIER_BATTLE_MODE, 2 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage multichoice 17, 6, 24, 0 @@ -495,7 +495,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 - setvar VAR_0x40CE, 3 + setvar VAR_FRONTIER_BATTLE_MODE, 3 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage multichoice 17, 6, 24, 0 @@ -679,7 +679,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B case 1, BattleFrontier_BattleTowerLobby_EventScript_23F08B BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046 - switch VAR_0x40CE + switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4 @@ -697,7 +697,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D end BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B - switch VAR_0x40CE + switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4 case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2 msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4 @@ -754,7 +754,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 goto BattleFrontier_BattleTowerLobby_EventScript_23F15B @@ -807,13 +807,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 step_end BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 return @@ -834,13 +834,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 return BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 return @@ -861,13 +861,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 return BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C return @@ -888,13 +888,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C return BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 return diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 5be72b9b5..da73da354 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -110,7 +110,7 @@ BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811 end BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 @@ -153,7 +153,7 @@ BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA end BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 00efa5394..daf76cba2 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -149,7 +149,7 @@ FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_FRONTIER_FACILITY, 3 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 special sub_81A1780 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index fc66d7387..76b12e31e 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -137,7 +137,7 @@ SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 26f0680a0..a4cfc20c2 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -150,7 +150,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 special sub_81A1780 diff --git a/data/specials.inc b/data/specials.inc index 9cc3d41ea..5d31c425f 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -244,7 +244,7 @@ gSpecials:: @ 81DBA64 def_special GetLeadMonFriendshipScore def_special sub_81A1780 def_special sub_8161F74 - def_special sub_818E9AC + def_special CallBattleDomeFunction def_special sub_8195960 def_special sub_8165360 def_special sub_8163AC4 diff --git a/include/battle_dome.h b/include/battle_dome.h new file mode 100644 index 000000000..d05b08689 --- /dev/null +++ b/include/battle_dome.h @@ -0,0 +1,9 @@ +#ifndef GUARD_BATTLE_DOME_H +#define GUARD_BATTLE_DOME_H + +extern u32 gUnknown_0203CD70; + +s32 GetTrainerMonCountInBits(u16 tournamentTrainerId); +s32 TrainerIdToDomeTournamentId(u16 trainerId); + +#endif // GUARD_BATTLE_DOME_H diff --git a/include/battle_frontier_1.h b/include/battle_frontier_1.h deleted file mode 100644 index b9c633efc..000000000 --- a/include/battle_frontier_1.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef GUARD_BATTLE_FRONTIER_1_H -#define GUARD_BATTLE_FRONTIER_1_H - -bool32 sub_8196094(void); -void sub_8197080(u8 *); -void sub_8196080(const u8 *str); - -#endif // GUARD_BATTLE_FRONTIER_1_H diff --git a/include/bg.h b/include/bg.h index ea84c1573..f2d4e7948 100644 --- a/include/bg.h +++ b/include/bg.h @@ -69,7 +69,7 @@ void* GetBgTilemapBuffer(u8 bg); void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyBgTilemapBufferToVram(u8 bg); void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height); -void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); +void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index 4145805c4..fddcdc8fe 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -10,4 +10,14 @@ #define FRONTIER_FACILITY_PIKE 5 #define FRONTIER_FACILITY_PYRAMID 6 +// Battle Frontier lvl modes. +#define FRONTIER_LVL_50 0 +#define FRONTIER_LVL_OPEN 1 + +// Battle Frontier battle modes. +#define FRONTIER_MODE_SINGLES 0 +#define FRONTIER_MODE_DOUBLES 1 +#define FRONTIER_MODE_MULTIS 2 +#define FRONTIER_MODE_LINK_MULTIS 3 + #endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H diff --git a/include/constants/vars.h b/include/constants/vars.h index e2c59b4fb..9854ec5a2 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -222,7 +222,7 @@ #define VAR_0x40CB 0x40CB #define VAR_0x40CC 0x40CC #define VAR_0x40CD 0x40CD -#define VAR_0x40CE 0x40CE +#define VAR_FRONTIER_BATTLE_MODE 0x40CE #define VAR_FRONTIER_FACILITY 0x40CF #define VAR_0x40D0 0x40D0 #define VAR_0x40D1 0x40D1 diff --git a/include/global.h b/include/global.h index d3abb8269..bb843bddd 100644 --- a/include/global.h +++ b/include/global.h @@ -362,7 +362,7 @@ struct BattleFrontier /*0xC14*/ u16 ecwords_C14[6]; /*0xC20*/ u8 filler_C20[0x88]; /*0xCA8*/ u8 field_CA8; - /*0xCA9*/ u8 chosenLvl:2; // 0x1, 0x2 -> 0x3 + /*0xCA9*/ u8 lvlMode:2; // 0x1, 0x2 -> 0x3 /*0xCA9*/ u8 field_CA9_a:1; // 0x4 /*0xCA9*/ u8 field_CA9_b:1; // 0x8 /*0xCA9*/ u8 field_CA9_c:1; // 0x10 diff --git a/ld_script.txt b/ld_script.txt index 0eee2e8ce..2c4dc6609 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -242,7 +242,7 @@ SECTIONS { src/battle_controller_recorded_player.o(.text); src/trainer_pokemon_sprites.o(.text); src/lilycove_lady.o(.text); - src/battle_frontier_1.o(.text); + src/battle_dome.o(.text); asm/battle_frontier_1.o(.text); src/menu.o(.text); asm/battle_frontier_2.o(.text); @@ -522,7 +522,7 @@ SECTIONS { src/battle_controller_recorded_player.o(.rodata); src/trainer_pokemon_sprites.o(.rodata); src/lilycove_lady.o(.rodata); - src/battle_frontier_1.o(.rodata); + src/battle_dome.o(.rodata); data/battle_frontier_1.o(.rodata); src/menu.o(.rodata); data/battle_frontier_2.o(.rodata); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 6ab19e368..ffe8936a0 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -31,13 +31,13 @@ #include "item_use.h" #include "recorded_battle.h" #include "party_menu.h" +#include "battle_dome.h" extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; extern u8 gUnknown_0203CF00[]; extern u16 gBattle_BG0_X; extern u16 gBattle_BG0_Y; -extern s32 gUnknown_0203CD70; extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct SpriteTemplate gMultiuseSpriteTemplate; diff --git a/src/battle_frontier_1.c b/src/battle_dome.c index 1ac84962f..058d253ab 100644 --- a/src/battle_frontier_1.c +++ b/src/battle_dome.c @@ -1,7 +1,7 @@ #include "global.h" +#include "battle_dome.h" #include "battle.h" #include "battle_setup.h" -#include "battle_frontier_1.h" #include "battle_tower.h" #include "battle_message.h" #include "event_data.h" @@ -30,6 +30,7 @@ #include "constants/trainers.h" #include "constants/abilities.h" #include "constants/songs.h" +#include "constants/battle_frontier.h" #define DOME_ROUND1 0 #define DOME_ROUND2 1 @@ -47,19 +48,25 @@ struct FacilityMon u8 nature; }; -struct Unknown_0203CD78_Struct +struct BattleDomeStruct { - u8 arr[16]; + u8 arr[DOME_TOURNAMENT_TRAINERS_COUNT]; u8 unk_10; u8 unk_11[3]; }; +struct UnkStruct_860DD10 +{ + u8 x; + u8 y; + u16 src; +}; + extern void sub_81B8558(void); extern u32 sub_81A39C4(void); extern u16 sub_8162548(u8, u8); extern u16 RandomizeFacilityTrainerMonId(u16); extern u8 GetFrontierEnemyMonLevel(void); -extern void CopyDomeTrainerName(u8 *dst, u16 trainerId); extern u16 sub_81A5060(u8 monId, u8 moveSlotId); extern u8 sub_81A50F0(u8, u8); extern u8 sub_81A50B0(u8); @@ -72,8 +79,6 @@ extern u8 GetFrontierOpponentClass(u16); extern void sub_80F94E8(void); extern u8 gUnknown_0203CEF8[]; -extern u32 gUnknown_0203CD70; -extern u32 gUnknown_0203CD74; extern u16 gBattle_BG0_X; extern u16 gBattle_BG0_Y; extern u16 gBattle_BG1_X; @@ -83,8 +88,6 @@ extern u16 gBattle_BG2_Y; extern u16 gBattle_BG3_X; extern u16 gBattle_BG3_Y; extern const struct FacilityMon *gFacilityTrainerMons; -extern struct Unknown_0203CD78_Struct *gUnknown_0203CD78; -extern u8 *gUnknown_0203CD7C; extern void (* const gUnknown_0860D090[])(void); extern const u32 gUnknown_0860D0EC[][2]; @@ -124,6 +127,15 @@ extern const u8 *const gBattleDomeWinStringsPointers[]; extern const u8 *const gBattleDomeMatchNumberPointers[]; extern const struct FacilityMon gBattleFrontierMons[]; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; +extern const struct BgTemplate gUnknown_0860CE74[4]; +extern const struct WindowTemplate gUnknown_0860CE94[]; +extern const u8 gUnknown_0860D411[][2]; +extern const struct SpriteTemplate gUnknown_0860CFA8; +extern const struct SpriteTemplate gUnknown_0860D008; +extern const struct SpriteTemplate gUnknown_0860CFD8; +extern const struct ScanlineEffectParams gUnknown_0860CF44; +extern const struct UnkStruct_860DD10 *gUnknown_0860DD10[][4]; +extern const u8 gUnknown_0860DE10[][4]; // gfx extern const u8 gUnknown_08D83D50[]; @@ -142,42 +154,47 @@ extern const u8 gUnknown_08D83C3C[]; extern const u8 gTrainerClassNames[][0xD]; // This file's functions. -u8 GetDomeTrainerMonIvs(u16 trainerId); -void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray); -void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats); -void CreateDomeTrainerMons(u16 tournamentTrainerId); +static u8 GetDomeTrainerMonIvs(u16 trainerId); +static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray); +static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats); +static void CreateDomeTrainerMons(u16 tournamentTrainerId); +static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1); +static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1); +static s32 sub_818FFC0(s32 move, s32 species, s32 arg2); +static s32 sub_818FEB4(s32 *arr, bool8 arg1); +static void sub_8190400(u8 taskId); +static void sub_8190CD4(u8 taskId); +static u8 sub_819221C(u8 taskId); +void sub_8194D48(void); static s32 TrainerIdToTournamentId(u16 trainerId); -s32 GetTrainerMonCountInBits(u16 tournamentTrainerId); -s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1); -s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1); -s32 sub_818FFC0(s32 move, s32 species, s32 arg2); -s32 sub_818FEB4(s32 *arr, bool8 arg1); -u16 TrainerIdOfPlayerOpponent(void); -void sub_8190400(u8 taskId); -void sub_8190CD4(u8 taskId); -void sub_8194220(u8 taskId); -void sub_8194950(u8 taskId); +static u16 TrainerIdOfPlayerOpponent(void); +static void sub_8194220(u8 taskId); +static void sub_8194950(u8 taskId); static void CB2_BattleDome(void); static void VblankCb0_BattleDome(void); static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo); static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId); -u8 sub_819221C(u8 taskId); -s32 sub_8192F08(u8, u8*); -u8 GetDomeBrainTrainerPicId(void); -u8 GetDomeBrainTrainerClass(void); -void CopyDomeBrainTrainerName(u8 *dst); -void CopyDomeTrainerName(u8 *dst, u16 trainerId); -void sub_8194D48(void); -void sub_8194BEC(void); +static s32 sub_8192F08(u8, u8*); +static u8 GetDomeBrainTrainerPicId(void); +static u8 GetDomeBrainTrainerClass(void); +static void CopyDomeBrainTrainerName(u8 *dst); +static void CopyDomeTrainerName(u8 *dst, u16 trainerId); +static void HblankCb_BattleDome(void); static void VblankCb1_BattleDome(void); -u8 sub_8193BDC(u8 taskId); -void DecideRoundWinners(u8 roundId); -u8 sub_81953E8(u8 tournamentId, u8); -void sub_81948EC(u8, u8); - -// const rom data +static u8 sub_8193BDC(u8 taskId); +static void DecideRoundWinners(u8 roundId); +static u8 sub_81953E8(u8 tournamentId, u8); +static void sub_81948EC(u8, u8); + +// EWRAM variables. +EWRAM_DATA u32 gUnknown_0203CD70 = 0; +static EWRAM_DATA u32 gUnknown_0203CD74 = 0; +static EWRAM_DATA struct BattleDomeStruct *sBattleDomeStruct = {0}; +static EWRAM_DATA u8 *sTilemapBuffer = NULL; + +// Const rom data. ALIGNED(4) -static const u8 sMovePoints[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = +static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = { [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, @@ -537,15 +554,15 @@ static const u8 sMovePoints[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = }; // code -void sub_818E9AC(void) +void CallBattleDomeFunction(void) { gUnknown_0860D090[gSpecialVar_0x8004](); } void sub_818E9CC(void) { - u32 lvlMode = gSaveBlock2Ptr->frontier.chosenLvl; - u32 battleMode = VarGet(VAR_0x40CE); + u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; + u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); gSaveBlock2Ptr->frontier.field_CA8 = 0; gSaveBlock2Ptr->frontier.field_CB2 = 0; @@ -560,8 +577,8 @@ void sub_818E9CC(void) void sub_818EA84(void) { - u32 lvlMode = gSaveBlock2Ptr->frontier.chosenLvl; - u32 battleMode = VarGet(VAR_0x40CE); + u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; + u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); switch (gSpecialVar_0x8005) { @@ -584,7 +601,7 @@ void sub_818EA84(void) gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_3; break; case 6: - if (VarGet(VAR_0x40CE) == 1) + if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES) { if (lvlMode) gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_5; @@ -600,7 +617,7 @@ void sub_818EA84(void) } break; case 7: - if (VarGet(VAR_0x40CE) == 1) + if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES) { if (lvlMode) gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_7; @@ -628,8 +645,8 @@ void sub_818EA84(void) void sub_818ED28(void) { - u32 lvlMode = gSaveBlock2Ptr->frontier.chosenLvl; - u32 battleMode = VarGet(VAR_0x40CE); + u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; + u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); switch (gSpecialVar_0x8005) { @@ -655,7 +672,7 @@ void sub_818ED28(void) gSaveBlock2Ptr->frontier.field_D08_3 = gSpecialVar_0x8006; break; case 6: - if (VarGet(VAR_0x40CE) == 1) + if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES) { if (lvlMode) gSaveBlock2Ptr->frontier.field_D08_5 = gSpecialVar_0x8006; @@ -671,7 +688,7 @@ void sub_818ED28(void) } break; case 7: - if (VarGet(VAR_0x40CE) == 1) + if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES) { if (lvlMode) gSaveBlock2Ptr->frontier.field_D08_7 = gSpecialVar_0x8006; @@ -710,8 +727,8 @@ void InitDomeTrainers(void) statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT); statValues = AllocZeroed(sizeof(s32) * 6); - gSaveBlock2Ptr->frontier.field_D0A = gSaveBlock2Ptr->frontier.chosenLvl + 1; - gSaveBlock2Ptr->frontier.field_D0B = VarGet(VAR_0x40CE) + 1; + gSaveBlock2Ptr->frontier.field_D0A = gSaveBlock2Ptr->frontier.lvlMode + 1; + gSaveBlock2Ptr->frontier.field_D0B = VarGet(VAR_FRONTIER_BATTLE_MODE) + 1; gSaveBlock2Ptr->frontier.domeTrainers[0].trainerId = TRAINER_PLAYER; gSaveBlock2Ptr->frontier.domeTrainers[0].isEliminated = 0; gSaveBlock2Ptr->frontier.domeTrainers[0].eliminatedAt = 0; @@ -895,7 +912,7 @@ void InitDomeTrainers(void) stats[statIndex] = (u8) ModifyStatByNature(nature, stats[statIndex], statIndex); \ } -void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats) +static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats) { s32 i, count; u8 bits; @@ -941,7 +958,7 @@ void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 y = temp; \ } -void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray) +static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray) { s32 i; u16 temp; @@ -973,7 +990,7 @@ void sub_818FA20(void) CreateDomeTrainerMons(TrainerIdToTournamentId(gTrainerBattleOpponent_A)); } -void CreateDomeMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentMonId, u32 otId) +static void CreateDomeMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentMonId, u32 otId) { s32 i; u8 happiness = 0xFF; @@ -1000,7 +1017,7 @@ void CreateDomeMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentMonId, u &gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][tournamentMonId]].itemTableId]); } -void CreateDomeTrainerMons(u16 tournamentTrainerId) +static void CreateDomeTrainerMons(u16 tournamentTrainerId) { u8 monsCount = 0; u32 otId = 0; @@ -1054,7 +1071,7 @@ s32 GetTrainerMonCountInBits(u16 tournamentTrainerId) return bits; } -s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) +static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) { s32 i, moveId, playerMonId; s32 array[3]; @@ -1082,7 +1099,7 @@ s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) return sub_818FEB4(array, arg1); } -s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) +static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) { s32 i, moveId, playerMonId; s32 array[3]; @@ -1110,7 +1127,7 @@ s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) return sub_818FEB4(array, arg1); } -s32 sub_818FEB4(s32 *arr, bool8 arg1) +static s32 sub_818FEB4(s32 *arr, bool8 arg1) { s32 i, j; s32 bits = 0; @@ -1178,7 +1195,7 @@ s32 sub_818FEB4(s32 *arr, bool8 arg1) // Functionally equivalent, while loop is impossible to match. #ifdef NONMATCHING -s32 sub_818FFC0(s32 move, s32 species, s32 arg2) +static s32 sub_818FFC0(s32 move, s32 species, s32 arg2) { s32 type1, type2, ability, moveType; s32 i = 0; @@ -1297,7 +1314,7 @@ s32 sub_818FFC0(s32 move, s32 species, s32 arg2) } #else NAKED -s32 sub_818FFC0(s32 move, s32 species, s32 arg2) +static s32 sub_818FFC0(s32 move, s32 species, s32 arg2) { asm_unified("\n\ push {r4-r7,lr}\n\ @@ -1537,7 +1554,7 @@ _08190156:\n\ } #endif // NONMATCHING -u8 GetDomeTrainerMonIvs(u16 trainerId) +static u8 GetDomeTrainerMonIvs(u16 trainerId) { u8 fixedIv; if (trainerId <= 99) @@ -1560,7 +1577,7 @@ u8 GetDomeTrainerMonIvs(u16 trainerId) return fixedIv; } -s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) +static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) { s32 i, j, val; @@ -1602,7 +1619,7 @@ void sub_8190298(void) gTrainerBattleOpponent_A = TrainerIdOfPlayerOpponent(); } -u16 TrainerIdOfPlayerOpponent(void) +static u16 TrainerIdOfPlayerOpponent(void) { return gSaveBlock2Ptr->frontier.domeTrainers[TournamentIdOfOpponent(gSaveBlock2Ptr->frontier.field_CB2, TRAINER_PLAYER)].trainerId; } @@ -1622,8 +1639,8 @@ void sub_81902F8(void) void sub_819033C(void) { - u8 lvlMode = gSaveBlock2Ptr->frontier.chosenLvl; - u8 battleMode = VarGet(VAR_0x40CE); + u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; + u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); if (gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode] < 999) gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode]++; @@ -1645,7 +1662,7 @@ void ShowDomeOpponentInfo(void) SetMainCallback2(CB2_BattleDome); } -void sub_8190400(u8 taskId) +static void sub_8190400(u8 taskId) { s32 i; s32 r5 = gTasks[taskId].data[1]; @@ -1712,9 +1729,9 @@ void sub_8190400(u8 taskId) break; case 3: SetVBlankCallback(VblankCb0_BattleDome); - gUnknown_0203CD78 = AllocZeroed(sizeof(*gUnknown_0203CD78)); + sBattleDomeStruct = AllocZeroed(sizeof(*sBattleDomeStruct)); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) - gUnknown_0203CD78->arr[i] |= 0xFF; + sBattleDomeStruct->arr[i] |= 0xFF; LoadMonIconPalettes(); i = CreateTask(sub_8190CD4, 0); gTasks[i].data[0] = 0; @@ -1724,7 +1741,7 @@ void sub_8190400(u8 taskId) if (r9 == 2) { DisplayMatchInfoOnCard(0, r5); - gUnknown_0203CD78->unk_10 = 1; + sBattleDomeStruct->unk_10 = 1; } else { @@ -1776,7 +1793,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 192) { - gUnknown_0203CD78->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -1796,7 +1813,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -32) { - gUnknown_0203CD78->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -1816,7 +1833,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 272) { - gUnknown_0203CD78->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -1836,7 +1853,7 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -32) { - gUnknown_0203CD78->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -1866,7 +1883,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 176) { - gUnknown_0203CD78->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -1888,7 +1905,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -16) { - gUnknown_0203CD78->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -1910,7 +1927,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 256) { - gUnknown_0203CD78->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -1932,7 +1949,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -16) { - gUnknown_0203CD78->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -1950,12 +1967,12 @@ void sub_8190B40(struct Sprite *sprite) if (sprite->data[1]) { if ((gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].isEliminated - && gUnknown_0203CD78->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].eliminatedAt)) + && sBattleDomeStruct->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].eliminatedAt)) { sprite->invisible = 0; } else if (!gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].isEliminated - && gUnknown_0203CD78->unk_10 - 1 < r12) + && sBattleDomeStruct->unk_10 - 1 < r12) { sprite->invisible = 0; } @@ -1967,7 +1984,7 @@ void sub_8190B40(struct Sprite *sprite) } else { - if (gUnknown_0203CD78->unk_10 != 0) + if (sBattleDomeStruct->unk_10 != 0) { sprite->invisible = 0; } @@ -1982,7 +1999,7 @@ void sub_8190B40(struct Sprite *sprite) { if (sprite->data[1]) { - if (gUnknown_0203CD78->unk_10 > 1) + if (sBattleDomeStruct->unk_10 > 1) { if (gTasks[taskId1].data[0] == 2) sprite->invisible = 1; @@ -1994,7 +2011,7 @@ void sub_8190B40(struct Sprite *sprite) } else { - if (gUnknown_0203CD78->unk_10 != 0) + if (sBattleDomeStruct->unk_10 != 0) { sprite->invisible = 0; } @@ -2013,7 +2030,7 @@ void sub_8190C6C(struct Sprite *sprite) if (gTasks[taskId1].data[3] == 1) { - if (gUnknown_0203CD78->unk_10 != 0) + if (sBattleDomeStruct->unk_10 != 0) { if (gTasks[taskId1].data[0] == 2) sprite->invisible = 1; @@ -2025,7 +2042,7 @@ void sub_8190C6C(struct Sprite *sprite) } else { - if (gUnknown_0203CD78->unk_10 != 1) + if (sBattleDomeStruct->unk_10 != 1) { if (gTasks[taskId1].data[0] == 2) sprite->invisible = 1; @@ -2037,7 +2054,7 @@ void sub_8190C6C(struct Sprite *sprite) } } -void sub_8190CD4(u8 taskId) +static void sub_8190CD4(u8 taskId) { s32 i; s32 windowId = 0; @@ -2108,7 +2125,7 @@ void sub_8190CD4(u8 taskId) if (i == 1) { - if (gUnknown_0203CD78->unk_10 == 0) + if (sBattleDomeStruct->unk_10 == 0) { gBattle_BG2_X = 0; gBattle_BG2_Y = 320; @@ -2121,27 +2138,27 @@ void sub_8190CD4(u8 taskId) gBattle_BG2_Y = 0; trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 0x10, trainerTournamentId); - gUnknown_0203CD78->unk_10 = 0; + sBattleDomeStruct->unk_10 = 0; } } else { - if (gUnknown_0203CD78->unk_10 == 0) + if (sBattleDomeStruct->unk_10 == 0) { matchNo = gTasks[taskId2].data[1] - 16; - sub_8192F08(matchNo, gUnknown_0203CD78->unk_11); + sub_8192F08(matchNo, sBattleDomeStruct->unk_11); gBattle_BG2_X = 0; gBattle_BG2_Y = 320; - trainerTournamentId = gUnknown_0203CD78->unk_11[0]; + trainerTournamentId = sBattleDomeStruct->unk_11[0]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 0x10, trainerTournamentId); } - else if (gUnknown_0203CD78->unk_10 == 2) + else if (sBattleDomeStruct->unk_10 == 2) { matchNo = gTasks[taskId2].data[1] - 16; - sub_8192F08(matchNo, gUnknown_0203CD78->unk_11); + sub_8192F08(matchNo, sBattleDomeStruct->unk_11); gBattle_BG2_X = 0; gBattle_BG2_Y = 320; - trainerTournamentId = gUnknown_0203CD78->unk_11[1]; + trainerTournamentId = sBattleDomeStruct->unk_11[1]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 0x10, trainerTournamentId); } else @@ -2157,23 +2174,23 @@ void sub_8190CD4(u8 taskId) { if (i < 2) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollUp; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2181,23 +2198,23 @@ void sub_8190CD4(u8 taskId) { if (i < 10) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollUp; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2224,7 +2241,7 @@ void sub_8190CD4(u8 taskId) if (i == 2) { - if (gUnknown_0203CD78->unk_10 == 0) + if (sBattleDomeStruct->unk_10 == 0) { gBattle_BG2_X = 0; gBattle_BG2_Y = 160; @@ -2237,27 +2254,27 @@ void sub_8190CD4(u8 taskId) gBattle_BG2_Y = 0; trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 4, trainerTournamentId); - gUnknown_0203CD78->unk_10 = 0; + sBattleDomeStruct->unk_10 = 0; } } else { - if (gUnknown_0203CD78->unk_10 == 0) + if (sBattleDomeStruct->unk_10 == 0) { matchNo = gTasks[taskId2].data[1] - 16; - sub_8192F08(matchNo, gUnknown_0203CD78->unk_11); + sub_8192F08(matchNo, sBattleDomeStruct->unk_11); gBattle_BG2_X = 0; gBattle_BG2_Y = 160; - trainerTournamentId = gUnknown_0203CD78->unk_11[0]; + trainerTournamentId = sBattleDomeStruct->unk_11[0]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 4, trainerTournamentId); } - else if (gUnknown_0203CD78->unk_10 == 2) + else if (sBattleDomeStruct->unk_10 == 2) { matchNo = gTasks[taskId2].data[1] - 16; - sub_8192F08(matchNo, gUnknown_0203CD78->unk_11); + sub_8192F08(matchNo, sBattleDomeStruct->unk_11); gBattle_BG2_X = 0; gBattle_BG2_Y = 160; - trainerTournamentId = gUnknown_0203CD78->unk_11[1]; + trainerTournamentId = sBattleDomeStruct->unk_11[1]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 4, trainerTournamentId); } else @@ -2273,23 +2290,23 @@ void sub_8190CD4(u8 taskId) { if (i < 2) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollDown; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2297,23 +2314,23 @@ void sub_8190CD4(u8 taskId) { if (i < 10) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollDown; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2337,7 +2354,7 @@ void sub_8190CD4(u8 taskId) gBattle_BG1_Y = 0; } - if (gUnknown_0203CD78->unk_10 == 0) + if (sBattleDomeStruct->unk_10 == 0) { gBattle_BG2_X = 256; gBattle_BG2_Y = 160; @@ -2348,7 +2365,7 @@ void sub_8190CD4(u8 taskId) { gBattle_BG2_X = 256; gBattle_BG2_Y = 0; - matchNo = gUnknown_0860D15C[(gTasks[taskId2].data[1] * 4) + (gUnknown_0203CD78->unk_10 - 1)]; + matchNo = gUnknown_0860D15C[(gTasks[taskId2].data[1] * 4) + (sBattleDomeStruct->unk_10 - 1)]; DisplayMatchInfoOnCard(gTasks[taskId].data[2] | 8, matchNo); } @@ -2356,23 +2373,23 @@ void sub_8190CD4(u8 taskId) { if (i < 2) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2380,23 +2397,23 @@ void sub_8190CD4(u8 taskId) { if (i < 10) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2420,11 +2437,11 @@ void sub_8190CD4(u8 taskId) gBattle_BG1_Y = 0; } - if (gUnknown_0203CD78->unk_10 == 0) + if (sBattleDomeStruct->unk_10 == 0) { gBattle_BG2_X = 256; gBattle_BG2_Y = 160; - trainerTournamentId = gUnknown_0203CD78->unk_11[0]; + trainerTournamentId = sBattleDomeStruct->unk_11[0]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 8, trainerTournamentId); } else @@ -2439,23 +2456,23 @@ void sub_8190CD4(u8 taskId) { if (i < 2) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2463,23 +2480,23 @@ void sub_8190CD4(u8 taskId) { if (i < 10) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2503,7 +2520,7 @@ void sub_8190CD4(u8 taskId) gBattle_BG1_Y = 0; } - if (gUnknown_0203CD78->unk_10 == 1) + if (sBattleDomeStruct->unk_10 == 1) { gBattle_BG2_X = 0; gBattle_BG2_Y = 160; @@ -2513,30 +2530,30 @@ void sub_8190CD4(u8 taskId) gBattle_BG2_X = 0; gBattle_BG2_Y = 0; } - matchNo = gUnknown_0860D15C[(gUnknown_0203CD78->unk_10 - 1) + (gTasks[taskId2].data[1] * 4)]; + matchNo = gUnknown_0860D15C[(sBattleDomeStruct->unk_10 - 1) + (gTasks[taskId2].data[1] * 4)]; DisplayMatchInfoOnCard(gTasks[taskId].data[2] | 2, matchNo); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT / 2; i++) { if (i < 2) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollRight; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2544,23 +2561,23 @@ void sub_8190CD4(u8 taskId) { if (i < 10) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollRight; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2584,11 +2601,11 @@ void sub_8190CD4(u8 taskId) gBattle_BG1_Y = 0; } - if (gUnknown_0203CD78->unk_10 == 2) + if (sBattleDomeStruct->unk_10 == 2) { gBattle_BG2_X = 256; gBattle_BG2_Y = 160; - trainerTournamentId = gUnknown_0203CD78->unk_11[1]; + trainerTournamentId = sBattleDomeStruct->unk_11[1]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 2, trainerTournamentId); } else @@ -2603,23 +2620,23 @@ void sub_8190CD4(u8 taskId) { if (i < 2) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollRight; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2627,23 +2644,23 @@ void sub_8190CD4(u8 taskId) { if (i < 10) { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; - gSprites[gUnknown_0203CD78->arr[i]].data[3] = gUnknown_0203CD78->arr[i]; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].data[3] = sBattleDomeStruct->arr[i]; } } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != 0xFF) { - gSprites[gUnknown_0203CD78->arr[i]].callback = SpriteCb_MonIconCardScrollRight; - gSprites[gUnknown_0203CD78->arr[i]].data[0] = gTasks[taskId].data[2]; - gSprites[gUnknown_0203CD78->arr[i]].data[1] = 0; - gSprites[gUnknown_0203CD78->arr[i]].data[2] = i; + gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; + gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; + gSprites[sBattleDomeStruct->arr[i]].data[1] = 0; + gSprites[sBattleDomeStruct->arr[i]].data[2] = i; } } } @@ -2708,31 +2725,31 @@ void sub_8190CD4(u8 taskId) { if (i < 2) { - if (gUnknown_0203CD78->arr[i] != 0xFF) - FreeAndDestroyTrainerPicSprite(gUnknown_0203CD78->arr[i]); + if (sBattleDomeStruct->arr[i] != 0xFF) + FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) - sub_80D2EF8(&gSprites[gUnknown_0203CD78->arr[i]]); + if (sBattleDomeStruct->arr[i] != 0xFF) + sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } for (i = DOME_TOURNAMENT_TRAINERS_COUNT / 2; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { if (i < 10) { - if (gUnknown_0203CD78->arr[i] != 0xFF) - FreeAndDestroyTrainerPicSprite(gUnknown_0203CD78->arr[i]); + if (sBattleDomeStruct->arr[i] != 0xFF) + FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (gUnknown_0203CD78->arr[i] != 0xFF) - sub_80D2EF8(&gSprites[gUnknown_0203CD78->arr[i]]); + if (sBattleDomeStruct->arr[i] != 0xFF) + sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } FreeMonIconPalettes(); - FREE_AND_SET_NULL(gUnknown_0203CD78); + FREE_AND_SET_NULL(sBattleDomeStruct); FreeAllWindowBuffers(); if (r9 == 0) { @@ -2753,7 +2770,7 @@ void sub_8190CD4(u8 taskId) } } -u8 sub_819221C(u8 taskId) +static u8 sub_819221C(u8 taskId) { u8 retVal = 0; s32 taskId2 = gTasks[taskId].data[4]; @@ -2769,7 +2786,7 @@ u8 sub_819221C(u8 taskId) if (gTasks[taskId].data[3] == 1) { - if (gMain.newKeys & DPAD_UP && gUnknown_0203CD78->unk_10 == 0) + if (gMain.newKeys & DPAD_UP && sBattleDomeStruct->unk_10 == 0) { if (r5 == 0) r5 = 15; @@ -2777,7 +2794,7 @@ u8 sub_819221C(u8 taskId) r5--; retVal = 1; } - else if (gMain.newKeys & DPAD_DOWN && gUnknown_0203CD78->unk_10 == 0) + else if (gMain.newKeys & DPAD_DOWN && sBattleDomeStruct->unk_10 == 0) { if (r5 == 15) r5 = 0; @@ -2785,36 +2802,36 @@ u8 sub_819221C(u8 taskId) r5++; retVal = 2; } - else if (gMain.newKeys & DPAD_LEFT && gUnknown_0203CD78->unk_10 != 0) + else if (gMain.newKeys & DPAD_LEFT && sBattleDomeStruct->unk_10 != 0) { - gUnknown_0203CD78->unk_10--; + sBattleDomeStruct->unk_10--; retVal = 3; } else if (gMain.newKeys & DPAD_RIGHT) { - if (gSaveBlock2Ptr->frontier.domeTrainers[r10].isEliminated && gUnknown_0203CD78->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[r10].eliminatedAt) + if (gSaveBlock2Ptr->frontier.domeTrainers[r10].isEliminated && sBattleDomeStruct->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[r10].eliminatedAt) { - gUnknown_0203CD78->unk_10++; + sBattleDomeStruct->unk_10++; retVal = 4; } - if (!gSaveBlock2Ptr->frontier.domeTrainers[r10].isEliminated && gUnknown_0203CD78->unk_10 - 1 < roundId) + if (!gSaveBlock2Ptr->frontier.domeTrainers[r10].isEliminated && sBattleDomeStruct->unk_10 - 1 < roundId) { - gUnknown_0203CD78->unk_10++; + sBattleDomeStruct->unk_10++; retVal = 4; } } if (retVal == 9) { - if (gUnknown_0203CD78->unk_10 != 0) - gTasks[taskId2].data[1] = gUnknown_0860D1A0[r5 / 2][gUnknown_0203CD78->unk_10 - 1]; + if (sBattleDomeStruct->unk_10 != 0) + gTasks[taskId2].data[1] = gUnknown_0860D1A0[r5 / 2][sBattleDomeStruct->unk_10 - 1]; else gTasks[taskId2].data[1] = r5; } } else { - if (gMain.newKeys & DPAD_UP && gUnknown_0203CD78->unk_10 == 1) + if (gMain.newKeys & DPAD_UP && sBattleDomeStruct->unk_10 == 1) { if (r5 == 16) r5 = gUnknown_0860D19C[roundId]; @@ -2822,7 +2839,7 @@ u8 sub_819221C(u8 taskId) r5--; retVal = 5; } - else if (gMain.newKeys & DPAD_DOWN && gUnknown_0203CD78->unk_10 == 1) + else if (gMain.newKeys & DPAD_DOWN && sBattleDomeStruct->unk_10 == 1) { if (r5 == gUnknown_0860D19C[roundId]) r5 = 16; @@ -2830,23 +2847,23 @@ u8 sub_819221C(u8 taskId) r5++; retVal = 6; } - else if (gMain.newKeys & DPAD_LEFT && gUnknown_0203CD78->unk_10 != 0) + else if (gMain.newKeys & DPAD_LEFT && sBattleDomeStruct->unk_10 != 0) { retVal = 7; - gUnknown_0203CD78->unk_10--; + sBattleDomeStruct->unk_10--; } - else if (gMain.newKeys & DPAD_RIGHT && (gUnknown_0203CD78->unk_10 == 0 || gUnknown_0203CD78->unk_10 == 1)) + else if (gMain.newKeys & DPAD_RIGHT && (sBattleDomeStruct->unk_10 == 0 || sBattleDomeStruct->unk_10 == 1)) { retVal = 8; - gUnknown_0203CD78->unk_10++; + sBattleDomeStruct->unk_10++; } if (retVal == 9) { - if (gUnknown_0203CD78->unk_10 == 0) - gTasks[taskId2].data[1] = gUnknown_0860D1C0[gUnknown_0203CD78->unk_11[0]]; - else if (gUnknown_0203CD78->unk_10 == 2) - gTasks[taskId2].data[1] = gUnknown_0860D1C0[gUnknown_0203CD78->unk_11[1]]; + if (sBattleDomeStruct->unk_10 == 0) + gTasks[taskId2].data[1] = gUnknown_0860D1C0[sBattleDomeStruct->unk_11[0]]; + else if (sBattleDomeStruct->unk_10 == 2) + gTasks[taskId2].data[1] = gUnknown_0860D1C0[sBattleDomeStruct->unk_11[1]]; else gTasks[taskId2].data[1] = r5; } @@ -2887,47 +2904,47 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) y = -160; if (trainerId == TRAINER_PLAYER) - gUnknown_0203CD78->arr[arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF); + sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF); else if (trainerId == TRAINER_FRONTIER_BRAIN) - gUnknown_0203CD78->arr[arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF); + sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF); else - gUnknown_0203CD78->arr[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerId), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF); + sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerId), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF); if (flags & 0x1E) - gSprites[gUnknown_0203CD78->arr[arrId]].invisible = 1; + gSprites[sBattleDomeStruct->arr[arrId]].invisible = 1; for (i = 0; i < 3; i++) { if (trainerId == TRAINER_PLAYER) { - gUnknown_0203CD78->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i], + sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i], SpriteCb_MonIcon, x | gUnknown_0860D340[i], y + gUnknown_0860D343[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.priority = 0; } else if (trainerId == TRAINER_FRONTIER_BRAIN) { - gUnknown_0203CD78->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i], + sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i], SpriteCb_MonIcon, x | gUnknown_0860D340[i], y + gUnknown_0860D343[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.priority = 0; } else { - gUnknown_0203CD78->arr[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].species, + sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].species, SpriteCb_MonIcon, x | gUnknown_0860D340[i], y + gUnknown_0860D343[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.priority = 0; } if (flags & 0x1E) - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].invisible = 1; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].invisible = 1; } textPrinter.fontId = 2; textPrinter.x = 0; @@ -3019,11 +3036,11 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) for (k = 0; k < DOME_TOURNAMENT_TRAINERS_COUNT; k++) { if (trainerId == TRAINER_FRONTIER_BRAIN) - allocatedArray[k] += sMovePoints[sub_81A5060(i, j)][k]; + allocatedArray[k] += sMovePointsForDomeTrainers[sub_81A5060(i, j)][k]; else if (trainerId == TRAINER_PLAYER) - allocatedArray[k] += sMovePoints[gSaveBlock2Ptr->frontier.field_EFC[i].moves[j]][k]; + allocatedArray[k] += sMovePointsForDomeTrainers[gSaveBlock2Ptr->frontier.field_EFC[i].moves[j]][k]; else - allocatedArray[k] += sMovePoints[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].moves[j]][k]; + allocatedArray[k] += sMovePointsForDomeTrainers[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].moves[j]][k]; } } } @@ -3224,7 +3241,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) Free(allocatedArray); } -s32 sub_8192F08(u8 arg0, u8 *arg1) +static s32 sub_8192F08(u8 arg0, u8 *arg1) { s32 i; u8 tournamentId; @@ -3311,10 +3328,10 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) y = -160; // Copy trainers information to handy arrays. - winStringId = sub_8192F08(matchNo, gUnknown_0203CD78->unk_11); + winStringId = sub_8192F08(matchNo, sBattleDomeStruct->unk_11); for (i = 0; i < 2; i++) { - tournamentIds[i] = gUnknown_0203CD78->unk_11[i]; + tournamentIds[i] = sBattleDomeStruct->unk_11[i]; trainerIds[i] = gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].trainerId; if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].eliminatedAt <= gUnknown_0860D3C4[matchNo][2] && gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].isEliminated) @@ -3325,67 +3342,67 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) // Draw first trainer sprite. if (trainerIds[0] == TRAINER_PLAYER) - gUnknown_0203CD78->arr[arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF); + sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF); else if (trainerIds[0] == TRAINER_FRONTIER_BRAIN) - gUnknown_0203CD78->arr[arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF); + sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF); else - gUnknown_0203CD78->arr[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[0]), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF); + sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[0]), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF); if (flags & 0x1E) - gSprites[gUnknown_0203CD78->arr[arrId]].invisible = 1; + gSprites[sBattleDomeStruct->arr[arrId]].invisible = 1; if (lost[0]) - gSprites[gUnknown_0203CD78->arr[arrId]].oam.paletteNum = 3; + gSprites[sBattleDomeStruct->arr[arrId]].oam.paletteNum = 3; // Draw second trainer sprite. if (trainerIds[1] == TRAINER_PLAYER) - gUnknown_0203CD78->arr[1 + arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF); + sBattleDomeStruct->arr[1 + arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF); else if (trainerIds[1] == TRAINER_FRONTIER_BRAIN) - gUnknown_0203CD78->arr[1 + arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF); + sBattleDomeStruct->arr[1 + arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF); else - gUnknown_0203CD78->arr[1 + arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[1]), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF); + sBattleDomeStruct->arr[1 + arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[1]), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF); if (flags & 0x1E) - gSprites[gUnknown_0203CD78->arr[1 + arrId]].invisible = 1; + gSprites[sBattleDomeStruct->arr[1 + arrId]].invisible = 1; if (lost[1]) - gSprites[gUnknown_0203CD78->arr[1 + arrId]].oam.paletteNum = 3; + gSprites[sBattleDomeStruct->arr[1 + arrId]].oam.paletteNum = 3; // Draw first trainer's pokemon icons. for (i = 0; i < 3; i++) { if (trainerIds[0] == TRAINER_PLAYER) { - gUnknown_0203CD78->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i], + sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i], SpriteCb_MonIcon, x | gUnknown_0860D3A8[i], y + gUnknown_0860D3AB[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.priority = 0; } else if (trainerIds[0] == TRAINER_FRONTIER_BRAIN) { - gUnknown_0203CD78->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i], + sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i], SpriteCb_MonIcon, x | gUnknown_0860D3A8[i], y + gUnknown_0860D3AB[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.priority = 0; } else { - gUnknown_0203CD78->arr[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i]].species, + sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i]].species, SpriteCb_MonIcon, x | gUnknown_0860D3A8[i], y + gUnknown_0860D3AB[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.priority = 0; } if (flags & 0x1E) - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].invisible = 1; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].invisible = 1; if (lost[0]) { - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].oam.paletteNum = 3; - gSprites[gUnknown_0203CD78->arr[2 + i + arrId]].sMonIconStill = TRUE; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.paletteNum = 3; + gSprites[sBattleDomeStruct->arr[2 + i + arrId]].sMonIconStill = TRUE; } } @@ -3394,38 +3411,38 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) { if (trainerIds[1] == TRAINER_PLAYER) { - gUnknown_0203CD78->arr[5 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i], + sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i], SpriteCb_MonIcon, x | gUnknown_0860D3AE[i], y + gUnknown_0860D3B1[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[5 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[5 + i + arrId]].oam.priority = 0; } else if (trainerIds[1] == TRAINER_FRONTIER_BRAIN) { - gUnknown_0203CD78->arr[5 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i], + sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i], SpriteCb_MonIcon, x | gUnknown_0860D3AE[i], y + gUnknown_0860D3B1[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[5 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[5 + i + arrId]].oam.priority = 0; } else { - gUnknown_0203CD78->arr[5 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i]].species, + sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i]].species, SpriteCb_MonIcon, x | gUnknown_0860D3AE[i], y + gUnknown_0860D3B1[i], 0, 0, TRUE); - gSprites[gUnknown_0203CD78->arr[5 + i + arrId]].oam.priority = 0; + gSprites[sBattleDomeStruct->arr[5 + i + arrId]].oam.priority = 0; } if (flags & 0x1E) - gSprites[gUnknown_0203CD78->arr[5 + i + arrId]].invisible = 1; + gSprites[sBattleDomeStruct->arr[5 + i + arrId]].invisible = 1; if (lost[1]) { - gSprites[gUnknown_0203CD78->arr[5 + i + arrId]].oam.paletteNum = 3; - gSprites[gUnknown_0203CD78->arr[5 + i + arrId]].sMonIconStill = TRUE; + gSprites[sBattleDomeStruct->arr[5 + i + arrId]].oam.paletteNum = 3; + gSprites[sBattleDomeStruct->arr[5 + i + arrId]].sMonIconStill = TRUE; } } @@ -3510,7 +3527,7 @@ void sub_81938E0(void) u8 taskId; sub_8194D48(); - gSaveBlock2Ptr->frontier.chosenLvl = gSaveBlock2Ptr->frontier.field_D0A - 1; + gSaveBlock2Ptr->frontier.lvlMode = gSaveBlock2Ptr->frontier.field_D0A - 1; gSaveBlock2Ptr->frontier.field_CB2 = 3; taskId = CreateTask(sub_8194220, 0); gTasks[taskId].data[0] = 0; @@ -3564,7 +3581,7 @@ void sub_819395C(u8 taskId) { FreeAllWindowBuffers(); ScanlineEffect_Stop(); - FREE_AND_SET_NULL(gUnknown_0203CD7C); + FREE_AND_SET_NULL(sTilemapBuffer); newTaskId = CreateTask(sub_8190400, 0); gTasks[newTaskId].data[0] = 0; gTasks[newTaskId].data[1] = gUnknown_0860D080[spriteId]; @@ -3572,7 +3589,7 @@ void sub_819395C(u8 taskId) gTasks[newTaskId].data[3] = taskId; gTasks[taskId].data[0] = 4; - gUnknown_0203CD78->unk_10 = 0; + sBattleDomeStruct->unk_10 = 0; } break; case 4: @@ -3582,7 +3599,7 @@ void sub_819395C(u8 taskId) { FreeAllWindowBuffers(); ScanlineEffect_Stop(); - FREE_AND_SET_NULL(gUnknown_0203CD7C); + FREE_AND_SET_NULL(sTilemapBuffer); newTaskId = CreateTask(sub_8190400, 0); gTasks[newTaskId].data[0] = 0; gTasks[newTaskId].data[1] = spriteId - 16; @@ -3599,7 +3616,7 @@ void sub_819395C(u8 taskId) { FreeAllWindowBuffers(); ScanlineEffect_Stop(); - FREE_AND_SET_NULL(gUnknown_0203CD7C); + FREE_AND_SET_NULL(sTilemapBuffer); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); DestroyTask(gTasks[taskId].data[7]); DestroyTask(taskId); @@ -3608,7 +3625,7 @@ void sub_819395C(u8 taskId) } } -u8 sub_8193BDC(u8 taskId) +static u8 sub_8193BDC(u8 taskId) { u8 retVal = 1; s32 arrId = 4; @@ -3691,7 +3708,7 @@ void sub_8193D7C(void) } } -u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roundId) +static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roundId) { s32 i, j, k; s32 moveScores[4 * 3]; @@ -3804,15 +3821,7 @@ u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roundId) return moveIds[j]; } -extern const struct BgTemplate gUnknown_0860CE74[4]; -extern const struct WindowTemplate gUnknown_0860CE94[]; -extern const u8 gUnknown_0860D411[][2]; -extern const struct SpriteTemplate gUnknown_0860CFA8; -extern const struct SpriteTemplate gUnknown_0860D008; -extern const struct SpriteTemplate gUnknown_0860CFD8; -extern const struct ScanlineEffectParams gUnknown_0860CF44; - -void sub_8194220(u8 taskId) +static void sub_8194220(u8 taskId) { s32 i; struct TextSubPrinter textPrinter; @@ -3857,9 +3866,9 @@ void sub_8194220(u8 taskId) gTasks[taskId].data[0]++; break; case 2: - gUnknown_0203CD7C = AllocZeroed(0x800); - LZDecompressWram(gUnknown_08D83900, gUnknown_0203CD7C); - SetBgTilemapBuffer(1, gUnknown_0203CD7C); + sTilemapBuffer = AllocZeroed(0x800); + LZDecompressWram(gUnknown_08D83900, sTilemapBuffer); + SetBgTilemapBuffer(1, sTilemapBuffer); CopyBgTilemapBufferToVram(1); DecompressAndLoadBgGfxUsingHeap(1, gUnknown_08D82F10, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gUnknown_08D834FC, 0x2000, 0, 0); @@ -3997,7 +4006,7 @@ void sub_8194220(u8 taskId) CopyWindowToVram(0, 3); CopyWindowToVram(1, 3); CopyWindowToVram(2, 3); - SetHBlankCallback(sub_8194BEC); + SetHBlankCallback(HblankCb_BattleDome); SetVBlankCallback(VblankCb1_BattleDome); if (r4 == 2) { @@ -4037,20 +4046,10 @@ void sub_8194220(u8 taskId) } } -struct UnkStruct_860DD10 -{ - u8 x; - u8 y; - u16 src; -}; - -extern struct UnkStruct_860DD10 *gUnknown_0860DD10[][4]; -extern const u8 gUnknown_0860DE10[][4]; - -void sub_81948EC(u8 tournamentId, u8 arg1) +static void sub_81948EC(u8 tournamentId, u8 arg1) { s32 i; - struct UnkStruct_860DD10 *structPtr = gUnknown_0860DD10[tournamentId][arg1]; + const struct UnkStruct_860DD10 *structPtr = gUnknown_0860DD10[tournamentId][arg1]; for (i = 0; i < gUnknown_0860DE10[tournamentId][arg1]; i++) CopyToBgTilemapBufferRect_ChangePalette(1, &structPtr[i].src, structPtr[i].x, structPtr[i].y, 1, 1, 0x11); @@ -4058,7 +4057,7 @@ void sub_81948EC(u8 tournamentId, u8 arg1) CopyBgTilemapBufferToVram(1); } -void sub_8194950(u8 taskId) +static void sub_8194950(u8 taskId) { s32 i; struct TextSubPrinter textPrinter; @@ -4157,7 +4156,7 @@ static void VblankCb0_BattleDome(void) *(vu32*)(REG_ADDR_WIN0H) = ((win0H << 16) | (win1H)); \ } -void sub_8194BEC(void) +static void HblankCb_BattleDome(void) { register u32 vCount asm("r0") = REG_VCOUNT; register u32 vCount_ asm("r1") = vCount; @@ -4319,8 +4318,8 @@ void sub_8194F58(void) statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT); statValues = AllocZeroed(sizeof(s32) * 6); - lvlMode = gSaveBlock2Ptr->frontier.chosenLvl; - gSaveBlock2Ptr->frontier.chosenLvl = 0; + lvlMode = gSaveBlock2Ptr->frontier.lvlMode; + gSaveBlock2Ptr->frontier.lvlMode = 0; // This one, I'd like to call a 'C fakematching'. { u8 one; @@ -4428,7 +4427,7 @@ void sub_8194F58(void) for (i = 0; i < 4; i++) DecideRoundWinners(i); - gSaveBlock2Ptr->frontier.chosenLvl = lvlMode; + gSaveBlock2Ptr->frontier.lvlMode = lvlMode; } static s32 TrainerIdToTournamentId(u16 trainerId) @@ -4458,7 +4457,7 @@ s32 TrainerIdToDomeTournamentId(u16 trainerId) return i; } -u8 sub_81953E8(u8 tournamentId, u8 arg1) +static u8 sub_81953E8(u8 tournamentId, u8 arg1) { u8 arr[2]; sub_8192F08(gUnknown_0860D1A0[gUnknown_0860D1C0[tournamentId] / 2][arg1] - 16, arr); @@ -4468,7 +4467,7 @@ u8 sub_81953E8(u8 tournamentId, u8 arg1) return arr[0]; } -void DecideRoundWinners(u8 roundId) +static void DecideRoundWinners(u8 roundId) { s32 i; s32 moveSlot, monId1, monId2; @@ -4578,7 +4577,7 @@ void DecideRoundWinners(u8 roundId) } } -void CopyDomeTrainerName(u8 *dst, u16 trainerId) +static void CopyDomeTrainerName(u8 *dst, u16 trainerId) { s32 i = 0; GetFrontierEnemyMonLevel(); // Unused return value. @@ -4603,17 +4602,17 @@ void CopyDomeTrainerName(u8 *dst, u16 trainerId) } } -u8 GetDomeBrainTrainerPicId(void) +static u8 GetDomeBrainTrainerPicId(void) { return gTrainers[TRAINER_TUCKER].trainerPic; } -u8 GetDomeBrainTrainerClass(void) +static u8 GetDomeBrainTrainerClass(void) { return gTrainers[TRAINER_TUCKER].trainerClass; } -void CopyDomeBrainTrainerName(u8 *dst) +static void CopyDomeBrainTrainerName(u8 *dst) { s32 i; diff --git a/src/battle_setup.c b/src/battle_setup.c index 2955a33fc..17ab20ccd 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -33,6 +33,7 @@ #include "field_weather.h" #include "gym_leader_rematch.h" #include "constants/map_types.h" +#include "constants/battle_frontier.h" enum { @@ -863,7 +864,7 @@ u8 sub_80B100C(s32 arg0) return sUnknown_0854FEA7[Random() % ARRAY_COUNT(sUnknown_0854FEA7)]; } - if (VarGet(VAR_0x40CE) != 3) + if (VarGet(VAR_FRONTIER_BATTLE_MODE) != FRONTIER_MODE_LINK_MULTIS) return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)]; } else @@ -880,7 +881,7 @@ u8 sub_80B100C(s32 arg0) return sUnknown_0854FEA7[Random() % ARRAY_COUNT(sUnknown_0854FEA7)]; } - if (VarGet(VAR_0x40CE) != 3) + if (VarGet(VAR_FRONTIER_BATTLE_MODE) != FRONTIER_MODE_LINK_MULTIS) return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)]; } @@ -1001,7 +1001,7 @@ void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 wi } } -void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette) +void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette) { CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0); } diff --git a/src/field_specials.c b/src/field_specials.c index e20ccf618..f5728c3a4 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -52,6 +52,7 @@ #include "constants/species.h" #include "constants/moves.h" #include "constants/vars.h" +#include "constants/battle_frontier.h" EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA u8 gBikeCollisions = 0; @@ -1667,7 +1668,7 @@ bool8 InMultiBattleRoom(void) { if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM) && - VarGet(VAR_0x40CE) == 2) + VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_MULTIS) return TRUE; return FALSE; } @@ -2240,10 +2241,10 @@ void sub_813A080(void) }; u8 i; - u16 var = VarGet(VAR_0x40CE); - u8 chosenLevel = gSaveBlock2Ptr->frontier.chosenLvl; + u16 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); + u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - if (var == 2 && !FlagGet(FLAG_0x152)) + if (battleMode == 2 && !FlagGet(FLAG_0x152)) { gSpecialVar_0x8005 = 5; gSpecialVar_0x8006 = 4; @@ -2252,7 +2253,7 @@ void sub_813A080(void) for (i = 0; i < 9; i++) { - if (gUnknown_085B2CDC[i] > gSaveBlock2Ptr->frontier.field_CE0[var][chosenLevel]) + if (gUnknown_085B2CDC[i] > gSaveBlock2Ptr->frontier.field_CE0[battleMode][lvlMode]) { gSpecialVar_0x8005 = 4; gSpecialVar_0x8006 = i + 5; @@ -3036,13 +3037,13 @@ void sub_813A878(u8 a0) { static const u16 gUnknown_085B3104[] = {0x0000, 0x0001, 0x0002, 0x0100, 0x0101, 0x0400, 0x0401, 0x0200, 0x0201, 0x0300, 0x0500, 0x0600}; - u16 var1 = VarGet(VAR_0x40CE); + u16 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u16 var2 = VarGet(VAR_FRONTIER_GAMBLER_SET_FACILITY_F); - u16 var3 = VarGet(VAR_FRONTIER_FACILITY); + u16 frontierFacilityId = VarGet(VAR_FRONTIER_FACILITY); if (VarGet(VAR_FRONTIER_GAMBLER_PLACED_BET_F) == 1) { - if (gUnknown_085B3104[var2] == (var3 << 8) + var1) + if (gUnknown_085B3104[var2] == (frontierFacilityId << 8) + battleMode) { if (a0 != 0) { diff --git a/src/item.c b/src/item.c index c94f29910..22894bbff 100644 --- a/src/item.c +++ b/src/item.c @@ -845,8 +845,8 @@ u16 CountTotalItemQuantityInBag(u16 itemId) static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count) { u8 i; - u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; - u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.lvlMode]; for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { @@ -867,8 +867,8 @@ static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count) static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count) { u8 i; - u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; - u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.lvlMode]; for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { @@ -890,8 +890,8 @@ bool8 AddPyramidBagItem(u16 itemId, u16 count) { u16 i; - u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; - u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.lvlMode]; u16 *newItems = Alloc(PYRAMID_BAG_ITEMS_COUNT * sizeof(u16)); u8 *newQuantities = Alloc(PYRAMID_BAG_ITEMS_COUNT * sizeof(u8)); @@ -963,8 +963,8 @@ bool8 RemovePyramidBagItem(u16 itemId, u16 count) { u16 i; - u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; - u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.lvlMode]; i = gUnknown_0203CF30[3] + gUnknown_0203CF30[4]; if (items[i] == itemId && quantities[i] >= count) diff --git a/src/pokemon.c b/src/pokemon.c index 7dedc917f..5157853c1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -13,6 +13,7 @@ #include "constants/hold_effects.h" #include "constants/battle_move_effects.h" #include "constants/songs.h" +#include "constants/battle_frontier.h" #include "string_util.h" #include "text.h" #include "link.h" @@ -1575,8 +1576,8 @@ void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lv u8 language; u8 value; - if (gSaveBlock2Ptr->frontier.chosenLvl != 0) - level = BattleFrontierGetOpponentLvl(gSaveBlock2Ptr->frontier.chosenLvl); + if (gSaveBlock2Ptr->frontier.lvlMode != FRONTIER_LVL_50) + level = BattleFrontierGetOpponentLvl(gSaveBlock2Ptr->frontier.lvlMode); else if (lvl50) level = 50; else diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 45b07ca7a..e19f3047f 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -1293,7 +1293,7 @@ static bool32 AllocTryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst) static void CB2_RecordedBattleEnd(void) { - gSaveBlock2Ptr->frontier.chosenLvl = sUnknown_0203C7AD; + gSaveBlock2Ptr->frontier.lvlMode = sUnknown_0203C7AD; gBattleOutcome = 0; gBattleTypeFlags = 0; gTrainerBattleOpponent_A = 0; @@ -1353,7 +1353,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) gTrainerBattleOpponent_B = src->opponentB; gPartnerTrainerId = src->partnerId; gUnknown_0203C7B4 = src->field_4FA; - sUnknown_0203C7AD = gSaveBlock2Ptr->frontier.chosenLvl; + sUnknown_0203C7AD = gSaveBlock2Ptr->frontier.lvlMode; sFrontierFacility = src->field_4FD; sUnknown_0203C7AF = src->field_4FE; sBattleStyle = src->battleStyle; @@ -1375,7 +1375,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) sUnknown_0203CCDC[i] = src->field_50E[i]; } - gSaveBlock2Ptr->frontier.chosenLvl = src->field_4FC; + gSaveBlock2Ptr->frontier.lvlMode = src->field_4FC; for (i = 0; i < MAX_BATTLERS_COUNT; i++) { diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 55e3fe32b..993dc0f4f 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -18,6 +18,7 @@ #include "constants/maps.h" #include "constants/species.h" #include "constants/rgb.h" +#include "constants/battle_frontier.h" #include "trade.h" #include "trainer_card.h" #include "overworld.h" @@ -468,7 +469,7 @@ void sub_8012780(u8 taskId) switch (data->state) { case 0: - if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.chosenLvl == 1) + if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN) gSpecialVar_0x8004++; gUnknown_02022C2C = gUnknown_082F00C4[gSpecialVar_0x8004]; gUnknown_02022C2D = gUnknown_082F00C4[gSpecialVar_0x8004] >> 8; @@ -1050,7 +1051,7 @@ void sub_80134E8(u8 taskId) switch (data->state) { case 0: - if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.chosenLvl == 1) + if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN) gSpecialVar_0x8004++; gUnknown_02022C2C = gUnknown_082F0530[gSpecialVar_0x8004]; sub_8010F84(gUnknown_02022C2C, 0, 0); diff --git a/sym_ewram.txt b/sym_ewram.txt index c0c8e8a2f..e153fd271 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -634,18 +634,7 @@ gFacilityTrainerMons: @ 203BC8C .include "src/recorded_battle.o" .include "src/trainer_pokemon_sprites.o" .include "src/lilycove_lady.o" - -gUnknown_0203CD70: @ 203CD70 - .space 0x4 - -gUnknown_0203CD74: @ 203CD74 - .space 0x4 - -gUnknown_0203CD78: @ 203CD78 - .space 0x4 - -gUnknown_0203CD7C: @ 203CD7C - .space 0x4 + .include "src/battle_dome.o" gUnknown_0203CD80: @ 203CD80 .space 0x8 |