Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

Browse Source
This commit is contained in:
ultima-soul committed 2021-04-02 13:16:40 -07:00
2 parents 5bab9474dc 677b4fc394
commit 939608f5b8
263 files changed
+7392 -6499
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

asm/macros/event.inc
+26 -24
View File
@@ -846,38 +846,40 @@
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoice x:req, y:req, list:req, b:req
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoice x:req, y:req, multichoiceId:req, ignoreBPress:req
.byte 0x6f
.byte \x
.byte \y
.byte \list
.byte \b
.byte \multichoiceId
.byte \ignoreBPress
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. The default argument determines
@ the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00.
@ If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoicedefault x:req, y:req, list:req, default:req, b:req
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
@ The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00.
@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoicedefault x:req, y:req, multichoiceId:req, default:req, ignoreBPress:req
.byte 0x70
.byte \x
.byte \y
.byte \list
.byte \multichoiceId
.byte \default
.byte \b
.byte \ignoreBPress
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list.
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
@ The per_row argument determines how many list items will be shown on a single row of the box.
.macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req
@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoicegrid x:req, y:req, multichoiceId:req, per_row:req, ignoreBPress:req
.byte 0x71
.byte \x
.byte \y
.byte \list
.byte \multichoiceId
.byte \per_row
.byte \B
.byte \ignoreBPress
.endm
@ Nopped in Emerald.
@@ -886,21 +888,21 @@
.endm
@ Nopped in Emerald, but still consumes parameters.
.macro erasebox byte1:req, byte2:req, byte3:req, byte4:req
.macro erasebox left:req, top:req, right:req, bottom:req
.byte 0x73
.byte \byte1
.byte \byte2
.byte \byte3
.byte \byte4
.byte \left
.byte \top
.byte \right
.byte \bottom
.endm
@ Nopped in Emerald, but still consumes parameters.
.macro drawboxtext byte1:req, byte2:req, byte3:req, byte4:req
.macro drawboxtext left:req, top:req, multichoiceId:req, ignoreBPress:req
.byte 0x74
.byte \byte1
.byte \byte2
.byte \byte3
.byte \byte4
.byte \left
.byte \top
.byte \multichoiceId
.byte \ignoreBPress
.endm
@ Displays a box containing the front sprite for the specified (species) Pokemon species.
asm/macros/map.inc
+5 -5
View File
@@ -51,25 +51,25 @@
inc _num_traps
.endm
.macro bg_event x, y, elevation, kind, arg6, arg7, arg8
.macro bg_event x, y, elevation, kind, arg6, arg7
.2byte \x, \y
.byte \elevation, \kind
.2byte 0
.if \kind < 5
.if \kind != BG_EVENT_HIDDEN_ITEM
.4byte \arg6
.else
.2byte \arg6
.byte \arg7, \arg8
.2byte \arg7
.endif
inc _num_signs
.endm
.macro bg_hidden_item_event x, y, height, item, flag
bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0
bg_event \x, \y, \height, BG_EVENT_HIDDEN_ITEM, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START)
.endm
.macro bg_secret_base_event x, y, height, secret_base_id
bg_event \x, \y, \height, 8, \secret_base_id, 0, 0
bg_event \x, \y, \height, BG_EVENT_SECRET_BASE, \secret_base_id
.endm
.macro map_events npcs, warps, traps, signs
berry_fix/payload/include/gba/defines.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GUARD_GBA_DEFINES
#define GUARD_GBA_DEFINES
#ifndef GUARD_GBA_DEFINES_H
#define GUARD_GBA_DEFINES_H
#include <stddef.h>
@@ -84,4 +84,4 @@
#define RGB_CYAN RGB(0, 31, 31)
#define RGB_WHITEALPHA (RGB_WHITE | 0x8000)
#endif // GUARD_GBA_DEFINES
#endif // GUARD_GBA_DEFINES_H
common_syms/text.txt
+2 -2
View File
@@ -1,4 +1,4 @@
gFonts
gUnknown_03002F84
gUnknown_03002F90
gDisableTextPrinters
gCurGlyph
gTextFlags
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+6 -6
View File
@@ -155,7 +155,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle
@@ -164,7 +164,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8257768
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge
@@ -174,7 +174,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @
BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle:: @ 825779E
message BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle
@@ -194,7 +194,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge:: @ 82577DA
BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge:: @ 8257808
message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost
@@ -264,7 +264,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta
case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle
@@ -273,7 +273,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord:: @ 825792B
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta
case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+4 -4
View File
@@ -84,7 +84,7 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge
message BattleFrontier_BattleArenaLobby_Text_RecordLastMatch
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge
case 0, BattleFrontier_BattleArenaLobby_EventScript_RecordMatch
@@ -116,7 +116,7 @@ BattleFrontier_BattleArenaLobby_EventScript_Attendant:: @ 8255DF4
BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge:: @ 8255E0B
message BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge
case 1, BattleFrontier_BattleArenaLobby_EventScript_ExplainChallenge
@@ -126,7 +126,7 @@ BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge:: @ 8255E0B
BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47
message BattleFrontier_BattleArenaLobby_Text_WhichLevelMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
@@ -325,7 +325,7 @@ BattleFrontier_BattleArenaLobby_EventScript_RulesBoard:: @ 82560CA
BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard:: @ 82560D9
message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading
waitmessage
multichoice 17, 2, MULTI_BATTLE_ARENA_RULES, 0
multichoice 17, 2, MULTI_BATTLE_ARENA_RULES, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaLobby_EventScript_BattleRules
case 1, BattleFrontier_BattleArenaLobby_EventScript_MindRules
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+4 -4
View File
@@ -92,7 +92,7 @@ BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle:: @ 8249991
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
message BattleFrontier_BattleDomeLobby_Text_RecordLastMatch
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
case 0, BattleFrontier_BattleDomeLobby_EventScript_RecordBattle
@@ -147,7 +147,7 @@ BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: @ 8249A72
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge
case 1, BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge
@@ -157,7 +157,7 @@ BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: @ 8249A72
BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge:: @ 8249ABF
message BattleFrontier_BattleDomeLobby_Text_WhichLevelMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
@@ -427,7 +427,7 @@ BattleFrontier_BattleDomeLobby_EventScript_RulesBoard:: @ 8249E34
BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard:: @ 8249E43
message BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading
waitmessage
multichoice 17, 4, MULTI_BATTLE_DOME_RULES, 0
multichoice 17, 4, MULTI_BATTLE_DOME_RULES, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup
case 1, BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+4 -4
View File
@@ -33,7 +33,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord
multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1
multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree
@@ -44,7 +44,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B
case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord:: @ 824B2C1
multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, 1
multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree
@@ -56,7 +56,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord:
BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle:: @ 824B30D
message BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle
@@ -76,7 +76,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge:: @ 824B349
BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge:: @ 824B377
message BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+4 -4
View File
@@ -83,7 +83,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
case 0, BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle
@@ -136,7 +136,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge:: @ 8258606
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge
case 1, BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge
@@ -146,7 +146,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge:: @ 8258606
BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge:: @ 8258653
message BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
@@ -293,7 +293,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_RulesBoard:: @ 8258839
BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard:: @ 8258848
message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
waitmessage
multichoice 17, 0, MULTI_BATTLE_FACTORY_RULES, 0
multichoice 17, 0, MULTI_BATTLE_FACTORY_RULES, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryLobby_EventScript_RulesBasics
case 1, BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapPartner
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+6 -6
View File
@@ -105,7 +105,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle
@@ -114,7 +114,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8259CC6
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge
@@ -124,7 +124,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecor
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle:: @ 8259CFC
message BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle
@@ -144,7 +144,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge:: @ 8259
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge:: @ 8259D66
message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
@@ -396,7 +396,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle
@@ -405,7 +405,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B
case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord:: @ 825A110
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+6 -6
View File
@@ -113,7 +113,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle
@@ -122,7 +122,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98
case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 824FA42
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge
@@ -132,7 +132,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord::
BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle:: @ 824FA78
message BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle
@@ -152,7 +152,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge:: @ 824FAB4
BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge:: @ 824FAE2
message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
@@ -189,7 +189,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser
case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle
@@ -198,7 +198,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord:: @ 824FBD0
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser
case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+4 -4
View File
@@ -85,7 +85,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
message BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
case 0, BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch
@@ -139,7 +139,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge:: @ 824D999
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge
case 1, BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge
@@ -149,7 +149,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge:: @ 824D999
BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6
message BattleFrontier_BattlePalaceLobby_Text_WhichChallenge
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
@@ -351,7 +351,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_RulesBoard:: @ 824DCA6
BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard:: @ 824DCB5
message BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading
waitmessage
multichoice 16, 0, MULTI_BATTLE_PALACE_RULES, 0
multichoice 16, 0, MULTI_BATTLE_PALACE_RULES, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceLobby_EventScript_RulesBasics
case 1, BattleFrontier_BattlePalaceLobby_EventScript_RulesNature
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+3 -3
View File
@@ -101,7 +101,7 @@ BattleFrontier_BattlePikeLobby_EventScript_Attendant:: @ 825B868
BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge:: @ 825B87F
message BattleFrontier_BattlePikeLobby_Text_TakeChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge
case 1, BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge
@@ -111,7 +111,7 @@ BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge:: @ 825B87F
BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
message BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
@@ -236,7 +236,7 @@ BattleFrontier_BattlePikeLobby_EventScript_RulesBoard:: @ 825BAC6
BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard:: @ 825BAD5
message BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading
waitmessage
multichoice 16, 4, MULTI_BATTLE_PIKE_RULES, 0
multichoice 16, 4, MULTI_BATTLE_PIKE_RULES, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag
case 1, BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+1 -1
View File
@@ -143,7 +143,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge:: @ 825CA2A
BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge:: @ 825CA5A
message BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattlePike_EventScript_Retire
release
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+5 -5
View File
@@ -115,7 +115,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_Attendant:: @ 82508B1
BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge:: @ 82508C8
message BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge
case 1, BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge
@@ -125,7 +125,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge:: @ 82508C8
BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904
message BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
@@ -218,7 +218,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_HintGiver:: @ 8250ACE
end
BattleFrontier_BattlePyramidLobby_EventScript_GiveHint:: @ 8250AF0
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50
case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen
@@ -446,7 +446,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag:: @ 82
@ When exiting Battle Pyramid with a full pyramid bag and held items the player must select to keep/toss party held items and make room for any kept items by tossing from the pyramid bag
BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep:: @ 8250E09
multichoice 17, 6, MULTI_FRONTIER_ITEM_CHOOSE, 0
multichoice 17, 6, MULTI_FRONTIER_ITEM_CHOOSE, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag
case 1, BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty
@@ -500,7 +500,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard:: @ 8250E95
BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard:: @ 8250EA4
message BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading
waitmessage
multichoice 15, 2, MULTI_BATTLE_PYRAMID_RULES, 0
multichoice 15, 2, MULTI_BATTLE_PYRAMID_RULES, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon
case 1, BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+6 -6
View File
@@ -82,7 +82,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle
@@ -91,7 +91,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8241D0A
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
@@ -101,7 +101,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @
BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle:: @ 8241D40
message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle
@@ -121,7 +121,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge:: @ 8241D7C
BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge
@@ -224,7 +224,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle
@@ -233,7 +233,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8241F79
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+12 -12
View File
@@ -135,7 +135,7 @@ BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle:: @ 823E84D
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle
message BattleFrontier_BattleTowerLobby_Text_RecordLastMatch
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle
case 0, BattleFrontier_EventScript_SaveBattle
@@ -187,7 +187,7 @@ BattleFrontier_BattleTowerLobby_EventScript_SinglesAttendant:: @ 823E936
BattleFrontier_BattleTowerLobby_EventScript_AskEnterSinglesChallenge:: @ 823E948
message BattleFrontier_BattleTowerLobby_Text_TakeSinglesChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge
case 1, BattleFrontier_BattleTowerLobby_EventScript_ExplainSinglesChallenge
@@ -198,7 +198,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge:: @ 823E984
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
@@ -253,7 +253,7 @@ BattleFrontier_BattleTowerLobby_EventScript_DoublesAttendant:: @ 823EA9F
BattleFrontier_BattleTowerLobby_EventScript_AskEnterDoublesChallenge:: @ 823EAB1
message BattleFrontier_BattleTowerLobby_Text_TakeDoublesChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge
case 1, BattleFrontier_BattleTowerLobby_EventScript_ExplainDoublesChallenge
@@ -264,7 +264,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge:: @ 823EAED
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
@@ -320,7 +320,7 @@ BattleFrontier_BattleTowerLobby_EventScript_MultisAttendant:: @ 823EC08
BattleFrontier_BattleTowerLobby_EventScript_AskEnterMultisChallenge:: @ 823EC1D
message BattleFrontier_BattleTowerLobby_Text_TakeMultisChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge
case 1, BattleFrontier_BattleTowerLobby_EventScript_ExplainMultisChallenge
@@ -331,7 +331,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge:: @ 823EC59
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
@@ -386,7 +386,7 @@ BattleFrontier_BattleTowerLobby_EventScript_LinkMultisAttendant:: @ 823ED74
BattleFrontier_BattleTowerLobby_EventScript_AskEnterLinkMultisChallenge:: @ 823ED86
message BattleFrontier_BattleTowerLobby_Text_TakeLinkMultisChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge
case 1, BattleFrontier_BattleTowerLobby_EventScript_ExplainLinkMultisChallenge
@@ -397,7 +397,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge:: @ 823E
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode
waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0
multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
@@ -446,7 +446,7 @@ BattleFrontier_BattleTowerLobby_EventScript_FeelingsMan:: @ 823EEE7
faceplayer
message BattleFrontier_BattleTowerLobby_Text_DescribeFeelingsAboutBattleTower
waitmessage
multichoice 16, 4, MULTI_BATTLE_TOWER_FEELINGS, 0
multichoice 16, 4, MULTI_BATTLE_TOWER_FEELINGS, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_FeelingsBattleNow
case 1, BattleFrontier_BattleTowerLobby_EventScript_FeelingsIWon
@@ -879,7 +879,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink:: @ 823F3E8
BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader:: @ 823F3F3
message CableClub_Text_ChooseGroupLeaderOfTwo
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup
case 1, BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader
@@ -935,7 +935,7 @@ BattleFrontier_BattleTowerLobby_EventScript_RulesBoard:: @ 823F4BE
BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard:: @ 823F4CD
message BattleFrontier_BattleTowerLobby_Text_ReadWhichHeading
waitmessage
multichoice 17, 2, MULTI_BATTLE_TOWER_RULES, 0
multichoice 17, 2, MULTI_BATTLE_TOWER_RULES, FALSE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_RulesTower
case 1, BattleFrontier_BattleTowerLobby_EventScript_RulesMons
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+8 -8
View File
@@ -155,7 +155,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle
@@ -164,7 +164,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8
case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord:: @ 82491B1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge
@@ -174,7 +174,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoReco
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle:: @ 82491E7
message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle
@@ -194,7 +194,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge:: @ 8249
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge:: @ 8249251
message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost
@@ -324,7 +324,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg:: @ 824941
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink:: @ 8249417
goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord
multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1
multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink
@@ -333,7 +333,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink::
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord:: @ 8249457
multichoice 20, 8, MULTI_GO_ON_RETIRE, 1
multichoice 20, 8, MULTI_GO_ON_RETIRE, TRUE
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink
@@ -355,7 +355,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink:: @
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink:: @ 82494A8
message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
@@ -367,7 +367,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink:: @ 82
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink:: @ 82494DD
message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink
goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
+2 -2
View File
@@ -86,7 +86,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant:: @ 8243E7A
faceplayer
message BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge
msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2, MSGBOX_DEFAULT
@@ -175,7 +175,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner::
waitbuttonpress
tower_dopartnermsg PARTNER_MSGID_MON2_ASK
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner
case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner
data/maps/BattleFrontier_Lounge3/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ BattleFrontier_Lounge3_EventScript_AskToEnterChallenge:: @ 8261DAF
end
BattleFrontier_Lounge3_EventScript_ChooseBetAmount:: @ 8261DE9
multichoice 20, 4, MULTI_FRONTIER_GAMBLER_BET, 0
multichoice 20, 4, MULTI_FRONTIER_GAMBLER_BET, FALSE
copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
switch VAR_RESULT
case FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_Bet5
data/maps/BattleFrontier_OutsideWest/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ BattleFrontier_OutsideWest_EventScript_FerryAttendant:: @ 823D3F0
end
BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination:: @ 823D416
multichoicedefault 18, 6, MULTI_SSTIDAL_BATTLE_FRONTIER, 2, 0
multichoicedefault 18, 6, MULTI_SSTIDAL_BATTLE_FRONTIER, 2, FALSE
switch VAR_RESULT
case 0, BattleFrontier_OutsideWest_EventScript_FerryToSlateport
case 1, BattleFrontier_OutsideWest_EventScript_FerryToLilycove
data/maps/BattleFrontier_ReceptionGate/scripts.inc
+2 -2
View File
@@ -218,7 +218,7 @@ BattleFrontier_ReceptionGate_EventScript_RulesGuide:: @ 8266436
BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout:: @ 8266446
message BattleFrontier_ReceptionGate_Text_LearnAboutWhat
waitmessage
multichoice 15, 0, MULTI_FRONTIER_RULES, 0
multichoice 15, 0, MULTI_FRONTIER_RULES, FALSE
switch VAR_RESULT
case 0, BattleFrontier_ReceptionGate_EventScript_LevelMode
case 1, BattleFrontier_ReceptionGate_EventScript_Level50
@@ -269,7 +269,7 @@ BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide:: @ 82664F4
BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout:: @ 8266504
message BattleFrontier_ReceptionGate_Text_LearnAboutWhich1
waitmessage
multichoice 16, 4, MULTI_FRONTIER_PASS_INFO, 0
multichoice 16, 4, MULTI_FRONTIER_PASS_INFO, FALSE
switch VAR_RESULT
case 0, BattleFrontier_ReceptionGate_EventScript_Symbols
case 1, BattleFrontier_ReceptionGate_EventScript_RecordBattle
data/maps/CaveOfOrigin_B1F/scripts.inc
+1 -1
View File
@@ -24,7 +24,7 @@ CaveOfOrigin_B1F_EventScript_Wallace:: @ 82357A9
goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
CaveOfOrigin_B1F_EventScript_WheresRayquaza:: @ 82357F0
multichoice 0, 0, MULTI_WHERES_RAYQUAZA, 0
multichoice 0, 0, MULTI_WHERES_RAYQUAZA, FALSE
switch VAR_RESULT
case 0, CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin
case 1, CaveOfOrigin_B1F_EventScript_AtMtPyre
data/maps/DewfordTown/scripts.inc
+2 -2
View File
@@ -24,7 +24,7 @@ DewfordTown_EventScript_Briney:: @ 81E9511
goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_ReturnToPetalburgPrompt
message DewfordTown_Text_WhereAreWeBound
waitmessage
multichoicedefault 21, 6, MULTI_BRINEY_ON_DEWFORD, 2, 0
multichoicedefault 21, 6, MULTI_BRINEY_ON_DEWFORD, 2, FALSE
switch VAR_RESULT
case 0, DewfordTown_EventScript_ChoosePetalburg
case 1, DewfordTown_EventScript_ChooseSlateport
@@ -109,7 +109,7 @@ DewfordTown_EventScript_NotGettingItchToFish:: @ 81E9620
DewfordTown_EventScript_HowsFishing:: @ 81E962A
message DewfordTown_Text_HowsYourFishing
waitmessage
multichoice 20, 8, MULTI_HOWS_FISHING, 1
multichoice 20, 8, MULTI_HOWS_FISHING, TRUE
compare VAR_RESULT, 0
goto_if_eq DewfordTown_EventScript_FishingExcellent
compare VAR_RESULT, 1
data/maps/DewfordTown_Hall/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ DewfordTown_Hall_EventScript_Girl:: @ 81FD4D0
lock
faceplayer
call Common_EventScript_BufferTrendyPhrase
special TrendyPhraseIsOld
special IsTrendyPhraseBoring
compare VAR_RESULT, TRUE
goto_if_eq DewfordTown_Hall_EventScript_GirlBoredOfTrend
msgbox DewfordTown_Hall_Text_CantImagineLifeWithoutTrend, MSGBOX_DEFAULT
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+2 -2
View File
@@ -107,7 +107,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 8200A2A
call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent
compare VAR_RESULT, 2
call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge
case 1, FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge
@@ -123,7 +123,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge:: @ 8200A78
FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 8200AA6
message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
case 0, FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost
data/maps/FallarborTown_BattleTentLobby/scripts.inc
+2 -2
View File
@@ -113,7 +113,7 @@ FallarborTown_BattleTentLobby_EventScript_Attendant:: @ 8200001
FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8200021
message FallarborTown_BattleTentLobby_Text_TakeChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge
case 1, FallarborTown_BattleTentLobby_EventScript_ExplainChallenge
@@ -266,7 +266,7 @@ FallarborTown_BattleTentLobby_EventScript_RulesBoard:: @ 820024F
FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 820025E
message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading
waitmessage
multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, 0
multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, FALSE
switch VAR_RESULT
case 0, FallarborTown_BattleTentLobby_EventScript_RulesLevel
case 1, FallarborTown_BattleTentLobby_EventScript_RulesBattle
data/maps/FortreeCity_House2/scripts.inc
+3 -3
View File
@@ -7,15 +7,15 @@ FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB
goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_ExplainHiddenPower
call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_Greeting
msgbox FortreeCity_House2_Text_CoinInWhichHand, MSGBOX_DEFAULT
multichoice 21, 8, MULTI_RIGHTLEFT, 1
multichoice 21, 8, MULTI_RIGHTLEFT, TRUE
switch VAR_RESULT
case 1, FortreeCity_House2_EventScript_WrongGuess
msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand, MSGBOX_DEFAULT
multichoice 21, 8, MULTI_RIGHTLEFT, 1
multichoice 21, 8, MULTI_RIGHTLEFT, TRUE
switch VAR_RESULT
case 1, FortreeCity_House2_EventScript_WrongGuess
msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand2, MSGBOX_DEFAULT
multichoice 21, 8, MULTI_RIGHTLEFT, 1
multichoice 21, 8, MULTI_RIGHTLEFT, TRUE
switch VAR_RESULT
case 0, FortreeCity_House2_EventScript_WrongGuess
msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT
data/maps/LilycoveCity_ContestLobby/scripts.inc
+5 -5
View File
@@ -638,7 +638,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806
LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest:: @ 821A819
message LilycoveCity_ContestLobby_Text_EnterContest3
waitmessage
multichoice 0, 0, MULTI_ENTERINFO, 0
multichoice 0, 0, MULTI_ENTERINFO, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest
case 1, LilycoveCity_ContestLobby_EventScript_LinkContestInfo
@@ -656,7 +656,7 @@ LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest:: @ 821A856
message LilycoveCity_ContestLobby_Text_WhichContestMode
waitmessage
specialvar VAR_TEMP_D, IsWirelessAdapterConnected
multichoice 0, 0, MULTI_LINK_CONTEST_MODE, 0
multichoice 0, 0, MULTI_LINK_CONTEST_MODE, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_EmeraldMode @ Shortened to E-Mode
case 1, LilycoveCity_ContestLobby_EventScript_GlobalMode @ Shortened to G-Mode
@@ -679,7 +679,7 @@ LilycoveCity_ContestLobby_EventScript_GlobalMode:: @ 821A8C6
LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType:: @ 821A8DC
message LilycoveCity_ContestLobby_Text_EnterWhichContest3
waitmessage
multichoice 0, 0, MULTI_CONTEST_TYPE, 0
multichoice 0, 0, MULTI_CONTEST_TYPE, FALSE
switch VAR_RESULT
case CONTEST_CATEGORIES_COUNT, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
@@ -690,7 +690,7 @@ LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType:: @ 821A8DC
LilycoveCity_ContestLobby_EventScript_LinkContestInfo:: @ 821A90D
message LilycoveCity_ContestLobby_Text_WhichTopic2
waitmessage
multichoice 0, 0, MULTI_LINK_CONTEST_INFO, 0
multichoice 0, 0, MULTI_LINK_CONTEST_INFO, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_ExplainLinkContest
case 1, LilycoveCity_ContestLobby_EventScript_ExplainEMode
@@ -885,7 +885,7 @@ LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest:: @ 821ABA0
LilycoveCity_ContestLobby_EventScript_DecideLinkLeader:: @ 821ABA6
message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_TryJoinGroup
case 1, LilycoveCity_ContestLobby_EventScript_TryLeadGroup
data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+5 -5
View File
@@ -22,27 +22,27 @@ LilycoveCity_DepartmentStoreElevator_EventScript_Attendant:: @ 8220624
@ Below scripts ensure the cursor for floor select always starts on the current floor
LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th:: @ 8220689
multichoicedefault 0, 0, MULTI_FLOORS, 0, 0
multichoicedefault 0, 0, MULTI_FLOORS, 0, FALSE
goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
end
LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th:: @ 8220695
multichoicedefault 0, 0, MULTI_FLOORS, 1, 0
multichoicedefault 0, 0, MULTI_FLOORS, 1, FALSE
goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
end
LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd:: @ 82206A1
multichoicedefault 0, 0, MULTI_FLOORS, 2, 0
multichoicedefault 0, 0, MULTI_FLOORS, 2, FALSE
goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
end
LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd:: @ 82206AD
multichoicedefault 0, 0, MULTI_FLOORS, 3, 0
multichoicedefault 0, 0, MULTI_FLOORS, 3, FALSE
goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
end
LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st:: @ 82206B9
multichoicedefault 0, 0, MULTI_FLOORS, 4, 0
multichoicedefault 0, 0, MULTI_FLOORS, 4, FALSE
goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
end
data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+1 -1
View File
@@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine:: @ 8220295
end
LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink:: @ 82202A6
multichoice 16, 0, MULTI_VENDING_MACHINE, 0
multichoice 16, 0, MULTI_VENDING_MACHINE, FALSE
copyvar VAR_TEMP_1, VAR_RESULT
switch VAR_TEMP_1
case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater
data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_Curator:: @ 8218CC2
applymovement LOCALID_CURATOR, Common_Movement_FacePlayer
message LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings
waitmessage
multichoice 20, 8, MULTI_VIEWED_PAINTINGS, 1
multichoice 20, 8, MULTI_VIEWED_PAINTINGS, TRUE
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings
compare VAR_RESULT, 1
data/maps/MauvilleCity_BikeShop/scripts.inc
+3 -3
View File
@@ -25,7 +25,7 @@ MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7
MauvilleCity_BikeShop_EventScript_ChooseBike:: @ 820EC16
message MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne
waitmessage
multichoice 21, 8, MULTI_BIKE, 1
multichoice 21, 8, MULTI_BIKE, TRUE
switch VAR_RESULT
case 0, MauvilleCity_BikeShop_EventScript_GetMachBike
case 1, MauvilleCity_BikeShop_EventScript_GetAcroBike
@@ -113,7 +113,7 @@ MauvilleCity_BikeShop_EventScript_MachBikeHandbook:: @ 820ED3A
end
MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage:: @ 820ED46
multichoice 0, 0, MULTI_MACH_BIKE_INFO, 0
multichoice 0, 0, MULTI_MACH_BIKE_INFO, FALSE
switch VAR_RESULT
case 0, MauvilleCity_BikeShop_EventScript_HowToRide
case 1, MauvilleCity_BikeShop_EventScript_HowToTurn
@@ -151,7 +151,7 @@ MauvilleCity_BikeShop_EventScript_AcroBikeHandbook:: @ 820EDAE
end
MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage:: @ 820EDBA
multichoice 0, 0, MULTI_ACRO_BIKE_INFO, 0
multichoice 0, 0, MULTI_ACRO_BIKE_INFO, FALSE
switch VAR_RESULT
case 0, MauvilleCity_BikeShop_EventScript_Wheelies
case 1, MauvilleCity_BikeShop_EventScript_BunnyHops
data/maps/MauvilleCity_GameCorner/scripts.inc
+4 -4
View File
@@ -26,7 +26,7 @@ MauvilleCity_GameCorner_EventScript_CoinsClerk:: @ 820FBB9
goto MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50
MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50:: @ 820FBE5
multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 0, 0
multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 0, FALSE
switch VAR_RESULT
case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins
case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins
@@ -35,7 +35,7 @@ MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50:: @ 820FBE5
@ Unused
MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault500:: @ 820FC0C
multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 1, 0
multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 1, FALSE
switch VAR_RESULT
case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins
case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins
@@ -127,7 +127,7 @@ MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize:: @ 820FD20
goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize
MauvilleCity_GameCorner_EventScript_ChooseDollPrize:: @ 820FD2B
multichoice 12, 0, MULTI_GAME_CORNER_DOLLS, 0
multichoice 12, 0, MULTI_GAME_CORNER_DOLLS, FALSE
switch VAR_RESULT
case 0, MauvilleCity_GameCorner_EventScript_TreeckoDoll
case 1, MauvilleCity_GameCorner_EventScript_TorchicDoll
@@ -248,7 +248,7 @@ MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize:: @ 820FECE
goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize
MauvilleCity_GameCorner_EventScript_ChooseTMPrize:: @ 820FED9
multichoice 12, 0, MULTI_GAME_CORNER_TMS, 0
multichoice 12, 0, MULTI_GAME_CORNER_TMS, FALSE
switch VAR_RESULT
case 0, MauvilleCity_GameCorner_EventScript_TM32
case 1, MauvilleCity_GameCorner_EventScript_TM29
data/maps/Route104_MrBrineysHouse/scripts.inc
+1 -1
View File
@@ -44,7 +44,7 @@ Route104_MrBrineysHouse_EventScript_SailingIntro:: @ 8229D8A
Route104_MrBrineysHouse_EventScript_WhereAreWeBound:: @ 8229DAE
message Route104_MrBrineysHouse_Text_WhereAreWeBound
waitmessage
multichoicedefault 20, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0
multichoicedefault 20, 8, MULTI_BRINEY_OFF_DEWFORD, 1, FALSE
switch VAR_RESULT
case 0, Route104_MrBrineysHouse_EventScript_SailToDewford
case 1, Route104_MrBrineysHouse_EventScript_DeclineSailing
data/maps/Route109/scripts.inc
+1 -1
View File
@@ -290,7 +290,7 @@ Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921
Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F
message Route109_Text_BrineyWhereAreWeBound
waitmessage
multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0
multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, FALSE
switch VAR_RESULT
case 0, Route109_EventScript_SailToDewford
case 1, Route109_EventScript_ChoseNotToSail
data/maps/Route110_TrickHouseEnd/scripts.inc
+1 -1
View File
@@ -178,7 +178,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 826AF28
end
Route110_TrickHouseEnd_EventScript_ChooseTent:: @ 826AFA5
multichoice 0, 0, MULTI_TENT, 1
multichoice 0, 0, MULTI_TENT, TRUE
switch VAR_RESULT
case 0, Route110_TrickHouseEnd_EventScript_GiveRedTent
goto Route110_TrickHouseEnd_EventScript_GiveBlueTent
data/maps/Route110_TrickHouseEntrance/scripts.inc
+1 -1
View File
@@ -460,7 +460,7 @@ Route110_TrickHouseEntrance_EventScript_MechadollReward:: @ 826A039
end
Route110_TrickHouseEntrance_EventScript_ChooseTent:: @ 826A070
multichoice 0, 0, MULTI_TENT, 1
multichoice 0, 0, MULTI_TENT, TRUE
switch VAR_RESULT
case 0, Route110_TrickHouseEntrance_EventScript_GiveRedTent
goto Route110_TrickHouseEntrance_EventScript_GiveBlueTent
data/maps/Route110_TrickHousePuzzle5/scripts.inc
+15 -15
View File
@@ -334,7 +334,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate:: @ 826CEF2
Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1:: @ 826CF45
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL1_Q1, 1
multichoice 0, 0, MULTI_MECHADOLL1_Q1, TRUE
switch VAR_RESULT
case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -342,7 +342,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1:: @ 826CF45
Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2:: @ 826CF68
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL1_Q2, 1
multichoice 0, 0, MULTI_MECHADOLL1_Q2, TRUE
switch VAR_RESULT
case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -350,7 +350,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2:: @ 826CF68
Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3:: @ 826CF8B
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL1_Q3, 1
multichoice 0, 0, MULTI_MECHADOLL1_Q3, TRUE
switch VAR_RESULT
case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -358,7 +358,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3:: @ 826CF8B
Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1:: @ 826CFAE
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL2_Q1, 1
multichoice 0, 0, MULTI_MECHADOLL2_Q1, TRUE
switch VAR_RESULT
case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -366,7 +366,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1:: @ 826CFAE
Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2:: @ 826CFD1
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL2_Q2, 1
multichoice 0, 0, MULTI_MECHADOLL2_Q2, TRUE
switch VAR_RESULT
case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -374,7 +374,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2:: @ 826CFD1
Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3:: @ 826CFF4
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL2_Q3, 1
multichoice 0, 0, MULTI_MECHADOLL2_Q3, TRUE
switch VAR_RESULT
case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -382,7 +382,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3:: @ 826CFF4
Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1:: @ 826D017
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL3_Q1, 1
multichoice 0, 0, MULTI_MECHADOLL3_Q1, TRUE
switch VAR_RESULT
case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -390,7 +390,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1:: @ 826D017
Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2:: @ 826D03A
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL3_Q2, 1
multichoice 0, 0, MULTI_MECHADOLL3_Q2, TRUE
switch VAR_RESULT
case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -398,7 +398,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2:: @ 826D03A
Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3:: @ 826D05D
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL3_Q3, 1
multichoice 0, 0, MULTI_MECHADOLL3_Q3, TRUE
switch VAR_RESULT
case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -406,7 +406,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3:: @ 826D05D
Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1:: @ 826D080
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL4_Q1, 1
multichoice 0, 0, MULTI_MECHADOLL4_Q1, TRUE
switch VAR_RESULT
case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -414,7 +414,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1:: @ 826D080
Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2:: @ 826D0A3
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL4_Q2, 1
multichoice 0, 0, MULTI_MECHADOLL4_Q2, TRUE
switch VAR_RESULT
case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -422,7 +422,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2:: @ 826D0A3
Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3:: @ 826D0C6
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL4_Q3, 1
multichoice 0, 0, MULTI_MECHADOLL4_Q3, TRUE
switch VAR_RESULT
case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -430,7 +430,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3:: @ 826D0C6
Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1:: @ 826D0E9
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL5_Q1, 1
multichoice 0, 0, MULTI_MECHADOLL5_Q1, TRUE
switch VAR_RESULT
case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -438,7 +438,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1:: @ 826D0E9
Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2:: @ 826D10C
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL5_Q2, 1
multichoice 0, 0, MULTI_MECHADOLL5_Q2, TRUE
switch VAR_RESULT
case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
@@ -446,7 +446,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2:: @ 826D10C
Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F
msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3, MSGBOX_DEFAULT
multichoice 0, 0, MULTI_MECHADOLL5_Q3, 1
multichoice 0, 0, MULTI_MECHADOLL5_Q3, TRUE
switch VAR_RESULT
case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+15 -15
View File
@@ -86,7 +86,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions:: @ 8270ADE
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR:: @ 8270B8F
multichoice 0, 0, MULTI_SHARDS_R, 0
multichoice 0, 0, MULTI_SHARDS_R, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
@@ -94,7 +94,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR:: @ 8270B8F
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY:: @ 8270BB5
multichoice 0, 0, MULTI_SHARDS_Y, 0
multichoice 0, 0, MULTI_SHARDS_Y, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
@@ -102,7 +102,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY:: @ 8270BB5
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY:: @ 8270BDB
multichoice 0, 0, MULTI_SHARDS_RY, 0
multichoice 0, 0, MULTI_SHARDS_RY, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
@@ -111,7 +111,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY:: @ 8270BDB
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB:: @ 8270C0C
multichoice 0, 0, MULTI_SHARDS_B, 0
multichoice 0, 0, MULTI_SHARDS_B, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
@@ -119,7 +119,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB:: @ 8270C0C
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB:: @ 8270C32
multichoice 0, 0, MULTI_SHARDS_RB, 0
multichoice 0, 0, MULTI_SHARDS_RB, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
@@ -128,7 +128,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB:: @ 8270C32
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB:: @ 8270C63
multichoice 0, 0, MULTI_SHARDS_YB, 0
multichoice 0, 0, MULTI_SHARDS_YB, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
@@ -137,7 +137,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB:: @ 8270C63
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB:: @ 8270C94
multichoice 0, 0, MULTI_SHARDS_RYB, 0
multichoice 0, 0, MULTI_SHARDS_RYB, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
@@ -147,7 +147,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB:: @ 8270C94
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG:: @ 8270CD0
multichoice 0, 0, MULTI_SHARDS_G, 0
multichoice 0, 0, MULTI_SHARDS_G, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
@@ -155,7 +155,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG:: @ 8270CD0
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG:: @ 8270CF6
multichoice 0, 0, MULTI_SHARDS_RG, 0
multichoice 0, 0, MULTI_SHARDS_RG, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
@@ -164,7 +164,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG:: @ 8270CF6
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG:: @ 8270D27
multichoice 0, 0, MULTI_SHARDS_YG, 0
multichoice 0, 0, MULTI_SHARDS_YG, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
@@ -173,7 +173,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG:: @ 8270D27
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG:: @ 8270D58
multichoice 0, 0, MULTI_SHARDS_RYG, 0
multichoice 0, 0, MULTI_SHARDS_RYG, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
@@ -183,7 +183,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG:: @ 8270D58
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG:: @ 8270D94
multichoice 0, 0, MULTI_SHARDS_BG, 0
multichoice 0, 0, MULTI_SHARDS_BG, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
@@ -192,7 +192,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG:: @ 8270D94
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG:: @ 8270DC5
multichoice 0, 0, MULTI_SHARDS_RBG, 0
multichoice 0, 0, MULTI_SHARDS_RBG, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
@@ -202,7 +202,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG:: @ 8270DC5
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG:: @ 8270E01
multichoice 0, 0, MULTI_SHARDS_YBG, 0
multichoice 0, 0, MULTI_SHARDS_YBG, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
@@ -212,7 +212,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG:: @ 8270E01
end
Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG:: @ 8270E3D
multichoice 0, 0, MULTI_SHARDS_RYBG, 0
multichoice 0, 0, MULTI_SHARDS_RYBG, FALSE
switch VAR_RESULT
case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+1 -1
View File
@@ -259,7 +259,7 @@ RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith:: @ 8211B7A
RustboroCity_DevonCorp_2F_EventScript_ChooseFossil:: @ 8211B84
message RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne
waitmessage
multichoice 17, 6, MULTI_FOSSIL, 0
multichoice 17, 6, MULTI_FOSSIL, FALSE
switch VAR_RESULT
case 0, RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil
case 1, RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil
data/maps/RustboroCity_PokemonSchool/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ RustboroCity_PokemonSchool_EventScript_Blackboard:: @ 8213EA9
RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic:: @ 8213EB8
message RustboroCity_PokemonSchool_Text_ReadWhichTopic
waitmessage
multichoicegrid 8, 1, MULTI_STATUS_INFO, 3, 0
multichoicegrid 8, 1, MULTI_STATUS_INFO, 3, FALSE
switch VAR_RESULT
case 0, RustboroCity_PokemonSchool_EventScript_Poison
case 1, RustboroCity_PokemonSchool_EventScript_Paralysis
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+2 -2
View File
@@ -69,7 +69,7 @@ SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D
call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent
compare VAR_RESULT, 2
call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, SlateportCity_BattleTentCorridor_EventScript_AskSwapMon
case 1, SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge
@@ -85,7 +85,7 @@ SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge:: @ 8208F5B
SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge:: @ 8208F89
message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
case 0, SlateportCity_BattleTent_EventScript_WarpToLobbyLost
data/maps/SlateportCity_BattleTentLobby/scripts.inc
+2 -2
View File
@@ -100,7 +100,7 @@ SlateportCity_BattleTentLobby_EventScript_Attendant:: @ 82088AA
SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge:: @ 82088CA
message SlateportCity_BattleTentLobby_Text_TakeChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_TryEnterChallenge
case 1, SlateportCity_BattleTentLobby_EventScript_ExplainChallenge
@@ -237,7 +237,7 @@ SlateportCity_BattleTentLobby_EventScript_RulesBoard:: @ 8208A99
SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8208AA8
message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
waitmessage
multichoice 17, 0, MULTI_SLATEPORT_TENT_RULES, 0
multichoice 17, 0, MULTI_SLATEPORT_TENT_RULES, FALSE
switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_RulesBasics
case 1, SlateportCity_BattleTentLobby_EventScript_RulesSwapPartner
data/maps/SlateportCity_Harbor/scripts.inc
+3 -3
View File
@@ -182,7 +182,7 @@ SlateportCity_Harbor_EventScript_AskForTicket:: @ 820CB06
SlateportCity_Harbor_EventScript_ChooseDestination:: @ 820CB1A
goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier
multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_NO_BF, 2, 0
multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_NO_BF, 2, FALSE
switch VAR_RESULT
case 0, SlateportCity_Harbor_EventScript_Lilycove
case 1, SlateportCity_Harbor_EventScript_CancelDestinationSelect
@@ -190,7 +190,7 @@ SlateportCity_Harbor_EventScript_ChooseDestination:: @ 820CB1A
end
SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier:: @ 820CB50
multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_WITH_BF, 2, 0
multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_WITH_BF, 2, FALSE
switch VAR_RESULT
case 0, SlateportCity_Harbor_EventScript_Lilycove
case 1, SlateportCity_Harbor_EventScript_BattleFrontier
@@ -352,7 +352,7 @@ SlateportCity_Harbor_EventScript_AskToTradeScanner:: @ 820CD38
end
SlateportCity_Harbor_EventScript_ChooseScannerTrade:: @ 820CD44
multichoice 0, 0, MULTI_STERN_DEEPSEA, 0
multichoice 0, 0, MULTI_STERN_DEEPSEA, FALSE
switch VAR_RESULT
case 0, SlateportCity_Harbor_EventScript_DeepSeaTooth
case 1, SlateportCity_Harbor_EventScript_DeepSeaScale
data/maps/TrainerHill_Entrance/scripts.inc
+2 -2
View File
@@ -145,7 +145,7 @@ TrainerHill_Entrance_EventScript_AllFloorsUsed:: @ 8268275
TrainerHill_Entrance_EventScript_AskChallengeTrainers:: @ 826827D
message TrainerHill_Entrance_Text_LikeToChallengeTrainers
waitmessage
multichoice 15, 6, MULTI_YESNOINFO, 0
multichoice 15, 6, MULTI_YESNOINFO, FALSE
switch VAR_RESULT
case 0, TrainerHill_Entrance_EventScript_ChooseChallenge
case 1, TrainerHill_Entrance_EventScript_CancelEntry
@@ -159,7 +159,7 @@ TrainerHill_Entrance_EventScript_Info:: @ 82682BA
end
TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
multichoice 13, 2, MULTI_TAG_MATCH_TYPE, 0
multichoice 13, 2, MULTI_TAG_MATCH_TYPE, FALSE
switch VAR_RESULT
case 4, TrainerHill_Entrance_EventScript_CancelEntry
case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+2 -2
View File
@@ -88,7 +88,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 820243C
call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent
compare VAR_RESULT, 2
call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
switch VAR_RESULT
case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_ContinueChallenge
case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge
@@ -104,7 +104,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge:: @ 820248A
VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 82024B8
message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
switch VAR_RESULT
case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+1 -1
View File
@@ -114,7 +114,7 @@ VerdanturfTown_BattleTentLobby_EventScript_Attendant:: @ 8201873
VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8201893
message VerdanturfTown_BattleTentLobby_Text_TakeChallenge
waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT
case 0, VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge
case 1, VerdanturfTown_BattleTentLobby_EventScript_ExplainChallenge
data/scripts/berry_blender.inc
+1 -1
View File
@@ -711,7 +711,7 @@ BerryBlender_EventScript_StartDecideLinkLeader: @ 82941ED
BerryBlender_EventScript_DecideLinkLeader: @ 82941F8
message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, BerryBlender_EventScript_TryJoinGroup
case 1, BerryBlender_EventScript_TryLeadGroup
data/scripts/cable_club.inc
+15 -15
View File
@@ -277,7 +277,7 @@ CableClub_EventScript_UnusedWelcomeToCableClub:: @ 8276E22
CableClub_EventScript_SelectCableClubRoom:: @ 8276E30
setvar VAR_0x8004, 0
goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_CableClubUnlockedRecordCorner
multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0
multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TradeCenter
case 1, CableClub_EventScript_Colosseum
@@ -286,7 +286,7 @@ CableClub_EventScript_SelectCableClubRoom:: @ 8276E30
end
CableClub_EventScript_CableClubUnlockedRecordCorner:: @ 8276E75
multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0
multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TradeCenter
case 1, CableClub_EventScript_Colosseum
@@ -303,7 +303,7 @@ CableClub_EventScript_Colosseum:: @ 8276EB7
CableClub_EventScript_SelectBattleMode:: @ 8276EC2
message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
multichoice 0, 0, MULTI_BATTLE_MODE, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_SingleBattleMode
case 1, CableClub_EventScript_DoubleBattleMode
@@ -927,7 +927,7 @@ CableClub_EventScript_UnionRoomAttendant:: @ 827751B
end
CableClub_EventScript_UnionRoomSelect:: @ 827755C
multichoice 17, 6, MULTI_YESNOINFO, 0
multichoice 17, 6, MULTI_YESNOINFO, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_EnterUnionRoom
case 1, CableClub_EventScript_AbortLink
@@ -1039,7 +1039,7 @@ CableClub_EventScript_DirectCornerSelectService:: @ 82776E3
compare VAR_RESULT, FALSE
goto_if_eq CableClub_EventScript_DirectCornerNoBerry
goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerSelectAllServices
multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0
multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessTrade
case 1, CableClub_EventScript_WirelessBattleSelect
@@ -1049,7 +1049,7 @@ CableClub_EventScript_DirectCornerSelectService:: @ 82776E3
end
CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E
multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0
multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessTrade
case 1, CableClub_EventScript_WirelessBattleSelect
@@ -1061,7 +1061,7 @@ CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E
CableClub_EventScript_DirectCornerNoBerry:: @ 827778B
goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerHasRecordMix
multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0
multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessTrade
case 1, CableClub_EventScript_WirelessBattleSelect
@@ -1070,7 +1070,7 @@ CableClub_EventScript_DirectCornerNoBerry:: @ 827778B
end
CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB
multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0
multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessTrade
case 1, CableClub_EventScript_WirelessBattleSelect
@@ -1093,7 +1093,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
CableClub_EventScript_WirelessBattleSelect:: @ 827783B
message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
multichoice 0, 0, MULTI_BATTLE_MODE, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessSingleBattle
case 1, CableClub_EventScript_WirelessDoubleBattle
@@ -1171,7 +1171,7 @@ CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931
CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989
message CableClub_Text_ChooseGroupLeaderOfTwo
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroup2Players
case 1, CableClub_EventScript_TryLeadGroup2Players
@@ -1204,7 +1204,7 @@ CableClub_EventScript_TryJoinGroup2Players:: @ 82779EE
CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 8277A16
message CableClub_Text_ChooseGroupLeaderOfFour
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroup4Players
case 1, CableClub_EventScript_TryLeadGroup4Players
@@ -1237,7 +1237,7 @@ CableClub_EventScript_TryJoinGroup4Players:: @ 8277A7B
CableClub_EventScript_ChooseLinkLeader:: @ 8277AA3
message CableClub_Text_ChooseGroupLeader
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroupXPlayers
case 1, CableClub_EventScript_TryLeadGroupXPlayers
@@ -1360,7 +1360,7 @@ MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: @ 8277C34
faceplayer
message MossdeepCity_GameCorner_1F_Text_DescribeWhichGame
waitmessage
multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0
multichoice 0, 0, MULTI_WIRELESS_MINIGAME, FALSE
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo
case 1, MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo
@@ -1394,7 +1394,7 @@ MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91
delay 60
message MossdeepCity_GameCorner_1F_Text_PlayWhichGame
waitmessage
multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0
multichoice 0, 0, MULTI_WIRELESS_MINIGAME, FALSE
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump
case 1, MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking
@@ -1443,7 +1443,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader:: @ 8277D81
message CableClub_Text_ChooseGroupLeader
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup
case 1, MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader
data/scripts/contest_hall.inc
+4 -4
View File
@@ -60,7 +60,7 @@ LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter:: @ 8279D4B
LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
message LilycoveCity_ContestLobby_Text_EnterContest1
waitmessage
multichoice 0, 0, MULTI_ENTERINFO, 0
multichoice 0, 0, MULTI_ENTERINFO, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_ChooseContestRank
case 1, LilycoveCity_ContestLobby_EventScript_ContestInfo
@@ -71,7 +71,7 @@ LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
LilycoveCity_ContestLobby_EventScript_ContestInfo:: @ 8279D97
message LilycoveCity_ContestLobby_Text_WhichTopic1
waitmessage
multichoice 0, 0, MULTI_CONTEST_INFO, 0
multichoice 0, 0, MULTI_CONTEST_INFO, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_ExplainContests
case 1, LilycoveCity_ContestLobby_EventScript_ExplainContestTypes
@@ -121,7 +121,7 @@ LilycoveCity_ContestLobby_EventScript_ChooseContestMon:: @ 8279E13
LilycoveCity_ContestLobby_EventScript_ChooseContestRank:: @ 8279E62
message LilycoveCity_ContestLobby_Text_EnterWhichRank
waitmessage
multichoice 0, 0, MULTI_CONTEST_RANK, 0
multichoice 0, 0, MULTI_CONTEST_RANK, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_EnterNormalRank
case 1, LilycoveCity_ContestLobby_EventScript_EnterSuperRank
@@ -156,7 +156,7 @@ LilycoveCity_ContestLobby_EventScript_EnterMasterRank:: @ 8279ED6
LilycoveCity_ContestLobby_EventScript_ChooseContestType:: @ 8279EE1
message LilycoveCity_ContestLobby_Text_EnterWhichContest1
waitmessage
multichoice 0, 0, MULTI_CONTEST_TYPE, 0
multichoice 0, 0, MULTI_CONTEST_TYPE, FALSE
switch VAR_RESULT
case 5, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
data/scripts/interview.inc
+1 -1
View File
@@ -278,7 +278,7 @@ BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
message BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut
waitmessage
multichoice 20, 8, MULTI_SATISFACTION, 1
multichoice 20, 8, MULTI_SATISFACTION, TRUE
copyvar VAR_0x8008, VAR_RESULT
compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Satisfied
data/scripts/mystery_event_club.inc
+2 -2
View File
@@ -8,7 +8,7 @@ MysteryEventClub_EventScript_Man:: @ 8291539
MysteryEventClub_EventScript_AskToSeeProfile:: @ 8291552
msgbox MysteryEventClub_Text_MayISeeYourProfile, MSGBOX_DEFAULT
multichoice 17, 6, MULTI_YESNOINFO_2, 0
multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
switch VAR_RESULT
case 0, MysteryEventClub_EventScript_CreateProfile
case 1, MysteryEventClub_EventScript_DeclineShowProfile
@@ -60,7 +60,7 @@ MysteryEventClub_EventScript_GivenProfileBefore:: @ 82915F5
MysteryEventClub_EventScript_AskToSeeNewProfile:: @ 8291603
msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT
multichoice 17, 6, MULTI_YESNOINFO_2, 0
multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
switch VAR_RESULT
case 0, MysteryEventClub_EventScript_CreateNewProfile
case 1, MysteryEventClub_EventScript_DeclineNewProfile
data/scripts/players_house.inc
+1 -1
View File
@@ -501,7 +501,7 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale
msgbox PlayersHouse_1F_Text_WhatColorDidTheySay, MSGBOX_DEFAULT
multichoice 22, 8, MULTI_TV_LATI, 1
multichoice 22, 8, MULTI_TV_LATI, TRUE
copyvar VAR_0x8004, VAR_RESULT
special InitRoamer
copyvar VAR_ROAMER_POKEMON, VAR_RESULT
data/scripts/shared_secret_base.inc
+3 -3
View File
@@ -48,7 +48,7 @@ SecretBase_EventScript_PCCancel:: @ 823B4E8
end
SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF
multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, 0
multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, FALSE
switch VAR_RESULT
case 0, SecretBase_EventScript_PCDecorationMenu
case 1, SecretBase_EventScript_PCPackUp
@@ -58,7 +58,7 @@ SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF
end
SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531
multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, 0
multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, FALSE
switch VAR_RESULT
case 0, SecretBase_EventScript_PCDecorationMenu
case 1, SecretBase_EventScript_PCPackUp
@@ -98,7 +98,7 @@ SecretBase_EventScript_RecordMixingPC:: @ 823B589
SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1
message SecretBase_Text_WhatWouldYouLikeToDo
waitmessage
multichoice 0, 0, MULTI_REGISTER_MENU, 0
multichoice 0, 0, MULTI_REGISTER_MENU, FALSE
switch VAR_RESULT
case 0, SecretBase_EventScript_PCRegister
case 1, SecretBase_EventScript_PCRegistryMenu
data/specials.inc
+1 -1
View File
@@ -138,7 +138,7 @@ gSpecials:: @ 81DBA64
def_special BufferMonNickname
def_special IsMonOTIDNotPlayers
def_special BufferTrendyPhraseString
def_special TrendyPhraseIsOld
def_special IsTrendyPhraseBoring
def_special BufferDeepLinkPhrase
def_special GetDewfordHallPaintingNameIndex
def_special SwapRegisteredBike
data/text/tv.inc
+9 -7
View File
@@ -1229,7 +1229,7 @@ gTVTodaysRivalTrainerText06:: @ 082849AE
.string "Let's all keep moving forward\n"
.string "and ahead of our rivals!$"
gTVDewfordTrendWatcherNetworkText00:: @ 08284A3E
TrendWatcher_Text_Intro:: @ 08284A3E
.string "DEWFORD TREND-WATCHER NETWORK!\p"
.string "MC: Wassup?\n"
.string "We'll keep it real with the latest on\l"
@@ -1251,17 +1251,18 @@ gTVDewfordTrendWatcherNetworkText00:: @ 08284A3E
.string "MC: Uh, no. What we want to know is\n"
.string "what's the in thing of the moment…$"
gTVDewfordTrendWatcherNetworkText01:: @ 08284C55
@ Identical to below, may have been different in other languages
TrendWatcher_Text_MaleTaughtMePhrase:: @ 08284C55
.string "Old man: {STR_VAR_1} {STR_VAR_2}\n"
.string "was what {STR_VAR_3} from LITTLEROOT\l"
.string "taught me as being trendy…$"
gTVDewfordTrendWatcherNetworkText02:: @ 08284C9B
TrendWatcher_Text_FemaleTaughtMePhrase:: @ 08284C9B
.string "Old man: {STR_VAR_1} {STR_VAR_2}\n"
.string "was what {STR_VAR_3} from LITTLEROOT\l"
.string "taught me as being trendy…$"
gTVDewfordTrendWatcherNetworkText03:: @ 08284CE1
TrendWatcher_Text_PhraseWasHopeless:: @ 08284CE1
.string "But it was utterly hopeless.\p"
.string "{STR_VAR_1} {STR_VAR_2} festival!\p"
.string "{STR_VAR_1} {STR_VAR_2} contest!\p"
@@ -1272,17 +1273,18 @@ gTVDewfordTrendWatcherNetworkText03:: @ 08284CE1
.string "MC: Uh, excuse me, compadre, I need\n"
.string "to hear about what's in now…$"
gTVDewfordTrendWatcherNetworkText04:: @ 08284DB6
@ Identical to below, may have been different in other languages
TrendWatcher_Text_MaleTellMeBigger:: @ 08284DB6
.string "Old man: {STR_VAR_3}!\n"
.string "Please, tell me something bigger than\l"
.string "that {STR_VAR_1} {STR_VAR_2}!$"
gTVDewfordTrendWatcherNetworkText05:: @ 08284DF5
TrendWatcher_Text_FemaleTellMeBigger:: @ 08284DF5
.string "Old man: {STR_VAR_3}!\n"
.string "Please, tell me something bigger than\l"
.string "that {STR_VAR_1} {STR_VAR_2}!$"
gTVDewfordTrendWatcherNetworkText06:: @ 08284E34
TrendWatcher_Text_Outro:: @ 08284E34
.string "MC: …Uh… So, there you have it,\n"
.string "all you trendy, hep cats out there!\p"
.string "{STR_VAR_1} {STR_VAR_2}…uh…\n"
gflib/string_util.h
+4 -4
View File
@@ -1,10 +1,10 @@
#ifndef GUARD_STRING_UTIL_H
#define GUARD_STRING_UTIL_H
extern u8 gStringVar1[];
extern u8 gStringVar2[];
extern u8 gStringVar3[];
extern u8 gStringVar4[];
extern u8 gStringVar1[0x100];
extern u8 gStringVar2[0x100];
extern u8 gStringVar3[0x100];
extern u8 gStringVar4[0x3E8];
enum StringConvertMode
{
gflib/text.c
+117 -118
View File
@@ -21,8 +21,8 @@ static u16 gLastTextFgColor;
static u16 gLastTextShadowColor;
const struct FontInfo *gFonts;
u8 gUnknown_03002F84;
struct Struct_03002F90 gUnknown_03002F90;
u8 gDisableTextPrinters;
struct TextGlyph gCurGlyph;
TextFlags gTextFlags;
const u8 gFontHalfRowOffsets[] =
@@ -204,7 +204,7 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u8 speed, voi
CopyWindowToVram(gTempTextPrinter.printerTemplate.windowId, 2);
gTextPrinters[printerTemplate->windowId].active = 0;
}
gUnknown_03002F84 = 0;
gDisableTextPrinters = 0;
return TRUE;
}
@@ -212,7 +212,7 @@ void RunTextPrinters(void)
{
int i;
if (gUnknown_03002F84 == 0)
if (gDisableTextPrinters == 0)
{
for (i = 0; i < NUM_TEXT_PRINTERS; ++i)
{
@@ -461,9 +461,9 @@ u8 GetLastTextColor(u8 colorType)
}
}
inline static void GLYPH_COPY(u8 *windowTiles, u32 widthOffset, u32 j, u32 i, u32 *ptr, s32 width, s32 height)
inline static void GLYPH_COPY(u8 *windowTiles, u32 widthOffset, u32 j, u32 i, u32 *glyphPixels, s32 width, s32 height)
{
u32 xAdd, yAdd, r5, bits, toOrr, dummyX;
u32 xAdd, yAdd, pixelData, bits, toOrr, dummyX;
u8 *dst;
xAdd = j + width;
@@ -471,69 +471,69 @@ inline static void GLYPH_COPY(u8 *windowTiles, u32 widthOffset, u32 j, u32 i, u3
dummyX = j;
for (; i < yAdd; i++)
{
r5 = *ptr++;
pixelData = *glyphPixels++;
for (j = dummyX; j < xAdd; j++)
{
if ((toOrr = r5 & 0xF))
if ((toOrr = pixelData & 0xF))
{
dst = windowTiles + ((j / 8) * 32) + ((j % 8) / 2) + ((i / 8) * widthOffset) + ((i % 8) * 4);
bits = ((j & 1) * 4);
*dst = (toOrr << bits) | (*dst & (0xF0 >> bits));
}
r5 >>= 4;
pixelData >>= 4;
}
}
}
void CopyGlyphToWindow(struct TextPrinter *textPrinter)
{
struct Window *win;
struct WindowTemplate *winTempl;
u32 *unkStruct;
struct Window *window;
struct WindowTemplate *template;
u32 *glyphPixels;
u32 currX, currY, widthOffset;
s32 r4, r0;
s32 glyphWidth, glyphHeight;
u8 *windowTiles;
win = &gWindows[textPrinter->printerTemplate.windowId];
winTempl = &win->window;
window = &gWindows[textPrinter->printerTemplate.windowId];
template = &window->window;
if ((r4 = (winTempl->width * 8) - textPrinter->printerTemplate.currentX) > gUnknown_03002F90.width)
r4 = gUnknown_03002F90.width;
if ((glyphWidth = (template->width * 8) - textPrinter->printerTemplate.currentX) > gCurGlyph.width)
glyphWidth = gCurGlyph.width;
if ((r0 = (winTempl->height * 8) - textPrinter->printerTemplate.currentY) > gUnknown_03002F90.height)
r0 = gUnknown_03002F90.height;
if ((glyphHeight = (template->height * 8) - textPrinter->printerTemplate.currentY) > gCurGlyph.height)
glyphHeight = gCurGlyph.height;
currX = textPrinter->printerTemplate.currentX;
currY = textPrinter->printerTemplate.currentY;
unkStruct = (u32 *)&gUnknown_03002F90.unk0;
windowTiles = win->tileData;
widthOffset = winTempl->width * 32;
glyphPixels = gCurGlyph.gfxBufferTop;
windowTiles = window->tileData;
widthOffset = template->width * 32;
if (r4 < 9)
if (glyphWidth < 9)
{
if (r0 < 9)
if (glyphHeight < 9)
{
GLYPH_COPY(windowTiles, widthOffset, currX, currY, unkStruct, r4, r0);
GLYPH_COPY(windowTiles, widthOffset, currX, currY, glyphPixels, glyphWidth, glyphHeight);
}
else
{
GLYPH_COPY(windowTiles, widthOffset, currX, currY, unkStruct, r4, 8);
GLYPH_COPY(windowTiles, widthOffset, currX, currY + 8, unkStruct + 16, r4, r0 - 8);
GLYPH_COPY(windowTiles, widthOffset, currX, currY, glyphPixels, glyphWidth, 8);
GLYPH_COPY(windowTiles, widthOffset, currX, currY + 8, glyphPixels + 16, glyphWidth, glyphHeight - 8);
}
}
else
{
if (r0 < 9)
if (glyphHeight < 9)
{
GLYPH_COPY(windowTiles, widthOffset, currX, currY, unkStruct, 8, r0);
GLYPH_COPY(windowTiles, widthOffset, currX + 8, currY, unkStruct + 8, r4 - 8, r0);
GLYPH_COPY(windowTiles, widthOffset, currX, currY, glyphPixels, 8, glyphHeight);
GLYPH_COPY(windowTiles, widthOffset, currX + 8, currY, glyphPixels + 8, glyphWidth - 8, glyphHeight);
}
else
{
GLYPH_COPY(windowTiles, widthOffset, currX, currY, unkStruct, 8, 8);
GLYPH_COPY(windowTiles, widthOffset, currX + 8, currY, unkStruct + 8, r4 - 8, 8);
GLYPH_COPY(windowTiles, widthOffset, currX, currY + 8, unkStruct + 16, 8, r0 - 8);
GLYPH_COPY(windowTiles, widthOffset, currX + 8, currY + 8, unkStruct + 24, r4 - 8, r0 - 8);
GLYPH_COPY(windowTiles, widthOffset, currX, currY, glyphPixels, 8, 8);
GLYPH_COPY(windowTiles, widthOffset, currX + 8, currY, glyphPixels + 8, glyphWidth - 8, 8);
GLYPH_COPY(windowTiles, widthOffset, currX, currY + 8, glyphPixels + 16, 8, glyphHeight - 8);
GLYPH_COPY(windowTiles, widthOffset, currX + 8, currY + 8, glyphPixels + 24, glyphWidth - 8, glyphHeight - 8);
}
}
}
@@ -542,7 +542,7 @@ void ClearTextSpan(struct TextPrinter *textPrinter, u32 width)
{
struct Window *window;
struct Bitmap pixels_data;
struct Struct_03002F90 *gUnk;
struct TextGlyph *glyph;
u8* glyphHeight;
if (gLastTextBgColor != 0)
@@ -552,8 +552,8 @@ void ClearTextSpan(struct TextPrinter *textPrinter, u32 width)
pixels_data.width = window->window.width << 3;
pixels_data.height = window->window.height << 3;
gUnk = &gUnknown_03002F90;
glyphHeight = &gUnk->height;
glyph = &gCurGlyph;
glyphHeight = &glyph->height;
FillBitmapRect4Bit(
&pixels_data,
@@ -1015,8 +1015,8 @@ u16 RenderText(struct TextPrinter *textPrinter)
break;
case CHAR_KEYPAD_ICON:
currChar = *textPrinter->printerTemplate.currentChar++;
gUnknown_03002F90.width = DrawKeypadIcon(textPrinter->printerTemplate.windowId, currChar, textPrinter->printerTemplate.currentX, textPrinter->printerTemplate.currentY);
textPrinter->printerTemplate.currentX += gUnknown_03002F90.width + textPrinter->printerTemplate.letterSpacing;
gCurGlyph.width = DrawKeypadIcon(textPrinter->printerTemplate.windowId, currChar, textPrinter->printerTemplate.currentX, textPrinter->printerTemplate.currentY);
textPrinter->printerTemplate.currentX += gCurGlyph.width + textPrinter->printerTemplate.letterSpacing;
return 0;
case EOS:
return 1;
@@ -1050,8 +1050,8 @@ u16 RenderText(struct TextPrinter *textPrinter)
if (textPrinter->minLetterSpacing)
{
textPrinter->printerTemplate.currentX += gUnknown_03002F90.width;
width = textPrinter->minLetterSpacing - gUnknown_03002F90.width;
textPrinter->printerTemplate.currentX += gCurGlyph.width;
width = textPrinter->minLetterSpacing - gCurGlyph.width;
if (width > 0)
{
ClearTextSpan(textPrinter, width);
@@ -1061,9 +1061,9 @@ u16 RenderText(struct TextPrinter *textPrinter)
else
{
if (textPrinter->japanese)
textPrinter->printerTemplate.currentX += (gUnknown_03002F90.width + textPrinter->printerTemplate.letterSpacing);
textPrinter->printerTemplate.currentX += (gCurGlyph.width + textPrinter->printerTemplate.letterSpacing);
else
textPrinter->printerTemplate.currentX += gUnknown_03002F90.width;
textPrinter->printerTemplate.currentX += gCurGlyph.width;
}
return 0;
case 1:
@@ -1398,8 +1398,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
if (lineWidth > width)
return lineWidth;
else
return width;
return width;
}
u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
@@ -1499,8 +1498,8 @@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
DecompressGlyphFont1(temp, 1);
break;
}
CpuCopy32(gUnknown_03002F90.unk0, pixels, 0x20);
CpuCopy32(gUnknown_03002F90.unk40, pixels + 0x20, 0x20);
CpuCopy32(gCurGlyph.gfxBufferTop, pixels, 0x20);
CpuCopy32(gCurGlyph.gfxBufferBottom, pixels + 0x20, 0x20);
pixels += 0x40;
break;
}
@@ -1592,30 +1591,30 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
if (isJapanese == 1)
{
glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x40
gUnknown_03002F90.width = 8; // gGlyphWidth
gUnknown_03002F90.height = 12; // gGlyphHeight
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom);
gCurGlyph.width = 8;
gCurGlyph.height = 12;
}
else
{
glyphs = gFont0LatinGlyphs + (0x20 * glyphId);
gUnknown_03002F90.width = gFont0LatinGlyphWidths[glyphId];
gCurGlyph.width = gFont0LatinGlyphWidths[glyphId];
if (gUnknown_03002F90.width <= 8)
if (gCurGlyph.width <= 8)
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
}
else
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x8, gCurGlyph.gfxBufferTop + 8);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
DecompressGlyphTile(glyphs + 0x18, gCurGlyph.gfxBufferBottom + 8);
}
gUnknown_03002F90.height = 13;
gCurGlyph.height = 13;
}
}
@@ -1635,30 +1634,30 @@ void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese)
{
int eff;
glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x40
gUnknown_03002F90.width = 8; // gGlyphWidth
gUnknown_03002F90.height = 15; // gGlyphHeight
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom);
gCurGlyph.width = 8;
gCurGlyph.height = 15;
}
else
{
glyphs = gFont7LatinGlyphs + (0x20 * glyphId);
gUnknown_03002F90.width = gFont7LatinGlyphWidths[glyphId];
gCurGlyph.width = gFont7LatinGlyphWidths[glyphId];
if (gUnknown_03002F90.width <= 8)
if (gCurGlyph.width <= 8)
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
}
else
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x8, gCurGlyph.gfxBufferTop + 8);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
DecompressGlyphTile(glyphs + 0x18, gCurGlyph.gfxBufferBottom + 8);
}
gUnknown_03002F90.height = 15;
gCurGlyph.height = 15;
}
}
@@ -1677,30 +1676,30 @@ void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese)
if (isJapanese == TRUE)
{
glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x40
gUnknown_03002F90.width = 8; // gGlyphWidth
gUnknown_03002F90.height = 12; // gGlyphHeight
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom);
gCurGlyph.width = 8;
gCurGlyph.height = 12;
}
else
{
glyphs = gFont8LatinGlyphs + (0x20 * glyphId);
gUnknown_03002F90.width = gFont8LatinGlyphWidths[glyphId];
gCurGlyph.width = gFont8LatinGlyphWidths[glyphId];
if (gUnknown_03002F90.width <= 8)
if (gCurGlyph.width <= 8)
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
}
else
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x8, gCurGlyph.gfxBufferTop + 8);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
DecompressGlyphTile(glyphs + 0x18, gCurGlyph.gfxBufferBottom + 8);
}
gUnknown_03002F90.height = 12;
gCurGlyph.height = 12;
}
}
@@ -1719,32 +1718,32 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
if (isJapanese == TRUE)
{
glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20); // gUnknown_03002F90 + 0x40
DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x20
DecompressGlyphTile(glyphs + 0x88, gUnknown_03002F90.unk60); // gUnknown_03002F90 + 0x60
gUnknown_03002F90.width = gFont2JapaneseGlyphWidths[glyphId]; // gGlyphWidth
gUnknown_03002F90.height = 14; // gGlyphHeight
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x8, gCurGlyph.gfxBufferTop + 8);
DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom); // gCurGlyph + 0x20
DecompressGlyphTile(glyphs + 0x88, gCurGlyph.gfxBufferBottom + 8); // gCurGlyph + 0x60
gCurGlyph.width = gFont2JapaneseGlyphWidths[glyphId];
gCurGlyph.height = 14;
}
else
{
glyphs = gFont2LatinGlyphs + (0x20 * glyphId);
gUnknown_03002F90.width = gFont2LatinGlyphWidths[glyphId];
gCurGlyph.width = gFont2LatinGlyphWidths[glyphId];
if (gUnknown_03002F90.width <= 8)
if (gCurGlyph.width <= 8)
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
}
else
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x8, gCurGlyph.gfxBufferTop + 8);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
DecompressGlyphTile(glyphs + 0x18, gCurGlyph.gfxBufferBottom + 8);
}
gUnknown_03002F90.height = 14;
gCurGlyph.height = 14;
}
}
@@ -1764,30 +1763,30 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
{
int eff;
glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x40
gUnknown_03002F90.width = 8; // gGlyphWidth
gUnknown_03002F90.height = 15; // gGlyphHeight
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom);
gCurGlyph.width = 8;
gCurGlyph.height = 15;
}
else
{
glyphs = gFont1LatinGlyphs + (0x20 * glyphId);
gUnknown_03002F90.width = gFont1LatinGlyphWidths[glyphId];
gCurGlyph.width = gFont1LatinGlyphWidths[glyphId];
if (gUnknown_03002F90.width <= 8)
if (gCurGlyph.width <= 8)
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
}
else
{
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x8, gCurGlyph.gfxBufferTop + 8);
DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom);
DecompressGlyphTile(glyphs + 0x18, gCurGlyph.gfxBufferBottom + 8);
}
gUnknown_03002F90.height = 15;
gCurGlyph.height = 15;
}
}
@@ -1804,8 +1803,8 @@ void DecompressGlyphFont9(u16 glyphId)
const u16* glyphs;
glyphs = gFont9JapaneseGlyphs + (0x100 * (glyphId >> 4)) + (0x8 * (glyphId & 0xF));
DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);
gUnknown_03002F90.width = 8;
gUnknown_03002F90.height = 12;
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom);
gCurGlyph.width = 8;
gCurGlyph.height = 12;
}
gflib/text.h
+5 -7
View File
@@ -360,20 +360,18 @@ typedef struct {
bool8 forceMidTextSpeed:1;
} TextFlags;
struct Struct_03002F90
struct TextGlyph
{
u32 unk0[8];
u32 unk20[8];
u32 unk40[8];
u32 unk60[8];
u32 gfxBufferTop[16];
u32 gfxBufferBottom[16];
u8 width;
u8 height;
};
extern TextFlags gTextFlags;
extern u8 gUnknown_03002F84;
extern struct Struct_03002F90 gUnknown_03002F90;
extern u8 gDisableTextPrinters;
extern struct TextGlyph gCurGlyph;
void SetFontsPointer(const struct FontInfo *fonts);
void DeactivateAllTextPrinters(void);
graphics/link_games/berrycrush_background.bin → graphics/berry_crush/bg.bin
View File
File renamed without changes.
graphics/link_games/berrycrush_container_cap.bin → graphics/berry_crush/container_cap.bin
View File
File renamed without changes.
graphics/berry_crusher/tiles.bin → graphics/berry_crush/crusher.bin
View File
File renamed without changes.
graphics/berry_crusher/tiles.pal → graphics/berry_crush/crusher.pal
View File
File renamed without changes.
graphics/berry_crusher/tiles.png → graphics/berry_crush/crusher.png
View File
File renamed without changes.
graphics/link_games/berrycrush_grinder_base.png → graphics/berry_crush/crusher_base.png
View File
File renamed without changes.
graphics/link_games/berrycrush_grinder_top.bin → graphics/berry_crush/crusher_top.bin
View File
File renamed without changes.
graphics/link_games/berrycrush_misc.pal → graphics/berry_crush/effects.pal
View File
File renamed without changes.
graphics/link_games/berrycrush_btnpress.png → graphics/berry_crush/impact.png
View File
File renamed without changes.
graphics/link_games/berrycrush_sparkle.png → graphics/berry_crush/sparkle.png
View File
File renamed without changes.
graphics/link_games/berrycrush_timerdigits.png → graphics/berry_crush/timer_digits.png
View File
File renamed without changes.
graphics/credits/credits.pal
+67
View File
@@ -0,0 +1,67 @@
JASC-PAL
0100
64
0 0 0
255 255 255
164 164 164
255 230 123
255 82 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 230 123
255 82 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
131 65 32
16 0 0
8 139 65
8 8 0
8 8 0
8 8 0
148 131 32
16 8 0
0 74 65
16 65 65
131 131 32
148 131 65
8 139 65
8 139 0
8 8 32
148 131 0
148 65 65
16 74 65
0 139 65
0 131 65
0 0 0
0 0 0
0 0 0
0 0 0
graphics/credits/credits_1.pal
-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
255 255 255
164 164 164
255 230 123
255 82 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/credits/credits_2.pal
-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
255 230 123
255 82 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/credits/credits_3.pal
-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
131 65 32
16 0 0
8 139 65
8 8 0
8 8 0
8 8 0
148 131 32
16 8 0
graphics/credits/credits_4.pal
-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 74 65
16 65 65
131 131 32
148 131 65
8 139 65
8 139 0
8 8 32
148 131 0
148 65 65
16 74 65
0 139 65
0 131 65
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/interview_frame.png → graphics/easy_chat/interview_frame.png
View File
File renamed without changes.
graphics/misc/8597C24.pal → graphics/easy_chat/text.pal
View File
File renamed without changes.
graphics/misc/8597C1C.pal → graphics/easy_chat/title_text.pal
View File
File renamed without changes.
graphics/interface/menu_border.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 150 B

graphics/intro/intro.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

graphics/intro/intro2_bgtrees2.pal
-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
156 189 246
172 205 246
197 230 255
213 246 255
238 255 255
156 180 172
197 197 156
172 189 164
98 139 98
98 156 57
123 164 131
156 213 82
0 0 0
0 0 0
0 0 0
graphics/intro/intro1_bgpal.pal → graphics/intro/scene_1/bg.pal
View File
File renamed without changes.
graphics/intro/introgfx.png → graphics/intro/scene_1/bg.png
View File
File renamed without changes.
graphics/intro/intro1_bg0_map.bin → graphics/intro/scene_1/bg0_map.bin
View File
File renamed without changes.
graphics/intro/intro1_bg1_map.bin → graphics/intro/scene_1/bg1_map.bin
View File
File renamed without changes.
graphics/intro/intro1_bg2_map.bin → graphics/intro/scene_1/bg2_map.bin
View File
File renamed without changes.
graphics/intro/intro1_bg3_map.bin → graphics/intro/scene_1/bg3_map.bin
View File
File renamed without changes.
graphics/intro/intro1_drops.pal → graphics/intro/scene_1/drops.pal
View File
File renamed without changes.
graphics/intro/scene_1/drops_logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

graphics/intro/intro1_flygon.png → graphics/intro/scene_1/flygon.png
View File
File renamed without changes.
graphics/intro/intro1_eon.png → graphics/intro/scene_1/lati.png
View File
File renamed without changes.
graphics/intro/intro1_gflogo.pal → graphics/intro/scene_1/logo.pal
View File
File renamed without changes.
graphics/intro/intro1_sparkle.png → graphics/intro/scene_1/sparkle.png
View File
File renamed without changes.
graphics/intro/intro1_text.pal → graphics/intro/scene_1/text.pal
View File
File renamed without changes.
graphics/intro/intro2_bicycle.png → graphics/intro/scene_2/bicycle.png
View File
File renamed without changes.
graphics/intro/intro2_brendan_noturn.png → graphics/intro/scene_2/brendan.png
View File
File renamed without changes.
graphics/intro/intro2_brendan.png → graphics/intro/scene_2/brendan_credits.png
View File
File renamed without changes.
graphics/intro/intro2_bgclouds2.png → graphics/intro/scene_2/clouds.png
View File
File renamed without changes.
graphics/intro/85F0CFC.pal → graphics/intro/scene_2/clouds_bg.pal
View File
File renamed without changes.
Loaded 100 of 263 files, more files were not shown because too many files have changed in this diff. Show more