dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Set up remaining facility script doc, use Palace macros

Browse Source
This commit is contained in:
GriffinR
2019-11-28 21:09:35 -05:00
committed by huderlem
parent 809811e722
commit be17c1602d
29 changed files with 533 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_frontier/battle_arena.inc
+39 -39
View File
@@ -1,45 +1,45 @@
@ Initialize the Battle Arena challenge @ Initialize the Battle Arena challenge
.macro arena_init .macro arena_init
setvar VAR_0x8004, BATTLE_ARENA_FUNC_INIT setvar VAR_0x8004, BATTLE_ARENA_FUNC_INIT
special CallBattleArenaFunction special CallBattleArenaFunction
.endm .endm
@ Unused. Get the value of some ARENA_DATA_*. See GetArenaData for the data types that can be retrieved @ Unused. Get the value of some ARENA_DATA_*. See GetArenaData for the data types that can be retrieved
.macro arena_get data:req .macro arena_get data:req
setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_DATA setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_DATA
setvar VAR_0x8005, \data setvar VAR_0x8005, \data
special CallBattleArenaFunction special CallBattleArenaFunction
.endm .endm
@ Set some ARENA_DATA_* to val. See SetArenaData for the data types that can be set @ Set some ARENA_DATA_* to val. See SetArenaData for the data types that can be set
.macro arena_set data:req, val:req .macro arena_set data:req, val:req
setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_DATA setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_DATA
setvar VAR_0x8005, \data setvar VAR_0x8005, \data
setvar VAR_0x8006, \val setvar VAR_0x8006, \val
special CallBattleArenaFunction special CallBattleArenaFunction
.endm .endm
@ Save the game and set the challenge status @ Save the game and set the challenge status
.macro arena_save challengeStatus:req .macro arena_save challengeStatus:req
setvar VAR_0x8004, BATTLE_ARENA_FUNC_SAVE setvar VAR_0x8004, BATTLE_ARENA_FUNC_SAVE
setvar VAR_0x8005, \challengeStatus setvar VAR_0x8005, \challengeStatus
special CallBattleArenaFunction special CallBattleArenaFunction
.endm .endm
@ Unused. Set the reward item to give from one of two lists of possible awards, depending on streak. @ Unused. Set the prize item to give from one of two lists of possible prizes, depending on streak.
.macro arena_setreward .macro arena_setprize
setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_REWARD setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_PRIZE
special CallBattleArenaFunction special CallBattleArenaFunction
.endm .endm
@ Unused. Give the set award item to the player. TRUE if room in Bag for award, FALSE otherwise @ Unused. Give the set prize item to the player. TRUE if room in Bag for prize, FALSE otherwise
.macro arena_givereward .macro arena_giveprize
setvar VAR_0x8004, BATTLE_ARENA_FUNC_GIVE_REWARD setvar VAR_0x8004, BATTLE_ARENA_FUNC_GIVE_PRIZE
special CallBattleArenaFunction special CallBattleArenaFunction
.endm .endm
@ Buffer the opponents name to STR_VAR_1 @ Buffer the opponents name to STR_VAR_1
.macro arena_gettrainername .macro arena_gettrainername
setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_TRAINER_NAME setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_TRAINER_NAME
special CallBattleArenaFunction special CallBattleArenaFunction
.endm .endm
asm/macros/battle_frontier/battle_palace.inc
+57 -1
View File
@@ -1,7 +1,63 @@
@ To be populated with macros for CallBattlePalaceFunction @ Initialize the Battle Palace challenge
.macro palace_init
setvar VAR_0x8004, BATTLE_PALACE_FUNC_INIT
special CallBattlePalaceFunction
.endm
@ Get the value of some PALACE_DATA_*. See GetPalaceData for the data types that can be retrieved
.macro palace_get data:req
setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_DATA
setvar VAR_0x8005, \data
special CallBattlePalaceFunction
.endm
@ Set some PALACE_DATA_* to val. See SetPalaceData for the data types that can be set
.macro palace_set data:req, val:req
setvar VAR_0x8004, BATTLE_PALACE_FUNC_SET_DATA
setvar VAR_0x8005, \data
setvar VAR_0x8006, \val
special CallBattlePalaceFunction
.endm
@ Get the id of the comment to be made while being led through the corridor
.macro palace_getcomment
setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_COMMENT_ID
special CallBattlePalaceFunction
.endm
@ Unused. Choose and set the opponent gfx id. The equivalent macro from Battle Tower is used instead
.macro palace_setopponent
setvar VAR_0x8004, BATTLE_PALACE_FUNC_SET_OPPONENT
special CallBattlePalaceFunction
.endm
@ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory @ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory
.macro palace_getopponentintro .macro palace_getopponentintro
setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO
special CallBattlePalaceFunction special CallBattlePalaceFunction
.endm .endm
@ Increments the current win streak by 1
.macro palace_incrementstreak
setvar VAR_0x8004, BATTLE_PALACE_FUNC_INCREMENT_STREAK
special CallBattlePalaceFunction
.endm
@ Save the game and set the challenge status
.macro palace_save challengeStatus:req
setvar VAR_0x8004, BATTLE_PALACE_FUNC_SAVE
setvar VAR_0x8005, \challengeStatus
special CallBattlePalaceFunction
.endm
@ Unused. Set the prize item to give from one of two lists of possible prizes, depending on streak.
.macro palace_setprize
setvar VAR_0x8004, BATTLE_PALACE_FUNC_SET_PRIZE
special CallBattleArenaFunction
.endm
@ Unused. Give the set prize item to the player. TRUE if room in Bag for prize, FALSE otherwise
.macro palace_giveprize
setvar VAR_0x8004, BATTLE_PALACE_FUNC_GIVE_PRIZE
special CallBattleArenaFunction
.endm
asm/macros/battle_frontier/battle_tower.inc
+1 -1
View File
@@ -1,7 +1,7 @@
@ To be populated with macros for CallBattleTowerFunc @ To be populated with macros for CallBattleTowerFunc
.macro battletower_getstreak .macro battletower_getstreak
setvar VAR_0x8004, BATTLE_TOWER_FUNC_1 setvar VAR_0x8004, BATTLE_TOWER_FUNC_GET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattleTowerFunc special CallBattleTowerFunc
.endm .endm
data/event_scripts.s
+1
View File
@@ -2,6 +2,7 @@
#include "constants/apprentice.h" #include "constants/apprentice.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/battle_arena.h" #include "constants/battle_arena.h"
#include "constants/battle_dome.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_palace.h" #include "constants/battle_palace.h"
#include "constants/battle_pike.h" #include "constants/battle_pike.h"
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+18 -18
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
.byte 0 .byte 0
BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
setvar VAR_0x8004, 10 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_GFX
special CallBattleDomeFunction special CallBattleDomeFunction
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
@@ -68,7 +68,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
setvar VAR_0x8004, 4 setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_OPPONENT_NAME
special CallBattleDomeFunction special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT
closemessage closemessage
@@ -80,7 +80,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
special CallBattleTowerFunc special CallBattleTowerFunc
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_0x8004, 5 setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY
special CallBattleDomeFunction special CallBattleDomeFunction
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440 call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
setvar VAR_TEMP_2, 0 setvar VAR_TEMP_2, 0
@@ -105,7 +105,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
waitmovement 0 waitmovement 0
compare VAR_TEMP_2, 2 compare VAR_TEMP_2, 2
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
setvar VAR_0x8004, 19 setvar VAR_0x8004, BATTLE_DOME_FUNC_COMPARE_SEEDS
special CallBattleDomeFunction special CallBattleDomeFunction
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
@@ -113,7 +113,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 4 setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_OPPONENT_NAME
special CallBattleDomeFunction special CallBattleDomeFunction
compare VAR_TEMP_2, 0 compare VAR_TEMP_2, 0
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
@@ -126,7 +126,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
delay 60 delay 60
BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
setvar VAR_0x8004, 12 setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special CallBattleDomeFunction special CallBattleDomeFunction
@@ -162,9 +162,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
playse SE_W227B playse SE_W227B
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
delay 60 delay 60
setvar VAR_0x8004, 3 setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_ROUND_TEXT
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 12 setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattleDomeFunction special CallBattleDomeFunction
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
@@ -205,18 +205,18 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
setvar VAR_0x8005, 6 setvar VAR_0x8005, DOME_DATA_6
special CallBattleDomeFunction special CallBattleDomeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
setvar VAR_0x8005, 7 setvar VAR_0x8005, DOME_DATA_7
special CallBattleDomeFunction special CallBattleDomeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
special CallBattleDomeFunction special CallBattleDomeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
@@ -417,7 +417,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
setvar VAR_0x8004, 12 setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattleDomeFunction special CallBattleDomeFunction
frontier_getsymbols frontier_getsymbols
@@ -449,7 +449,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
setvar VAR_0x8004, 12 setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattleDomeFunction special CallBattleDomeFunction
frontier_getsymbols frontier_getsymbols
@@ -496,10 +496,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
special DoSpecialTrainerBattle special DoSpecialTrainerBattle
waitstate waitstate
setvar VAR_TEMP_9, 0 setvar VAR_TEMP_9, 0
setvar VAR_0x8004, 17 setvar VAR_0x8004, BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS
special CallBattleDomeFunction special CallBattleDomeFunction
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 16 setvar VAR_0x8004, BATTLE_DOME_FUNC_RESET_SKETCH
special CallBattleDomeFunction special CallBattleDomeFunction
return return
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+30 -30
View File
@@ -5,7 +5,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
.byte 0 .byte 0
BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
setvar VAR_0x8004, 21 setvar VAR_0x8004, BATTLE_DOME_FUNC_21
special CallBattleDomeFunction special CallBattleDomeFunction
end end
@@ -35,16 +35,16 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
lockall lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 0 setvar VAR_0x8005, DOME_DATA_STREAK
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
setvar VAR_0x8006, 0 setvar VAR_0x8006, FALSE
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 6 setvar VAR_0x8005, DOME_DATA_6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattleDomeFunction special CallBattleDomeFunction
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -73,17 +73,17 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
special LoadPlayerParty special LoadPlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
frontier_checkairshow frontier_checkairshow
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 6 setvar VAR_0x8005, DOME_DATA_6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 7 setvar VAR_0x8005, DOME_DATA_7
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
setvar VAR_0x8006, 1 setvar VAR_0x8006, TRUE
special CallBattleDomeFunction special CallBattleDomeFunction
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
@@ -97,19 +97,19 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
special LoadPlayerParty special LoadPlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
frontier_checkairshow frontier_checkairshow
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
setvar VAR_0x8006, 0 setvar VAR_0x8006, FALSE
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 6 setvar VAR_0x8005, DOME_DATA_6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattleDomeFunction special CallBattleDomeFunction
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
setvar VAR_0x8004, 13 setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattleDomeFunction special CallBattleDomeFunction
playse SE_SAVE playse SE_SAVE
@@ -139,8 +139,8 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT
message BattleFrontier_BattleDomeLobby_Text_24A61A message BattleFrontier_BattleDomeLobby_Text_24A61A
waitmessage waitmessage
setvar VAR_0x8004, 13 setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
setvar VAR_0x8005, 1 setvar VAR_0x8005, CHALLENGE_STATUS_SAVING
special CallBattleDomeFunction special CallBattleDomeFunction
playse SE_SAVE playse SE_SAVE
waitse waitse
@@ -213,7 +213,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, 0 setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT
special CallBattleDomeFunction special CallBattleDomeFunction
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
frontier_set FRONTIER_DATA_PAUSED, FALSE frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -224,13 +224,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
setvar VAR_0x8004, 22 setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_TRAINERS
special CallBattleDomeFunction special CallBattleDomeFunction
BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
special SavePlayerParty special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
setvar VAR_0x8004, 15 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_TRAINERS
special CallBattleDomeFunction special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT
closemessage closemessage
@@ -392,8 +392,8 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
end end
BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
setvar VAR_0x8005, 9 setvar VAR_0x8005, DOME_DATA_9
special CallBattleDomeFunction special CallBattleDomeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
@@ -404,7 +404,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 8 setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE
special CallBattleDomeFunction special CallBattleDomeFunction
waitstate waitstate
end end
@@ -426,7 +426,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
return return
BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
setvar VAR_0x8004, 20 setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_WINNER_NAME
special CallBattleDomeFunction special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC
end end
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+10 -10
View File
@@ -82,7 +82,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
setvar VAR_0x8004, 12 setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
setvar VAR_0x8005, 9 setvar VAR_0x8005, 9
special CallBattleDomeFunction special CallBattleDomeFunction
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A
@@ -90,8 +90,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3 message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3
waitmessage waitmessage
setvar VAR_0x8004, 13 setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
setvar VAR_0x8005, 2 setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
special CallBattleDomeFunction special CallBattleDomeFunction
playse SE_SAVE playse SE_SAVE
waitse waitse
@@ -102,7 +102,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 6 setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO
special CallBattleDomeFunction special CallBattleDomeFunction
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -110,7 +110,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 7 setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE
special CallBattleDomeFunction special CallBattleDomeFunction
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -153,12 +153,12 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
frontier_resetsketch frontier_resetsketch
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
setvar VAR_0x8005, 8 setvar VAR_0x8005, DOME_DATA_8
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 18 setvar VAR_0x8004, BATTLE_DOME_FUNC_REDUCE_PARTY
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 9 setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_ID
special CallBattleDomeFunction special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT
closemessage closemessage
@@ -238,7 +238,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
special HealPlayerParty special HealPlayerParty
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 11 setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE
special CallBattleDomeFunction special CallBattleDomeFunction
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+3 -7
View File
@@ -164,9 +164,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
message BattleFrontier_BattlePalaceBattleRoom_Text_25007E message BattleFrontier_BattlePalaceBattleRoom_Text_25007E
waitmessage waitmessage
setvar VAR_0x8004, 7 palace_save CHALLENGE_STATUS_PAUSED
setvar VAR_0x8005, 2
special CallBattlePalaceFunction
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen 1
@@ -233,8 +231,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
setvar VAR_0x8004, 6 palace_incrementstreak
special CallBattlePalaceFunction
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -269,8 +266,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
setvar VAR_0x8004, 6 palace_incrementstreak
special CallBattlePalaceFunction
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+1 -2
View File
@@ -12,8 +12,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
waitmovement 0 waitmovement 0
lockall lockall
setvar VAR_0x8004, 3 palace_getcomment
special CallBattlePalaceFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
compare VAR_RESULT, 1 compare VAR_RESULT, 1
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+9 -32
View File
@@ -28,14 +28,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
lockall lockall
msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_0x8004, 2 palace_set PALACE_DATA_STREAK, 0
setvar VAR_0x8005, 1 palace_set PALACE_DATA_STREAK_ACTIVE, FALSE
setvar VAR_0x8006, 0
special CallBattlePalaceFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattlePalaceFunction
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
@@ -51,7 +45,6 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838 BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, MSGBOX_DEFAULT
BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT
frontier_givepoints frontier_givepoints
@@ -69,10 +62,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
lockall lockall
message BattleFrontier_BattlePalaceLobby_Text_24E41E message BattleFrontier_BattlePalaceLobby_Text_24E41E
waitmessage waitmessage
setvar VAR_0x8004, 2 palace_set PALACE_DATA_STREAK_ACTIVE, FALSE
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattlePalaceFunction
call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
closemessage closemessage
@@ -84,9 +74,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
frontier_checkairshow frontier_checkairshow
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 7 palace_save 0
setvar VAR_0x8005, 0
special CallBattlePalaceFunction
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
@@ -110,9 +98,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, MSGBOX_DEFAULT
message BattleFrontier_BattlePalaceLobby_Text_24E5F6 message BattleFrontier_BattlePalaceLobby_Text_24E5F6
waitmessage waitmessage
setvar VAR_0x8004, 7 palace_save CHALLENGE_STATUS_SAVING
setvar VAR_0x8005, 1
special CallBattlePalaceFunction
playse SE_SAVE playse SE_SAVE
waitse waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -136,17 +122,14 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956
end end
BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
setvar VAR_0x8004, 1 palace_get PALACE_DATA_PRIZE
setvar VAR_0x8005, 0 compare VAR_RESULT, ITEM_NONE
special CallBattlePalaceFunction
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817 goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817
special SavePlayerParty special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
@@ -189,12 +172,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, 0 palace_init
special CallBattlePalaceFunction palace_set PALACE_DATA_STREAK_ACTIVE, TRUE
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattlePalaceFunction
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
frontier_set FRONTIER_DATA_PAUSED, FALSE frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty special LoadPlayerParty
@@ -245,10 +224,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91 BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
special LoadPlayerParty special LoadPlayerParty
BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94 BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94
msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C
release release
end end
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+2 -2
View File
@@ -72,7 +72,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
special CallBattlePikeFunction special CallBattlePikeFunction
message BattleFrontier_BattlePikeLobby_Text_25C1DF message BattleFrontier_BattlePikeLobby_Text_25C1DF
waitmessage waitmessage
setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePikeFunction special CallBattlePikeFunction
playse SE_SAVE playse SE_SAVE
@@ -97,7 +97,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction special CallBattlePikeFunction
setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePikeFunction special CallBattlePikeFunction
playse SE_SAVE playse SE_SAVE
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+4 -4
View File
@@ -34,8 +34,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
lockall lockall
message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume
waitmessage waitmessage
setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
setvar VAR_0x8005, 1 setvar VAR_0x8005, CHALLENGE_STATUS_SAVING
special CallBattlePikeFunction special CallBattlePikeFunction
playse SE_SAVE playse SE_SAVE
waitse waitse
@@ -124,8 +124,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData
waitmessage waitmessage
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
setvar VAR_0x8005, 2 setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
special CallBattlePikeFunction special CallBattlePikeFunction
playse SE_SAVE playse SE_SAVE
waitse waitse
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+2 -2
View File
@@ -48,7 +48,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03 BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
@@ -141,7 +141,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6 BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+2 -2
View File
@@ -110,7 +110,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
@@ -220,7 +220,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+13 -13
View File
@@ -51,11 +51,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
faceplayer faceplayer
msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattleTowerFunc special CallBattleTowerFunc
@@ -93,7 +93,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
frontier_givepoints frontier_givepoints
msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
call BattleFrontier_BattleTowerLobby_EventScript_23E84D call BattleFrontier_BattleTowerLobby_EventScript_23E84D
setvar VAR_0x8004, BATTLE_TOWER_FUNC_1 setvar VAR_0x8004, BATTLE_TOWER_FUNC_GET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattleTowerFunc special CallBattleTowerFunc
compare VAR_RESULT, 49 compare VAR_RESULT, 49
@@ -111,14 +111,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
setvar VAR_0x8004, BATTLE_TOWER_FUNC_1 setvar VAR_0x8004, BATTLE_TOWER_FUNC_GET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattleTowerFunc special CallBattleTowerFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830 goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830
BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattleTowerFunc special CallBattleTowerFunc
@@ -253,9 +253,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_0 setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattleTowerFunc special CallBattleTowerFunc
@@ -324,9 +324,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_0 setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattleTowerFunc special CallBattleTowerFunc
@@ -396,9 +396,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_0 setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattleTowerFunc special CallBattleTowerFunc
@@ -467,9 +467,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_0 setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
special CallBattleTowerFunc special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattleTowerFunc special CallBattleTowerFunc
include/constants/battle_arena.h
+3 -3
View File
@@ -5,11 +5,11 @@
#define BATTLE_ARENA_FUNC_GET_DATA 1 #define BATTLE_ARENA_FUNC_GET_DATA 1
#define BATTLE_ARENA_FUNC_SET_DATA 2 #define BATTLE_ARENA_FUNC_SET_DATA 2
#define BATTLE_ARENA_FUNC_SAVE 3 #define BATTLE_ARENA_FUNC_SAVE 3
#define BATTLE_ARENA_FUNC_SET_REWARD 4 #define BATTLE_ARENA_FUNC_SET_PRIZE 4
#define BATTLE_ARENA_FUNC_GIVE_REWARD 5 #define BATTLE_ARENA_FUNC_GIVE_PRIZE 5
#define BATTLE_ARENA_FUNC_GET_TRAINER_NAME 6 #define BATTLE_ARENA_FUNC_GET_TRAINER_NAME 6
#define ARENA_DATA_REWARD 0 #define ARENA_DATA_PRIZE 0
#define ARENA_DATA_WIN_STREAK 1 #define ARENA_DATA_WIN_STREAK 1
#define ARENA_DATA_WIN_STREAK_ACTIVE 2 #define ARENA_DATA_WIN_STREAK_ACTIVE 2
include/constants/battle_dome.h
+45
View File
@@ -0,0 +1,45 @@
#ifndef GUARD_CONSTANTS_BATTLE_DOME_H
#define GUARD_CONSTANTS_BATTLE_DOME_H
#define BATTLE_DOME_FUNC_INIT 0
#define BATTLE_DOME_FUNC_GET_DATA 1
#define BATTLE_DOME_FUNC_SET_DATA 2
#define BATTLE_DOME_FUNC_GET_ROUND_TEXT 3
#define BATTLE_DOME_FUNC_GET_OPPONENT_NAME 4
#define BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY 5
#define BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO 6
#define BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE 7
#define BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE 8
#define BATTLE_DOME_FUNC_SET_OPPONENT_ID 9
#define BATTLE_DOME_FUNC_SET_OPPONENT_GFX 10
#define BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE 11
#define BATTLE_DOME_FUNC_RESOLVE_WINNERS 12
#define BATTLE_DOME_FUNC_SAVE 13
#define BATTLE_DOME_FUNC_INCREMENT_STREAK 14
#define BATTLE_DOME_FUNC_SET_TRAINERS 15
#define BATTLE_DOME_FUNC_RESET_SKETCH 16
#define BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS 17
#define BATTLE_DOME_FUNC_REDUCE_PARTY 18
#define BATTLE_DOME_FUNC_COMPARE_SEEDS 19
#define BATTLE_DOME_FUNC_GET_WINNER_NAME 20
#define BATTLE_DOME_FUNC_21 21
#define BATTLE_DOME_FUNC_INIT_TRAINERS 22
#define DOME_DATA_STREAK 0
#define DOME_DATA_STREAK_ACTIVE 1
#define DOME_DATA_2 2
#define DOME_DATA_3 3
#define DOME_DATA_4 4
#define DOME_DATA_5 5
#define DOME_DATA_6 6
#define DOME_DATA_7 7
#define DOME_DATA_8 8
#define DOME_DATA_9 9
#define DOME_ROUND1 0
#define DOME_ROUND2 1
#define DOME_SEMIFINAL 2
#define DOME_FINAL 3
#define DOME_ROUNDS_COUNT 4
#endif //GUARD_CONSTANTS_BATTLE_DOME_H
include/constants/battle_palace.h
+14 -10
View File
@@ -1,15 +1,19 @@
#ifndef GUARD_CONSTANTS_BATTLE_PALACE_H #ifndef GUARD_CONSTANTS_BATTLE_PALACE_H
#define GUARD_CONSTANTS_BATTLE_PALACE_H #define GUARD_CONSTANTS_BATTLE_PALACE_H
#define BATTLE_PALACE_FUNC_0 0 #define BATTLE_PALACE_FUNC_INIT 0
#define BATTLE_PALACE_FUNC_1 1 #define BATTLE_PALACE_FUNC_GET_DATA 1
#define BATTLE_PALACE_FUNC_2 2 #define BATTLE_PALACE_FUNC_SET_DATA 2
#define BATTLE_PALACE_FUNC_3 3 #define BATTLE_PALACE_FUNC_GET_COMMENT_ID 3
#define BATTLE_PALACE_FUNC_4 4 #define BATTLE_PALACE_FUNC_SET_OPPONENT 4
#define BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO 5 #define BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO 5
#define BATTLE_PALACE_FUNC_6 6 #define BATTLE_PALACE_FUNC_INCREMENT_STREAK 6
#define BATTLE_PALACE_FUNC_7 7 #define BATTLE_PALACE_FUNC_SAVE 7
#define BATTLE_PALACE_FUNC_8 8 #define BATTLE_PALACE_FUNC_SET_PRIZE 8
#define BATTLE_PALACE_FUNC_9 9 #define BATTLE_PALACE_FUNC_GIVE_PRIZE 9
#define PALACE_DATA_PRIZE 0
#define PALACE_DATA_STREAK 1
#define PALACE_DATA_STREAK_ACTIVE 2
#endif //GUARD_CONSTANTS_BATTLE_PALACE_H #endif //GUARD_CONSTANTS_BATTLE_PALACE_H
include/constants/battle_pike.h
+1 -1
View File
@@ -35,7 +35,7 @@
#define BATTLE_PIKE_FUNC_GET_ROOM_TYPE 5 #define BATTLE_PIKE_FUNC_GET_ROOM_TYPE 5
#define BATTLE_PIKE_FUNC_6 6 #define BATTLE_PIKE_FUNC_6 6
#define BATTLE_PIKE_FUNC_7 7 #define BATTLE_PIKE_FUNC_7 7
#define BATTLE_PIKE_FUNC_8 8 #define BATTLE_PIKE_FUNC_SAVE 8
#define BATTLE_PIKE_FUNC_NULL_9 9 #define BATTLE_PIKE_FUNC_NULL_9 9
#define BATTLE_PIKE_FUNC_NULL_10 10 #define BATTLE_PIKE_FUNC_NULL_10 10
#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS 11 #define BATTLE_PIKE_FUNC_GET_ROOM_STATUS 11
include/constants/battle_tower.h
+3 -3
View File
@@ -1,9 +1,9 @@
#ifndef GUARD_CONSTANTS_BATTLE_TOWER_H #ifndef GUARD_CONSTANTS_BATTLE_TOWER_H
#define GUARD_CONSTANTS_BATTLE_TOWER_H #define GUARD_CONSTANTS_BATTLE_TOWER_H
#define BATTLE_TOWER_FUNC_0 0 #define BATTLE_TOWER_FUNC_INIT 0
#define BATTLE_TOWER_FUNC_1 1 #define BATTLE_TOWER_FUNC_GET_DATA 1
#define BATTLE_TOWER_FUNC_2 2 #define BATTLE_TOWER_FUNC_SET_DATA 2
#define BATTLE_TOWER_FUNC_CHOOSE_TRAINER 3 #define BATTLE_TOWER_FUNC_CHOOSE_TRAINER 3
#define BATTLE_TOWER_FUNC_4 4 #define BATTLE_TOWER_FUNC_4 4
#define BATTLE_TOWER_FUNC_GIVE_RIBBONS 5 #define BATTLE_TOWER_FUNC_GIVE_RIBBONS 5
include/global.h
+8 -8
View File
@@ -363,18 +363,18 @@ struct BattleFrontier
/*0xD1C*/ u16 domeTotalChampionships[2][2]; /*0xD1C*/ u16 domeTotalChampionships[2][2];
/*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT]; /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT];
/*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][FRONTIER_PARTY_SIZE]; /*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][FRONTIER_PARTY_SIZE];
/*0xDC4*/ u16 field_DC4; /*0xDC4*/ u16 unused_DC4;
/*0xDC6*/ u16 field_DC6; /*0xDC6*/ u16 palacePrize;
/*0xDC8*/ u16 palaceWinStreaks[2][2]; /*0xDC8*/ u16 palaceWinStreaks[2][2];
/*0xDD0*/ u16 palaceRecordWinStreaks[2][2]; /*0xDD0*/ u16 palaceRecordWinStreaks[2][2];
/*0xDD8*/ u16 arenaRewardItem; /*0xDD8*/ u16 arenaPrize;
/*0xDDA*/ u16 arenaWinStreaks[2]; /*0xDDA*/ u16 arenaWinStreaks[2];
/*0xDDE*/ u16 arenaRecordStreaks[2]; /*0xDDE*/ u16 arenaRecordStreaks[2];
/*0xDE2*/ u16 factoryWinStreaks[2][2]; /*0xDE2*/ u16 factoryWinStreaks[2][2];
/*0xDEA*/ u16 factoryRecordWinStreaks[2][2]; /*0xDEA*/ u16 factoryRecordWinStreaks[2][2];
/*0xDF6*/ u16 factoryRentsCount[2][2]; /*0xDF6*/ u16 factoryRentsCount[2][2];
/*0xDFA*/ u16 factoryRecordRentsCount[2][2]; /*0xDFA*/ u16 factoryRecordRentsCount[2][2];
/*0xE02*/ u16 field_E02; /*0xE02*/ u16 pikePrize;
/*0xE04*/ u16 pikeWinStreaks[2]; /*0xE04*/ u16 pikeWinStreaks[2];
/*0xE08*/ u16 pikeRecordStreaks[2]; /*0xE08*/ u16 pikeRecordStreaks[2];
/*0xE0C*/ u16 pikeTotalStreaks[2]; /*0xE0C*/ u16 pikeTotalStreaks[2];
@@ -382,16 +382,16 @@ struct BattleFrontier
/*0xE10*/ u8 pikeHintedRoomType:4; /*0xE10*/ u8 pikeHintedRoomType:4;
/*0xE10*/ u8 pikeHealingRoomsDisabled:1; /*0xE10*/ u8 pikeHealingRoomsDisabled:1;
/*0xE12*/ u16 pikeHeldItemsBackup[FRONTIER_PARTY_SIZE]; /*0xE12*/ u16 pikeHeldItemsBackup[FRONTIER_PARTY_SIZE];
/*0xE18*/ u16 pyramidRewardItem; /*0xE18*/ u16 pyramidPrize;
/*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1A*/ u16 pyramidWinStreaks[2];
/*0xE1E*/ u16 pyramidRecordStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2];
/*0xE22*/ u16 pyramidRandoms[4]; /*0xE22*/ u16 pyramidRandoms[4];
/*0xE2A*/ u8 pyramidTrainerFlags; /*0xE2A*/ u8 pyramidTrainerFlags;
/*0xE2C*/ struct PyramidBag pyramidBag; /*0xE2C*/ struct PyramidBag pyramidBag;
/*0xE68*/ u8 pyramidLightRadius; /*0xE68*/ u8 pyramidLightRadius;
/*0xE6A*/ u16 field_E6A; /*0xE6A*/ u16 verdanturfTentPrize;
/*0xE6C*/ u16 field_E6C; /*0xE6C*/ u16 fallarborTentPrize;
/*0xE6E*/ u16 field_E6E; /*0xE6E*/ u16 slateportTentPrize;
/*0xE70*/ struct RentalMon rentalMons[PARTY_SIZE]; /*0xE70*/ struct RentalMon rentalMons[PARTY_SIZE];
/*0xEB8*/ u16 battlePoints; /*0xEB8*/ u16 battlePoints;
/*0xEBA*/ u16 cardBattlePoints; /*0xEBA*/ u16 cardBattlePoints;
src/battle_arena.c
+17 -17
View File
@@ -33,8 +33,8 @@ static void InitArenaChallenge(void);
static void GetArenaData(void); static void GetArenaData(void);
static void SetArenaData(void); static void SetArenaData(void);
static void SaveArenaChallenge(void); static void SaveArenaChallenge(void);
static void SetArenaRewardItem(void); static void SetArenaPrize(void);
static void GiveArenaRewardItem(void); static void GiveArenaPrize(void);
static void BufferArenaOpponentName(void); static void BufferArenaOpponentName(void);
static void SpriteCb_JudgmentIcon(struct Sprite *sprite); static void SpriteCb_JudgmentIcon(struct Sprite *sprite);
static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler); static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler);
@@ -473,12 +473,12 @@ static void (* const sArenaFunctions[])(void) =
[BATTLE_ARENA_FUNC_GET_DATA] = GetArenaData, [BATTLE_ARENA_FUNC_GET_DATA] = GetArenaData,
[BATTLE_ARENA_FUNC_SET_DATA] = SetArenaData, [BATTLE_ARENA_FUNC_SET_DATA] = SetArenaData,
[BATTLE_ARENA_FUNC_SAVE] = SaveArenaChallenge, [BATTLE_ARENA_FUNC_SAVE] = SaveArenaChallenge,
[BATTLE_ARENA_FUNC_SET_REWARD] = SetArenaRewardItem, [BATTLE_ARENA_FUNC_SET_PRIZE] = SetArenaPrize,
[BATTLE_ARENA_FUNC_GIVE_REWARD] = GiveArenaRewardItem, [BATTLE_ARENA_FUNC_GIVE_PRIZE] = GiveArenaPrize,
[BATTLE_ARENA_FUNC_GET_TRAINER_NAME] = BufferArenaOpponentName, [BATTLE_ARENA_FUNC_GET_TRAINER_NAME] = BufferArenaOpponentName,
}; };
static const u16 sShortStreakRewardItems[] = static const u16 sShortStreakPrizeItems[] =
{ {
ITEM_HP_UP, ITEM_HP_UP,
ITEM_PROTEIN, ITEM_PROTEIN,
@@ -488,7 +488,7 @@ static const u16 sShortStreakRewardItems[] =
ITEM_ZINC, ITEM_ZINC,
}; };
static const u16 sLongStreakRewardItems[] = static const u16 sLongStreakPrizeItems[] =
{ {
ITEM_BRIGHT_POWDER, ITEM_BRIGHT_POWDER,
ITEM_WHITE_HERB, ITEM_WHITE_HERB,
@@ -810,8 +810,8 @@ static void GetArenaData(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case ARENA_DATA_REWARD: case ARENA_DATA_PRIZE:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaRewardItem; gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaPrize;
break; break;
case ARENA_DATA_WIN_STREAK: case ARENA_DATA_WIN_STREAK:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode];
@@ -831,8 +831,8 @@ static void SetArenaData(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case ARENA_DATA_REWARD: case ARENA_DATA_PRIZE:
gSaveBlock2Ptr->frontier.arenaRewardItem = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.arenaPrize = gSpecialVar_0x8006;
break; break;
case ARENA_DATA_WIN_STREAK: case ARENA_DATA_WIN_STREAK:
gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] = gSpecialVar_0x8006;
@@ -864,22 +864,22 @@ static void SaveArenaChallenge(void)
SaveGameFrontier(); SaveGameFrontier();
} }
static void SetArenaRewardItem(void) static void SetArenaPrize(void)
{ {
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
if (gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] > 41) if (gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] > 41)
gSaveBlock2Ptr->frontier.arenaRewardItem = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)]; gSaveBlock2Ptr->frontier.arenaPrize = sLongStreakPrizeItems[Random() % ARRAY_COUNT(sLongStreakPrizeItems)];
else else
gSaveBlock2Ptr->frontier.arenaRewardItem = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)]; gSaveBlock2Ptr->frontier.arenaPrize = sShortStreakPrizeItems[Random() % ARRAY_COUNT(sShortStreakPrizeItems)];
} }
static void GiveArenaRewardItem(void) static void GiveArenaPrize(void)
{ {
if (AddBagItem(gSaveBlock2Ptr->frontier.arenaRewardItem, 1) == TRUE) if (AddBagItem(gSaveBlock2Ptr->frontier.arenaPrize, 1) == TRUE)
{ {
CopyItemName(gSaveBlock2Ptr->frontier.arenaRewardItem, gStringVar1); CopyItemName(gSaveBlock2Ptr->frontier.arenaPrize, gStringVar1);
gSaveBlock2Ptr->frontier.arenaRewardItem = ITEM_NONE; gSaveBlock2Ptr->frontier.arenaPrize = ITEM_NONE;
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
else else
src/battle_dome.c
+63 -69
View File
@@ -30,6 +30,7 @@
#include "scanline_effect.h" #include "scanline_effect.h"
#include "script_pokemon_util_80F87D8.h" #include "script_pokemon_util_80F87D8.h"
#include "graphics.h" #include "graphics.h"
#include "constants/battle_dome.h"
#include "constants/frontier_util.h" #include "constants/frontier_util.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/moves.h" #include "constants/moves.h"
@@ -39,13 +40,6 @@
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#define DOME_ROUND1 0
#define DOME_ROUND2 1
#define DOME_QUARTERFINAL 1 // Different name for the same round.
#define DOME_SEMIFINAL 2
#define DOME_FINAL 3
#define DOME_ROUNDS_COUNT 4
struct BattleDomeStruct struct BattleDomeStruct
{ {
u8 arr[DOME_TOURNAMENT_TRAINERS_COUNT]; u8 arr[DOME_TOURNAMENT_TRAINERS_COUNT];
@@ -107,9 +101,9 @@ static void SetDomeOpponentId(void);
static void SetDomeOpponentGraphicsId(void); static void SetDomeOpponentGraphicsId(void);
static void ShowNonInteractiveDomeTourneyTree(void); static void ShowNonInteractiveDomeTourneyTree(void);
static void ResolveDomeRoundWinners(void); static void ResolveDomeRoundWinners(void);
static void sub_81902F8(void); static void SaveDomeChallenge(void);
static void UpdateDomeStreaks(void); static void IncrementDomeStreaks(void);
static void RestoreDomePlayerParty(void); static void ResetSketchedMoves(void);
static void RestoreDomePlayerPartyHeldItems(void); static void RestoreDomePlayerPartyHeldItems(void);
static void ReduceDomePlayerPartyTo3Mons(void); static void ReduceDomePlayerPartyTo3Mons(void);
static void GetPlayerSeededBeforeOpponent(void); static void GetPlayerSeededBeforeOpponent(void);
@@ -1079,29 +1073,29 @@ static const u8 sTourneyTreeTrainerIds[] = {0, 8, 12, 4, 7, 15, 11, 3, 2, 10, 14
static void (* const sBattleDomeFunctions[])(void) = static void (* const sBattleDomeFunctions[])(void) =
{ {
InitDomeChallenge, [BATTLE_DOME_FUNC_INIT] = InitDomeChallenge,
GetDomeData, [BATTLE_DOME_FUNC_GET_DATA] = GetDomeData,
SetDomeData, [BATTLE_DOME_FUNC_SET_DATA] = SetDomeData,
BufferDomeRoundText, [BATTLE_DOME_FUNC_GET_ROUND_TEXT] = BufferDomeRoundText,
BufferDomeOpponentName, [BATTLE_DOME_FUNC_GET_OPPONENT_NAME] = BufferDomeOpponentName,
InitDomeOpponentParty, [BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY] = InitDomeOpponentParty,
ShowDomeOpponentInfo, [BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO] = ShowDomeOpponentInfo,
ShowDomeTourneyTree, [BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE] = ShowDomeTourneyTree,
ShowPreviousDomeResultsTourneyTree, [BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE] = ShowPreviousDomeResultsTourneyTree,
SetDomeOpponentId, [BATTLE_DOME_FUNC_SET_OPPONENT_ID] = SetDomeOpponentId,
SetDomeOpponentGraphicsId, [BATTLE_DOME_FUNC_SET_OPPONENT_GFX] = SetDomeOpponentGraphicsId,
ShowNonInteractiveDomeTourneyTree, [BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE] = ShowNonInteractiveDomeTourneyTree,
ResolveDomeRoundWinners, [BATTLE_DOME_FUNC_RESOLVE_WINNERS] = ResolveDomeRoundWinners,
sub_81902F8, [BATTLE_DOME_FUNC_SAVE] = SaveDomeChallenge,
UpdateDomeStreaks, [BATTLE_DOME_FUNC_INCREMENT_STREAK] = IncrementDomeStreaks,
InitDomeFacilityTrainersAndMons, [BATTLE_DOME_FUNC_SET_TRAINERS] = InitDomeFacilityTrainersAndMons,
RestoreDomePlayerParty, [BATTLE_DOME_FUNC_RESET_SKETCH] = ResetSketchedMoves,
RestoreDomePlayerPartyHeldItems, [BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS] = RestoreDomePlayerPartyHeldItems,
ReduceDomePlayerPartyTo3Mons, [BATTLE_DOME_FUNC_REDUCE_PARTY] = ReduceDomePlayerPartyTo3Mons,
GetPlayerSeededBeforeOpponent, [BATTLE_DOME_FUNC_COMPARE_SEEDS] = GetPlayerSeededBeforeOpponent,
BufferLastDomeWinnerName, [BATTLE_DOME_FUNC_GET_WINNER_NAME] = BufferLastDomeWinnerName,
sub_8194F58, [BATTLE_DOME_FUNC_21] = sub_8194F58,
InitDomeTrainers, [BATTLE_DOME_FUNC_INIT_TRAINERS] = InitDomeTrainers,
}; };
static const u32 sWinStreakFlags[][2] = static const u32 sWinStreakFlags[][2] =
@@ -2280,25 +2274,25 @@ static void GetDomeData(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case DOME_DATA_STREAK:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode];
break; break;
case 1: case DOME_DATA_STREAK_ACTIVE:
gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]) != 0); gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]) != 0);
break; break;
case 2: case DOME_DATA_2:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_0; gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_0;
break; break;
case 3: case DOME_DATA_3:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_1; gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_1;
break; break;
case 4: case DOME_DATA_4:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_2; gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_2;
break; break;
case 5: case DOME_DATA_5:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_3; gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_3;
break; break;
case 6: case DOME_DATA_6:
if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES) if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
{ {
if (lvlMode) if (lvlMode)
@@ -2314,7 +2308,7 @@ static void GetDomeData(void)
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_0; gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_0;
} }
break; break;
case 7: case DOME_DATA_7:
if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES) if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
{ {
if (lvlMode) if (lvlMode)
@@ -2330,12 +2324,12 @@ static void GetDomeData(void)
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_2; gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_2;
} }
break; break;
case 8: case DOME_DATA_8:
ClearSelectedPartyOrder(); ClearSelectedPartyOrder();
gSelectedOrderFromParty[0] = gSaveBlock2Ptr->frontier.selectedPartyMons[3]; gSelectedOrderFromParty[0] = gSaveBlock2Ptr->frontier.selectedPartyMons[3];
gSelectedOrderFromParty[1] = gSaveBlock2Ptr->frontier.selectedPartyMons[3] >> 8; gSelectedOrderFromParty[1] = gSaveBlock2Ptr->frontier.selectedPartyMons[3] >> 8;
break; break;
case 9: case DOME_DATA_9:
gSpecialVar_Result = (gSaveBlock2Ptr->frontier.field_D0A * 2) - 3 + gSaveBlock2Ptr->frontier.field_D0B; gSpecialVar_Result = (gSaveBlock2Ptr->frontier.field_D0A * 2) - 3 + gSaveBlock2Ptr->frontier.field_D0B;
break; break;
} }
@@ -2348,28 +2342,28 @@ static void SetDomeData(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case DOME_DATA_STREAK:
gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006;
break; break;
case 1: case DOME_DATA_STREAK_ACTIVE:
if (gSpecialVar_0x8006) if (gSpecialVar_0x8006)
gSaveBlock2Ptr->frontier.winStreakActiveFlags |= sWinStreakFlags[battleMode][lvlMode]; gSaveBlock2Ptr->frontier.winStreakActiveFlags |= sWinStreakFlags[battleMode][lvlMode];
else else
gSaveBlock2Ptr->frontier.winStreakActiveFlags &= sWinStreakMasks[battleMode][lvlMode]; gSaveBlock2Ptr->frontier.winStreakActiveFlags &= sWinStreakMasks[battleMode][lvlMode];
break; break;
case 2: case DOME_DATA_2:
gSaveBlock2Ptr->frontier.field_D08_0 = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.field_D08_0 = gSpecialVar_0x8006;
break; break;
case 3: case DOME_DATA_3:
gSaveBlock2Ptr->frontier.field_D08_1 = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.field_D08_1 = gSpecialVar_0x8006;
break; break;
case 4: case DOME_DATA_4:
gSaveBlock2Ptr->frontier.field_D08_2 = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.field_D08_2 = gSpecialVar_0x8006;
break; break;
case 5: case DOME_DATA_5:
gSaveBlock2Ptr->frontier.field_D08_3 = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.field_D08_3 = gSpecialVar_0x8006;
break; break;
case 6: case DOME_DATA_6:
if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES) if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
{ {
if (lvlMode) if (lvlMode)
@@ -2385,7 +2379,7 @@ static void SetDomeData(void)
gSaveBlock2Ptr->frontier.field_D08_0 = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.field_D08_0 = gSpecialVar_0x8006;
} }
break; break;
case 7: case DOME_DATA_7:
if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES) if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
{ {
if (lvlMode) if (lvlMode)
@@ -2401,7 +2395,7 @@ static void SetDomeData(void)
gSaveBlock2Ptr->frontier.field_D08_2 = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.field_D08_2 = gSpecialVar_0x8006;
} }
break; break;
case 8: case DOME_DATA_8:
gSaveBlock2Ptr->frontier.selectedPartyMons[3] = T1_READ_16(gSelectedOrderFromParty); gSaveBlock2Ptr->frontier.selectedPartyMons[3] = T1_READ_16(gSelectedOrderFromParty);
break; break;
} }
@@ -2411,7 +2405,7 @@ static void InitDomeTrainers(void)
{ {
int i, j, k; int i, j, k;
int monLevel; int monLevel;
int species[3]; int species[FRONTIER_PARTY_SIZE];
int monTypesBits, monTypesCount; int monTypesBits, monTypesCount;
int trainerId; int trainerId;
int monSetId; int monSetId;
@@ -2472,7 +2466,7 @@ static void InitDomeTrainers(void)
gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId = trainerId; gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId = trainerId;
} }
for (j = 0; j < 3; j++) for (j = 0; j < FRONTIER_PARTY_SIZE; j++)
{ {
// Make sure the mon is valid. // Make sure the mon is valid.
do do
@@ -2528,7 +2522,7 @@ static void InitDomeTrainers(void)
monTypesBits = 0; monTypesBits = 0;
statSums[i] = 0; statSums[i] = 0;
ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
for (j = 0; j < 3; j++) for (j = 0; j < FRONTIER_PARTY_SIZE; j++)
{ {
CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species, CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species,
monLevel, ivs, monLevel, ivs,
@@ -2595,7 +2589,7 @@ static void InitDomeTrainers(void)
gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId = TRAINER_FRONTIER_BRAIN; gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId = TRAINER_FRONTIER_BRAIN;
} }
for (i = 0; i < 3; i++) for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
gSaveBlock2Ptr->frontier.domeMonIds[j][i] = GetFrontierBrainMonSpecies(i); gSaveBlock2Ptr->frontier.domeMonIds[j][i] = GetFrontierBrainMonSpecies(i);
} }
@@ -2765,14 +2759,14 @@ int GetDomeTrainerMonCountInBits(u16 tournamentTrainerId)
static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1)
{ {
int i, moveId, playerMonId; int i, moveId, playerMonId;
int array[3]; int array[FRONTIER_PARTY_SIZE];
for (i = 0; i < 3; i++) for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{ {
array[i] = 0; array[i] = 0;
for (moveId = 0; moveId < MAX_MON_MOVES; moveId++) for (moveId = 0; moveId < MAX_MON_MOVES; moveId++)
{ {
for (playerMonId = 0; playerMonId < 3; playerMonId++) for (playerMonId = 0; playerMonId < FRONTIER_PARTY_SIZE; playerMonId++)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN) if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN)
{ {
@@ -2793,14 +2787,14 @@ static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1)
static int sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) static int sub_818FDB8(u16 tournamentTrainerId, bool8 arg1)
{ {
int i, moveId, playerMonId; int i, moveId, playerMonId;
int array[3]; int array[FRONTIER_PARTY_SIZE];
for (i = 0; i < 3; i++) for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{ {
array[i] = 0; array[i] = 0;
for (moveId = 0; moveId < MAX_MON_MOVES; moveId++) for (moveId = 0; moveId < MAX_MON_MOVES; moveId++)
{ {
for (playerMonId = 0; playerMonId < 3; playerMonId++) for (playerMonId = 0; playerMonId < FRONTIER_PARTY_SIZE; playerMonId++)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN) if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN)
{ {
@@ -3327,7 +3321,7 @@ static void SetDomeOpponentGraphicsId(void)
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
} }
static void sub_81902F8(void) static void SaveDomeChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
VarSet(VAR_TEMP_0, 0); VarSet(VAR_TEMP_0, 0);
@@ -3335,7 +3329,7 @@ static void sub_81902F8(void)
SaveGameFrontier(); SaveGameFrontier();
} }
static void UpdateDomeStreaks(void) static void IncrementDomeStreaks(void)
{ {
u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -5937,7 +5931,7 @@ static void InitDomeFacilityTrainersAndMons(void)
gFacilityTrainers = gBattleFrontierTrainers; gFacilityTrainers = gBattleFrontierTrainers;
} }
static void RestoreDomePlayerParty(void) static void ResetSketchedMoves(void)
{ {
int i, moveSlot; int i, moveSlot;
@@ -6005,7 +5999,7 @@ static void sub_8194F58(void)
{ {
int i, j, k; int i, j, k;
int monLevel; int monLevel;
int species[3]; int species[FRONTIER_PARTY_SIZE];
int monTypesBits; int monTypesBits;
int trainerId; int trainerId;
int monSetId; int monSetId;
@@ -6021,7 +6015,7 @@ static void sub_8194F58(void)
return; return;
statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT); statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT);
statValues = AllocZeroed(sizeof(int) * 6); statValues = AllocZeroed(sizeof(int) * NUM_STATS);
lvlMode = gSaveBlock2Ptr->frontier.lvlMode; lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
gSaveBlock2Ptr->frontier.lvlMode = 0; gSaveBlock2Ptr->frontier.lvlMode = 0;
// This one, I'd like to call a 'C fakematching'. // This one, I'd like to call a 'C fakematching'.
@@ -6050,7 +6044,7 @@ static void sub_8194F58(void)
} while (j != i); } while (j != i);
gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId = trainerId; gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId = trainerId;
for (j = 0; j < 3; j++) for (j = 0; j < FRONTIER_PARTY_SIZE; j++)
{ {
// Make sure the mon is valid. // Make sure the mon is valid.
do do
@@ -6081,7 +6075,7 @@ static void sub_8194F58(void)
monTypesBits = 0; monTypesBits = 0;
statSums[i] = 0; statSums[i] = 0;
ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
for (j = 0; j < 3; j++) for (j = 0; j < FRONTIER_PARTY_SIZE; j++)
{ {
CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species, CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species,
monLevel, ivs, monLevel, ivs,
src/battle_factory.c
+3 -3
View File
@@ -23,7 +23,7 @@ static bool8 sPerformedRentalSwap;
static void InitFactoryChallenge(void); static void InitFactoryChallenge(void);
static void GetBattleFactoryData(void); static void GetBattleFactoryData(void);
static void SetBattleFactoryData(void); static void SetBattleFactoryData(void);
static void sub_81A613C(void); static void SaveFactoryChallenge(void);
static void nullsub_75(void); static void nullsub_75(void);
static void nullsub_123(void); static void nullsub_123(void);
static void SelectInitialRentalMons(void); static void SelectInitialRentalMons(void);
@@ -116,7 +116,7 @@ static void (* const sBattleFactoryFunctions[])(void) =
InitFactoryChallenge, InitFactoryChallenge,
GetBattleFactoryData, GetBattleFactoryData,
SetBattleFactoryData, SetBattleFactoryData,
sub_81A613C, SaveFactoryChallenge,
nullsub_75, nullsub_75,
nullsub_123, nullsub_123,
SelectInitialRentalMons, SelectInitialRentalMons,
@@ -253,7 +253,7 @@ static void SetBattleFactoryData(void)
} }
} }
static void sub_81A613C(void) static void SaveFactoryChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
VarSet(VAR_TEMP_0, 0); VarSet(VAR_TEMP_0, 0);
src/battle_palace.c
+62 -42
View File
@@ -14,34 +14,54 @@
#include "constants/trainers.h" #include "constants/trainers.h"
// This file's functions. // This file's functions.
static void sub_8195980(void); static void InitPalaceChallenge(void);
static void sub_8195A38(void); static void GetPalaceData(void);
static void sub_8195AE4(void); static void SetPalaceData(void);
static void sub_8195BB0(void); static void GetPalaceCommentId(void);
static void sub_8195C20(void); static void SetPalaceOpponent(void);
static void BufferOpponentIntroSpeech(void); static void BufferOpponentIntroSpeech(void);
static void sub_8195C7C(void); static void IncrementPalaceStreak(void);
static void sub_8195CE4(void); static void SavePalaceChallenge(void);
static void sub_8195D28(void); static void SetRandomPalacePrize(void);
static void sub_8195DB8(void); static void GivePalacePrize(void);
// Const rom data. // Const rom data.
static void (* const sBattlePalaceFunctions[])(void) = static void (* const sBattlePalaceFunctions[])(void) =
{ {
[BATTLE_PALACE_FUNC_0] = sub_8195980, [BATTLE_PALACE_FUNC_INIT] = InitPalaceChallenge,
[BATTLE_PALACE_FUNC_1] = sub_8195A38, [BATTLE_PALACE_FUNC_GET_DATA] = GetPalaceData,
[BATTLE_PALACE_FUNC_2] = sub_8195AE4, [BATTLE_PALACE_FUNC_SET_DATA] = SetPalaceData,
[BATTLE_PALACE_FUNC_3] = sub_8195BB0, [BATTLE_PALACE_FUNC_GET_COMMENT_ID] = GetPalaceCommentId,
[BATTLE_PALACE_FUNC_4] = sub_8195C20, [BATTLE_PALACE_FUNC_SET_OPPONENT] = SetPalaceOpponent,
[BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO] = BufferOpponentIntroSpeech, [BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO] = BufferOpponentIntroSpeech,
[BATTLE_PALACE_FUNC_6] = sub_8195C7C, [BATTLE_PALACE_FUNC_INCREMENT_STREAK] = IncrementPalaceStreak,
[BATTLE_PALACE_FUNC_7] = sub_8195CE4, [BATTLE_PALACE_FUNC_SAVE] = SavePalaceChallenge,
[BATTLE_PALACE_FUNC_8] = sub_8195D28, [BATTLE_PALACE_FUNC_SET_PRIZE] = SetRandomPalacePrize,
[BATTLE_PALACE_FUNC_9] = sub_8195DB8, [BATTLE_PALACE_FUNC_GIVE_PRIZE] = GivePalacePrize,
}; };
static const u16 gUnknown_0860DE78[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC}; static const u16 sBattlePalaceEarlyPrizes[] =
static const u16 gUnknown_0860DE84[] = {ITEM_BRIGHT_POWDER, ITEM_WHITE_HERB, ITEM_QUICK_CLAW, ITEM_LEFTOVERS, ITEM_MENTAL_HERB, ITEM_KINGS_ROCK, ITEM_FOCUS_BAND, ITEM_SCOPE_LENS, ITEM_CHOICE_BAND}; {
ITEM_HP_UP,
ITEM_PROTEIN,
ITEM_IRON,
ITEM_CALCIUM,
ITEM_CARBOS,
ITEM_ZINC
};
static const u16 sBattlePalaceLatePrizes[] =
{
ITEM_BRIGHT_POWDER,
ITEM_WHITE_HERB,
ITEM_QUICK_CLAW,
ITEM_LEFTOVERS,
ITEM_MENTAL_HERB,
ITEM_KINGS_ROCK,
ITEM_FOCUS_BAND,
ITEM_SCOPE_LENS,
ITEM_CHOICE_BAND
};
static const u32 sWinStreakFlags[][2] = static const u32 sWinStreakFlags[][2] =
{ {
@@ -61,7 +81,7 @@ void CallBattlePalaceFunction(void)
sBattlePalaceFunctions[gSpecialVar_0x8004](); sBattlePalaceFunctions[gSpecialVar_0x8004]();
} }
static void sub_8195980(void) static void InitPalaceChallenge(void)
{ {
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -77,39 +97,39 @@ static void sub_8195980(void)
gTrainerBattleOpponent_A = 0; gTrainerBattleOpponent_A = 0;
} }
static void sub_8195A38(void) static void GetPalaceData(void)
{ {
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case PALACE_DATA_PRIZE:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_DC6; gSpecialVar_Result = gSaveBlock2Ptr->frontier.palacePrize;
break; break;
case 1: case PALACE_DATA_STREAK:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode];
break; break;
case 2: case PALACE_DATA_STREAK_ACTIVE:
gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]) != 0); gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]) != 0);
break; break;
} }
} }
static void sub_8195AE4(void) static void SetPalaceData(void)
{ {
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case PALACE_DATA_PRIZE:
gSaveBlock2Ptr->frontier.field_DC6 = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.palacePrize = gSpecialVar_0x8006;
break; break;
case 1: case PALACE_DATA_STREAK:
gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006;
break; break;
case 2: case PALACE_DATA_STREAK_ACTIVE:
if (gSpecialVar_0x8006) if (gSpecialVar_0x8006)
gSaveBlock2Ptr->frontier.winStreakActiveFlags |= sWinStreakFlags[battleMode][lvlMode]; gSaveBlock2Ptr->frontier.winStreakActiveFlags |= sWinStreakFlags[battleMode][lvlMode];
else else
@@ -118,7 +138,7 @@ static void sub_8195AE4(void)
} }
} }
static void sub_8195BB0(void) static void GetPalaceCommentId(void)
{ {
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
@@ -131,7 +151,7 @@ static void sub_8195BB0(void)
gSpecialVar_Result = 4; gSpecialVar_Result = 4;
} }
static void sub_8195C20(void) static void SetPalaceOpponent(void)
{ {
gTrainerBattleOpponent_A = 5 *(Random() % 255) / 64u; gTrainerBattleOpponent_A = 5 *(Random() % 255) / 64u;
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
@@ -143,7 +163,7 @@ static void BufferOpponentIntroSpeech(void)
FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore); FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
} }
static void sub_8195C7C(void) static void IncrementPalaceStreak(void)
{ {
u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -158,7 +178,7 @@ static void sub_8195C7C(void)
} }
} }
static void sub_8195CE4(void) static void SavePalaceChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
VarSet(VAR_TEMP_0, 0); VarSet(VAR_TEMP_0, 0);
@@ -166,23 +186,23 @@ static void sub_8195CE4(void)
SaveGameFrontier(); SaveGameFrontier();
} }
static void sub_8195D28(void) static void SetRandomPalacePrize(void)
{ {
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] > 41) if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] > 41)
gSaveBlock2Ptr->frontier.field_DC6 = gUnknown_0860DE84[Random() % ARRAY_COUNT(gUnknown_0860DE84)]; gSaveBlock2Ptr->frontier.palacePrize = sBattlePalaceLatePrizes[Random() % ARRAY_COUNT(sBattlePalaceLatePrizes)];
else else
gSaveBlock2Ptr->frontier.field_DC6 = gUnknown_0860DE78[Random() % ARRAY_COUNT(gUnknown_0860DE78)]; gSaveBlock2Ptr->frontier.palacePrize = sBattlePalaceEarlyPrizes[Random() % ARRAY_COUNT(sBattlePalaceEarlyPrizes)];
} }
static void sub_8195DB8(void) static void GivePalacePrize(void)
{ {
if (AddBagItem(gSaveBlock2Ptr->frontier.field_DC6, 1) == TRUE) if (AddBagItem(gSaveBlock2Ptr->frontier.palacePrize, 1) == TRUE)
{ {
CopyItemName(gSaveBlock2Ptr->frontier.field_DC6, gStringVar1); CopyItemName(gSaveBlock2Ptr->frontier.palacePrize, gStringVar1);
gSaveBlock2Ptr->frontier.field_DC6 = 0; gSaveBlock2Ptr->frontier.palacePrize = 0;
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
else else
src/battle_pike.c
+5 -5
View File
@@ -57,7 +57,7 @@ static void SetupRoomEventObjects(void);
static void GetRoomType(void); static void GetRoomType(void);
static void sub_81A7400(void); static void sub_81A7400(void);
static void sub_81A740C(void); static void sub_81A740C(void);
static void sub_81A7418(void); static void SavePikeChallenge(void);
static void nullsub_76(void); static void nullsub_76(void);
static void nullsub_124(void); static void nullsub_124(void);
static void GetRoomInflictedStatus(void); static void GetRoomInflictedStatus(void);
@@ -488,7 +488,7 @@ static void (* const sBattlePikeFunctions[])(void) =
[BATTLE_PIKE_FUNC_GET_ROOM_TYPE] = GetRoomType, [BATTLE_PIKE_FUNC_GET_ROOM_TYPE] = GetRoomType,
[BATTLE_PIKE_FUNC_6] = sub_81A7400, [BATTLE_PIKE_FUNC_6] = sub_81A7400,
[BATTLE_PIKE_FUNC_7] = sub_81A740C, [BATTLE_PIKE_FUNC_7] = sub_81A740C,
[BATTLE_PIKE_FUNC_8] = sub_81A7418, [BATTLE_PIKE_FUNC_SAVE] = SavePikeChallenge,
[BATTLE_PIKE_FUNC_NULL_9] = nullsub_76, [BATTLE_PIKE_FUNC_NULL_9] = nullsub_76,
[BATTLE_PIKE_FUNC_NULL_10] = nullsub_124, [BATTLE_PIKE_FUNC_NULL_10] = nullsub_124,
[BATTLE_PIKE_FUNC_GET_ROOM_STATUS] = GetRoomInflictedStatus, [BATTLE_PIKE_FUNC_GET_ROOM_STATUS] = GetRoomInflictedStatus,
@@ -624,7 +624,7 @@ static void GetBattlePikeData(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case 0:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E02; gSpecialVar_Result = gSaveBlock2Ptr->frontier.pikePrize;
break; break;
case 1: case 1:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.pikeWinStreaks[gSaveBlock2Ptr->frontier.lvlMode]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.pikeWinStreaks[gSaveBlock2Ptr->frontier.lvlMode];
@@ -651,7 +651,7 @@ static void SetBattlePikeData(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case 0:
gSaveBlock2Ptr->frontier.field_E02 = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.pikePrize = gSpecialVar_0x8006;
break; break;
case 1: case 1:
if (gSpecialVar_0x8006 <= MAX_STREAK) if (gSpecialVar_0x8006 <= MAX_STREAK)
@@ -707,7 +707,7 @@ static void sub_81A740C(void)
sUnknown_0300128E = FALSE; sUnknown_0300128E = FALSE;
} }
static void sub_81A7418(void) static void SavePikeChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
VarSet(VAR_TEMP_0, 0); VarSet(VAR_TEMP_0, 0);
src/battle_pyramid.c
+16 -16
View File
@@ -71,9 +71,9 @@ struct PyramidTrainerEncounterMusic
static void InitPyramidChallenge(void); static void InitPyramidChallenge(void);
static void GetBattlePyramidData(void); static void GetBattlePyramidData(void);
static void SetBattlePyramidData(void); static void SetBattlePyramidData(void);
static void sub_81A9134(void); static void SavePyramidChallenge(void);
static void SetBattlePyramidRewardItem(void); static void SetBattlePyramidPrize(void);
static void GiveBattlePyramidRewardItem(void); static void GiveBattlePyramidPrize(void);
static void SeedPyramidFloor(void); static void SeedPyramidFloor(void);
static void SetPickupItem(void); static void SetPickupItem(void);
static void HidePyramidItem(void); static void HidePyramidItem(void);
@@ -790,9 +790,9 @@ static void (* const sBattlePyramidFunctions[])(void) =
InitPyramidChallenge, InitPyramidChallenge,
GetBattlePyramidData, GetBattlePyramidData,
SetBattlePyramidData, SetBattlePyramidData,
sub_81A9134, SavePyramidChallenge,
SetBattlePyramidRewardItem, SetBattlePyramidPrize,
GiveBattlePyramidRewardItem, GiveBattlePyramidPrize,
SeedPyramidFloor, SeedPyramidFloor,
SetPickupItem, SetPickupItem,
HidePyramidItem, HidePyramidItem,
@@ -869,7 +869,7 @@ static void GetBattlePyramidData(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case 0:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidRewardItem; gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidPrize;
break; break;
case 1: case 1:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode];
@@ -902,7 +902,7 @@ static void SetBattlePyramidData(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case 0:
gSaveBlock2Ptr->frontier.pyramidRewardItem = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.pyramidPrize = gSpecialVar_0x8006;
break; break;
case 1: case 1:
gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] = gSpecialVar_0x8006;
@@ -929,7 +929,7 @@ static void SetBattlePyramidData(void)
} }
} }
static void sub_81A9134(void) static void SavePyramidChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
VarSet(VAR_TEMP_0, 0); VarSet(VAR_TEMP_0, 0);
@@ -938,22 +938,22 @@ static void sub_81A9134(void)
TrySavingData(SAVE_LINK); TrySavingData(SAVE_LINK);
} }
static void SetBattlePyramidRewardItem(void) static void SetBattlePyramidPrize(void)
{ {
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] > 41) if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] > 41)
gSaveBlock2Ptr->frontier.pyramidRewardItem = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)]; gSaveBlock2Ptr->frontier.pyramidPrize = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)];
else else
gSaveBlock2Ptr->frontier.pyramidRewardItem = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)]; gSaveBlock2Ptr->frontier.pyramidPrize = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)];
} }
static void GiveBattlePyramidRewardItem(void) static void GiveBattlePyramidPrize(void)
{ {
if (AddBagItem(gSaveBlock2Ptr->frontier.pyramidRewardItem, 1) == TRUE) if (AddBagItem(gSaveBlock2Ptr->frontier.pyramidPrize, 1) == TRUE)
{ {
CopyItemName(gSaveBlock2Ptr->frontier.pyramidRewardItem, gStringVar1); CopyItemName(gSaveBlock2Ptr->frontier.pyramidPrize, gStringVar1);
gSaveBlock2Ptr->frontier.pyramidRewardItem = 0; gSaveBlock2Ptr->frontier.pyramidPrize = 0;
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
else else
src/battle_tent.c
+89 -88
View File
@@ -15,31 +15,32 @@
#include "constants/layouts.h" #include "constants/layouts.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/trainers.h"
// This file's functions. // This file's functions.
static void sub_81B99D4(void); static void InitVerdanturfTentChallenge(void);
static void sub_81B9A28(void); static void GetVerdanturfTentPrize(void);
static void sub_81B9A44(void); static void SetVerdanturfTentPrize(void);
static void sub_81B9A60(void); static void SetVerdanturfTentTrainerGfx(void);
static void sub_81B9A90(void); static void BufferVerdanturfTentTrainerIntro(void);
static void sub_81B9ABC(void); static void SaveVerdanturfTentChallenge(void);
static void sub_81B9B00(void); static void SetRandomVerdanturfTentPrize(void);
static void sub_81B9B28(void); static void GiveVerdanturfTentPrize(void);
static void sub_81B9BA0(void); static void InitFallarborTentChallenge(void);
static void sub_81B9BF4(void); static void GetFallarborTentPrize(void);
static void sub_81B9C10(void); static void SetFallarborTentPrize(void);
static void sub_81B9C2C(void); static void SaveFallarborTentChallenge(void);
static void sub_81B9C70(void); static void SetRandomFallarborTentPrize(void);
static void sub_81B9C98(void); static void GiveFallarborTentPrize(void);
static void sub_81B9CF0(void); static void BufferFallarborTentTrainerName(void);
static void sub_81B9D28(void); static void InitSlateportTentChallenge(void);
static void sub_81B9D7C(void); static void GetSlateportTentPrize(void);
static void sub_81B9D98(void); static void SetSlateportTentPrize(void);
static void sub_81B9DB4(void); static void SaveSlateportTentChallenge(void);
static void sub_81B9DF8(void); static void SetRandomSlateportTentPrize(void);
static void sub_81B9E20(void); static void GiveSlateportTentPrize(void);
static void sub_81B9E78(void); static void SelectInitialRentalMons(void);
static void sub_81B9E88(void); static void SwapRentalMons(void);
static void sub_81BA040(void); static void sub_81BA040(void);
static void sub_81B9EC0(void); static void sub_81B9EC0(void);
@@ -49,41 +50,41 @@ static u16 sRandMonSetId;
// const rom data // const rom data
void static (*const sVerdanturfTentFuncs[])(void) = void static (*const sVerdanturfTentFuncs[])(void) =
{ {
sub_81B99D4, InitVerdanturfTentChallenge,
sub_81B9A28, GetVerdanturfTentPrize,
sub_81B9A44, SetVerdanturfTentPrize,
sub_81B9A60, SetVerdanturfTentTrainerGfx,
sub_81B9A90, BufferVerdanturfTentTrainerIntro,
sub_81B9ABC, SaveVerdanturfTentChallenge,
sub_81B9B00, SetRandomVerdanturfTentPrize,
sub_81B9B28 GiveVerdanturfTentPrize
}; };
static const u16 sVerdanturfTentRewards[] = {ITEM_NEST_BALL}; static const u16 sVerdanturfTentRewards[] = {ITEM_NEST_BALL};
void static (*const sFallarborTentFuncs[])(void) = void static (*const sFallarborTentFuncs[])(void) =
{ {
sub_81B9BA0, InitFallarborTentChallenge,
sub_81B9BF4, GetFallarborTentPrize,
sub_81B9C10, SetFallarborTentPrize,
sub_81B9C2C, SaveFallarborTentChallenge,
sub_81B9C70, SetRandomFallarborTentPrize,
sub_81B9C98, GiveFallarborTentPrize,
sub_81B9CF0 BufferFallarborTentTrainerName
}; };
static const u16 sFallarborTentRewards[] = {ITEM_HYPER_POTION}; static const u16 sFallarborTentRewards[] = {ITEM_HYPER_POTION};
void static (*const sSlateportTentFuncs[])(void) = void static (*const sSlateportTentFuncs[])(void) =
{ {
sub_81B9D28, InitSlateportTentChallenge,
sub_81B9D7C, GetSlateportTentPrize,
sub_81B9D98, SetSlateportTentPrize,
sub_81B9DB4, SaveSlateportTentChallenge,
sub_81B9DF8, SetRandomSlateportTentPrize,
sub_81B9E20, GiveSlateportTentPrize,
sub_81B9E78, SelectInitialRentalMons,
sub_81B9E88, SwapRentalMons,
sub_81BA040, sub_81BA040,
sub_81B9EC0 sub_81B9EC0
}; };
@@ -96,7 +97,7 @@ void CallVerdanturfTentFunction(void)
sVerdanturfTentFuncs[gSpecialVar_0x8004](); sVerdanturfTentFuncs[gSpecialVar_0x8004]();
} }
static void sub_81B99D4(void) static void InitVerdanturfTentChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.challengeStatus = 0;
gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
@@ -104,29 +105,29 @@ static void sub_81B99D4(void)
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
} }
static void sub_81B9A28(void) static void GetVerdanturfTentPrize(void)
{ {
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6A; gSpecialVar_Result = gSaveBlock2Ptr->frontier.verdanturfTentPrize;
} }
static void sub_81B9A44(void) static void SetVerdanturfTentPrize(void)
{ {
gSaveBlock2Ptr->frontier.field_E6A = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.verdanturfTentPrize = gSpecialVar_0x8006;
} }
static void sub_81B9A60(void) static void SetVerdanturfTentTrainerGfx(void)
{ {
gTrainerBattleOpponent_A = (u32)((Random() % 255) * 5) / 64; gTrainerBattleOpponent_A = (u32)((Random() % 255) * 5) / 64;
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
} }
static void sub_81B9A90(void) static void BufferVerdanturfTentTrainerIntro(void)
{ {
if (gTrainerBattleOpponent_A < 300) if (gTrainerBattleOpponent_A < TRAINER_RECORD_MIXING_FRIEND)
FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore); FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
} }
static void sub_81B9ABC(void) static void SaveVerdanturfTentChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
VarSet(VAR_TEMP_0, 0); VarSet(VAR_TEMP_0, 0);
@@ -134,17 +135,17 @@ static void sub_81B9ABC(void)
SaveGameFrontier(); SaveGameFrontier();
} }
static void sub_81B9B00(void) static void SetRandomVerdanturfTentPrize(void)
{ {
gSaveBlock2Ptr->frontier.field_E6A = sVerdanturfTentRewards[Random() % ARRAY_COUNT(sVerdanturfTentRewards)]; gSaveBlock2Ptr->frontier.verdanturfTentPrize = sVerdanturfTentRewards[Random() % ARRAY_COUNT(sVerdanturfTentRewards)];
} }
static void sub_81B9B28(void) static void GiveVerdanturfTentPrize(void)
{ {
if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6A, 1) == TRUE) if (AddBagItem(gSaveBlock2Ptr->frontier.verdanturfTentPrize, 1) == TRUE)
{ {
CopyItemName(gSaveBlock2Ptr->frontier.field_E6A, gStringVar1); CopyItemName(gSaveBlock2Ptr->frontier.verdanturfTentPrize, gStringVar1);
gSaveBlock2Ptr->frontier.field_E6A = ITEM_NONE; gSaveBlock2Ptr->frontier.verdanturfTentPrize = ITEM_NONE;
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
else else
@@ -158,7 +159,7 @@ void CallFallarborTentFunction(void)
sFallarborTentFuncs[gSpecialVar_0x8004](); sFallarborTentFuncs[gSpecialVar_0x8004]();
} }
static void sub_81B9BA0(void) static void InitFallarborTentChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.challengeStatus = 0;
gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
@@ -166,17 +167,17 @@ static void sub_81B9BA0(void)
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
} }
static void sub_81B9BF4(void) static void GetFallarborTentPrize(void)
{ {
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6C; gSpecialVar_Result = gSaveBlock2Ptr->frontier.fallarborTentPrize;
} }
static void sub_81B9C10(void) static void SetFallarborTentPrize(void)
{ {
gSaveBlock2Ptr->frontier.field_E6C = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.fallarborTentPrize = gSpecialVar_0x8006;
} }
static void sub_81B9C2C(void) static void SaveFallarborTentChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
VarSet(VAR_TEMP_0, 0); VarSet(VAR_TEMP_0, 0);
@@ -184,17 +185,17 @@ static void sub_81B9C2C(void)
SaveGameFrontier(); SaveGameFrontier();
} }
static void sub_81B9C70(void) static void SetRandomFallarborTentPrize(void)
{ {
gSaveBlock2Ptr->frontier.field_E6C = sFallarborTentRewards[Random() % ARRAY_COUNT(sFallarborTentRewards)]; gSaveBlock2Ptr->frontier.fallarborTentPrize = sFallarborTentRewards[Random() % ARRAY_COUNT(sFallarborTentRewards)];
} }
static void sub_81B9C98(void) static void GiveFallarborTentPrize(void)
{ {
if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6C, 1) == TRUE) if (AddBagItem(gSaveBlock2Ptr->frontier.fallarborTentPrize, 1) == TRUE)
{ {
CopyItemName(gSaveBlock2Ptr->frontier.field_E6C, gStringVar1); CopyItemName(gSaveBlock2Ptr->frontier.fallarborTentPrize, gStringVar1);
gSaveBlock2Ptr->frontier.field_E6C = ITEM_NONE; gSaveBlock2Ptr->frontier.fallarborTentPrize = ITEM_NONE;
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
else else
@@ -203,7 +204,7 @@ static void sub_81B9C98(void)
} }
} }
static void sub_81B9CF0(void) static void BufferFallarborTentTrainerName(void)
{ {
GetFrontierTrainerName(gStringVar1, gTrainerBattleOpponent_A); GetFrontierTrainerName(gStringVar1, gTrainerBattleOpponent_A);
} }
@@ -213,7 +214,7 @@ void CallSlateportTentFunction(void)
sSlateportTentFuncs[gSpecialVar_0x8004](); sSlateportTentFuncs[gSpecialVar_0x8004]();
} }
static void sub_81B9D28(void) static void InitSlateportTentChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.challengeStatus = 0;
gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
@@ -221,17 +222,17 @@ static void sub_81B9D28(void)
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
} }
static void sub_81B9D7C(void) static void GetSlateportTentPrize(void)
{ {
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6E; gSpecialVar_Result = gSaveBlock2Ptr->frontier.slateportTentPrize;
} }
static void sub_81B9D98(void) static void SetSlateportTentPrize(void)
{ {
gSaveBlock2Ptr->frontier.field_E6E = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.slateportTentPrize = gSpecialVar_0x8006;
} }
static void sub_81B9DB4(void) static void SaveSlateportTentChallenge(void)
{ {
gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
VarSet(VAR_TEMP_0, 0); VarSet(VAR_TEMP_0, 0);
@@ -239,17 +240,17 @@ static void sub_81B9DB4(void)
SaveGameFrontier(); SaveGameFrontier();
} }
static void sub_81B9DF8(void) static void SetRandomSlateportTentPrize(void)
{ {
gSaveBlock2Ptr->frontier.field_E6E = sSlateportTentRewards[Random() % ARRAY_COUNT(sSlateportTentRewards)]; gSaveBlock2Ptr->frontier.slateportTentPrize = sSlateportTentRewards[Random() % ARRAY_COUNT(sSlateportTentRewards)];
} }
static void sub_81B9E20(void) static void GiveSlateportTentPrize(void)
{ {
if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6E, 1) == TRUE) if (AddBagItem(gSaveBlock2Ptr->frontier.slateportTentPrize, 1) == TRUE)
{ {
CopyItemName(gSaveBlock2Ptr->frontier.field_E6E, gStringVar1); CopyItemName(gSaveBlock2Ptr->frontier.slateportTentPrize, gStringVar1);
gSaveBlock2Ptr->frontier.field_E6E = ITEM_NONE; gSaveBlock2Ptr->frontier.slateportTentPrize = ITEM_NONE;
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
else else
@@ -258,13 +259,13 @@ static void sub_81B9E20(void)
} }
} }
static void sub_81B9E78(void) static void SelectInitialRentalMons(void)
{ {
ZeroPlayerPartyMons(); ZeroPlayerPartyMons();
DoBattleFactorySelectScreen(); DoBattleFactorySelectScreen();
} }
static void sub_81B9E88(void) static void SwapRentalMons(void)
{ {
DoBattleFactorySwapScreen(); DoBattleFactorySwapScreen();
} }
src/battle_tower.c
+12 -12
View File
@@ -45,13 +45,13 @@ EWRAM_DATA const struct FacilityMon *gFacilityTrainerMons = NULL;
u16 gUnknown_03006298[4]; u16 gUnknown_03006298[4];
// This file's functions. // This file's functions.
static void sub_8161F94(void); static void InitTowerChallenge(void);
static void sub_8162054(void); static void GetTowerData(void);
static void sub_81620F4(void); static void SetTowerData(void);
static void ChooseNextBattleTowerTrainer(void); static void ChooseNextBattleTowerTrainer(void);
static void sub_81621C0(void); static void sub_81621C0(void);
static void AwardBattleTowerRibbons(void); static void AwardBattleTowerRibbons(void);
static void SaveBattleTowerProgress(void); static void SaveTowerChallenge(void);
static void sub_8163914(void); static void sub_8163914(void);
static void nullsub_61(void); static void nullsub_61(void);
static void nullsub_116(void); static void nullsub_116(void);
@@ -1056,13 +1056,13 @@ struct
static void (* const sBattleTowerFuncs[])(void) = static void (* const sBattleTowerFuncs[])(void) =
{ {
[BATTLE_TOWER_FUNC_0] = sub_8161F94, [BATTLE_TOWER_FUNC_INIT] = InitTowerChallenge,
[BATTLE_TOWER_FUNC_1] = sub_8162054, [BATTLE_TOWER_FUNC_GET_DATA] = GetTowerData,
[BATTLE_TOWER_FUNC_2] = sub_81620F4, [BATTLE_TOWER_FUNC_SET_DATA] = SetTowerData,
[BATTLE_TOWER_FUNC_CHOOSE_TRAINER] = ChooseNextBattleTowerTrainer, [BATTLE_TOWER_FUNC_CHOOSE_TRAINER] = ChooseNextBattleTowerTrainer,
[BATTLE_TOWER_FUNC_4] = sub_81621C0, [BATTLE_TOWER_FUNC_4] = sub_81621C0,
[BATTLE_TOWER_FUNC_GIVE_RIBBONS] = AwardBattleTowerRibbons, [BATTLE_TOWER_FUNC_GIVE_RIBBONS] = AwardBattleTowerRibbons,
[BATTLE_TOWER_FUNC_SAVE] = SaveBattleTowerProgress, [BATTLE_TOWER_FUNC_SAVE] = SaveTowerChallenge,
[BATTLE_TOWER_FUNC_7] = sub_8163914, [BATTLE_TOWER_FUNC_7] = sub_8163914,
[BATTLE_TOWER_FUNC_NOP] = nullsub_61, [BATTLE_TOWER_FUNC_NOP] = nullsub_61,
[BATTLE_TOWER_FUNC_NOP2] = nullsub_116, [BATTLE_TOWER_FUNC_NOP2] = nullsub_116,
@@ -1154,7 +1154,7 @@ void CallBattleTowerFunc(void)
sBattleTowerFuncs[gSpecialVar_0x8004](); sBattleTowerFuncs[gSpecialVar_0x8004]();
} }
static void sub_8161F94(void) static void InitTowerChallenge(void)
{ {
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -1172,7 +1172,7 @@ static void sub_8161F94(void)
gTrainerBattleOpponent_A = 0; gTrainerBattleOpponent_A = 0;
} }
static void sub_8162054(void) static void GetTowerData(void)
{ {
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -1193,7 +1193,7 @@ static void sub_8162054(void)
} }
} }
static void sub_81620F4(void) static void SetTowerData(void)
{ {
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -2423,7 +2423,7 @@ static void sub_8163EE4(void)
SaveCurrentWinStreak(); SaveCurrentWinStreak();
} }
static void SaveBattleTowerProgress(void) static void SaveTowerChallenge(void)
{ {
u16 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u16 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u16 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u16 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);