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

WIP Document Apprentice

Browse Source
This commit is contained in:
GriffinR
2019-11-19 11:36:38 -05:00
parent a486c8affd
commit 4e6a69c297
13 changed files with 627 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_frontier.inc
+117
View File
@@ -32,4 +32,121 @@ special CallBattleTowerFunc
@ Battle Tent @ Battle Tent
@ Trainer Hill
@ Apprentice @ Apprentice
.macro apprentice_gavelvlmode
setvar VAR_0x8004, APPRENTICE_FUNC_GAVE_LVLMODE
special CallApprenticeFunction
.endm
.macro apprentice_setlvlmode lvlmode:req
setvar VAR_0x8004, APPRENTICE_FUNC_SET_LVLMODE
setorcopyvar VAR_0x8005, \lvlmode
addvar VAR_0x8005, 1
special CallApprenticeFunction
.endm
.macro apprentice_answeredquestion
setvar VAR_0x8004, APPRENTICE_FUNC_ANSWERED_QUESTION
special CallApprenticeFunction
.endm
.macro apprentice_menu which:req
setvar VAR_0x8004, APPRENTICE_FUNC_MENU
setvar VAR_0x8005, \which
special CallApprenticeFunction
waitstate
.endm
.macro apprentice_3
setvar VAR_0x8004, APPRENTICE_FUNC_3
special CallApprenticeFunction
.endm
.macro apprentice_msg waitbuttonpress:req, which:req
setvar VAR_0x8004, APPRENTICE_FUNC_PRINT_MSG
setvar VAR_0x8005, \waitbuttonpress
setvar VAR_0x8006, \which
special CallApprenticeFunction
waitstate
.endm
.macro apprentice_reset
setvar VAR_0x8004, APPRENTICE_FUNC_RESET
special CallApprenticeFunction
.endm
.macro apprentice_shouldcheckgone
setvar VAR_0x8004, APPRENTICE_FUNC_CHECK_GONE
special CallApprenticeFunction
.endm
.macro apprentice_getquestion
setvar VAR_0x8004, APPRENTICE_FUNC_GET_QUESTION
special CallApprenticeFunction
.endm
.macro apprentice_getnumpartymons
setvar VAR_0x8004, APPRENTICE_FUNC_GET_NUM_PARTY_MONS
special CallApprenticeFunction
.endm
.macro apprentice_setpartymon slot:req
copyvar VAR_0x8006, \slot
setvar VAR_0x8004, APPRENTICE_FUNC_SET_PARTY_MON
special CallApprenticeFunction
.endm
.macro apprentice_initquestion which:req
setvar VAR_0x8004, APPRENTICE_FUNC_INIT_QUESTION_DATA
setvar VAR_0x8005, \which
special CallApprenticeFunction
.endm
.macro apprentice_freequestion
setvar VAR_0x8004, APPRENTICE_FUNC_FREE_QUESTION_DATA
special CallApprenticeFunction
.endm
.macro apprentice_buff whichstringvar:req, tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
setvar VAR_0x8005, \whichstringvar
setvar VAR_0x8006, \tobuff
special CallApprenticeFunction
.endm
.macro apprentice_buffv whichstringvar:req tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
setvar VAR_0x8005, \whichstringvar
copyvar VAR_0x8006, \tobuff
special CallApprenticeFunction
.endm
.macro apprentice_setmove
setvar VAR_0x8004, APPRENTICE_FUNC_SET_MOVE
special CallApprenticeFunction
.endm
.macro apprentice_setfirstmon monId:req
copyvar VAR_0x8005, \monId
setvar VAR_0x8004, APPRENTICE_FUNC_SET_FIRST_MON
special CallApprenticeFunction
.endm
.macro apprentice_openbag
setvar VAR_0x8004, APPRENTICE_FUNC_OPEN_BAG
special CallApprenticeFunction
waitstate
.endm
.macro apprentice_setgfx
setvar VAR_0x8004, APPRENTICE_FUNC_SET_GFX
special CallApprenticeFunction
.endm
.macro apprentice_shouldleave
setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE
special CallApprenticeFunction
.endm
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+19 -23
View File
@@ -1,44 +1,40 @@
BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690 map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694 map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_OnWarp
.byte 0 .byte 0
BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 BattleFrontier_BattleTowerLobby_OnResume: @ 823E690
special sub_81653CC special sub_81653CC
end end
BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694
call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter
setvar VAR_0x8004, APPRENTICE_FUNC_10 apprentice_shouldcheckgone
special CallApprenticeFunction compare VAR_0x8004, FALSE @ Always TRUE here
compare VAR_0x8004, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_HideApprentice
goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_23E6C1 BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice:: @ 823E6B5
BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
clearflag FLAG_HIDE_APPRENTICE clearflag FLAG_HIDE_APPRENTICE
setvar VAR_0x8004, APPRENTICE_FUNC_23 apprentice_setgfx
special CallApprenticeFunction BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice:: @ 823E6C0
BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
end end
BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1 BattleFrontier_BattleTowerLobby_EventScript_HideApprentice:: @ 823E6C1
setflag FLAG_HIDE_APPRENTICE setflag FLAG_HIDE_APPRENTICE
goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0 goto BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice
BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 BattleFrontier_BattleTowerLobby_OnWarp: @ 823E6C9
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3 map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth
.2byte 0 .2byte 0
BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3 BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707 map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707
map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710 map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710
map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE
data/scripts/apprentice.inc
+133 -201
View File
@@ -1,269 +1,204 @@
.macro apprentice_msg waitbuttonpress:req, which:req
setvar VAR_0x8004, APPRENTICE_FUNC_PRINT_MSG
setvar VAR_0x8005, \waitbuttonpress
setvar VAR_0x8006, \which
special CallApprenticeFunction
waitstate
.endm
.macro apprentice_buff whichstringvar:req, tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_16
setvar VAR_0x8005, \whichstringvar
setvar VAR_0x8006, \tobuff
special CallApprenticeFunction
.endm
.macro apprentice_menu which:req
setvar VAR_0x8004, APPRENTICE_FUNC_MENU
setvar VAR_0x8005, \which
special CallApprenticeFunction
waitstate
.endm
BattleFrontier_BattleTowerLobby_EventScript_Apprentice:: @ 82B688D BattleFrontier_BattleTowerLobby_EventScript_Apprentice:: @ 82B688D
lock lock
faceplayer faceplayer
setvar VAR_0x8004, APPRENTICE_FUNC_0 apprentice_gavelvlmode
special CallApprenticeFunction compare VAR_RESULT, FALSE
compare VAR_RESULT, 0 goto_if_eq Apprentice_EventScript_FirstMeeting
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6900 apprentice_shouldcheckgone
setvar VAR_0x8004, APPRENTICE_FUNC_SET_TRUE_1
special CallApprenticeFunction
compare VAR_0x8004, FALSE @ Always TRUE here compare VAR_0x8004, FALSE @ Always TRUE here
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE goto_if_eq Apprentice_EventScript_AskQuestion
goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_2B6E90 goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Apprentice_EventScript_Gone
Apprentice_EventScript_AskQuestion: @ 82B68BE
BattleFrontier_BattleTowerLobby_EventScript_2B68BE: @ 82B68BE apprentice_getquestion
setvar VAR_0x8004, APPRENTICE_FUNC_11 compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MON
special CallApprenticeFunction goto_if_eq Apprentice_EventScript_UseWhichMon
compare VAR_RESULT, 2 compare VAR_RESULT, APPRENTICE_QUESTION_WHAT_ITEM
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3 goto_if_eq Apprentice_EventScript_UseWhatHeldItem
compare VAR_RESULT, 4 compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MOVE
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF goto_if_eq Apprentice_EventScript_UseWhichMove
compare VAR_RESULT, 3 compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_FIRST
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77 goto_if_eq Apprentice_EventScript_PutWhichMonFirst
compare VAR_RESULT, 1 compare VAR_RESULT, APPRENTICE_QUESTION_WIN_SPEECH
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C goto_if_eq Apprentice_EventScript_PickWinSpeech
compare VAR_RESULT, 5
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4
release release
releaseall releaseall
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6900: @ 82B6900 Apprentice_EventScript_FirstMeeting: @ 82B6900
apprentice_buff 0, APPRENTICE_BUFF_NAME apprentice_buff 0, APPRENTICE_BUFF_NAME
apprentice_msg FALSE, 0 apprentice_msg FALSE, APPRENTICE_MSG_PLEASE_TEACH
BattleFrontier_BattleTowerLobby_EventScript_2B6925: @ 82B6925 Apprentice_EventScript_WhichLvlMode: @ 82B6925
apprentice_menu APPRENTICE_ASK_YES_NO apprentice_menu APPRENTICE_ASK_YES_NO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69BB goto_if_eq Apprentice_EventScript_RejectTeach
apprentice_msg FALSE, 2 apprentice_msg FALSE, APPRENTICE_MSG_WHICH_LVL_MODE
apprentice_menu APPRENTICE_ASK_WHICH_LEVEL apprentice_menu APPRENTICE_ASK_WHICH_LEVEL
setvar VAR_0x8004, APPRENTICE_FUNC_1 apprentice_setlvlmode VAR_RESULT
setorcopyvar VAR_0x8005, VAR_RESULT apprentice_3
addvar VAR_0x8005, 1
special CallApprenticeFunction
setvar VAR_0x8004, APPRENTICE_FUNC_3
special CallApprenticeFunction
apprentice_buff 0, APPRENTICE_BUFF_LEVEL apprentice_buff 0, APPRENTICE_BUFF_LEVEL
apprentice_msg TRUE, 3 apprentice_msg TRUE, APPRENTICE_MSG_THANKS_LVL_MODE
call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D call Apprentice_EventScript_Hide
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 case DIR_NORTH, Apprentice_EventScript_LeaveNorth
goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 goto Apprentice_EventScript_Leave
end end
BattleFrontier_BattleTowerLobby_EventScript_2B69BB: @ 82B69BB @ Its impossible to fully reject an Apprentice, they just keep asking for you to teach them
apprentice_msg FALSE, 1 Apprentice_EventScript_RejectTeach: @ 82B69BB
goto BattleFrontier_BattleTowerLobby_EventScript_2B6925 apprentice_msg FALSE, APPRENTICE_MSG_REJECT
goto Apprentice_EventScript_WhichLvlMode
BattleFrontier_BattleTowerLobby_EventScript_2B69D3: @ 82B69D3 Apprentice_EventScript_UseWhichMon: @ 82B69D3
setvar VAR_0x8004, APPRENTICE_FUNC_14 apprentice_initquestion APPRENTICE_QUESTION_WHICH_MON
setvar VAR_0x8005, 2
special CallApprenticeFunction
apprentice_buff 0, APPRENTICE_BUFF_SPECIES1 apprentice_buff 0, APPRENTICE_BUFF_SPECIES1
apprentice_buff 1, APPRENTICE_BUFF_SPECIES2 apprentice_buff 1, APPRENTICE_BUFF_SPECIES2
apprentice_msg FALSE, 6 apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON
apprentice_menu APPRENTICE_ASK_2SPECIES apprentice_menu APPRENTICE_ASK_2SPECIES
copyvar VAR_0x8005, VAR_RESULT copyvar VAR_0x8005, VAR_RESULT
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ABA call_if_eq Apprentice_EventScript_ChoseFirstMon
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC0 call_if_eq Apprentice_EventScript_ChoseSecondMon
setvar VAR_0x8004, APPRENTICE_FUNC_12 apprentice_getnumpartymons
special CallApprenticeFunction apprentice_setpartymon VAR_RESULT
copyvar VAR_0x8006, VAR_RESULT apprentice_answeredquestion
setvar VAR_0x8004, APPRENTICE_FUNC_13 apprentice_getnumpartymons
special CallApprenticeFunction compare VAR_RESULT, MULTI_PARTY_SIZE
setvar VAR_0x8004, APPRENTICE_FUNC_5 call_if_eq Apprentice_EventScript_LastMonSelected
special CallApprenticeFunction apprentice_buffv 0, VAR_0x8007
setvar VAR_0x8004, APPRENTICE_FUNC_12 apprentice_freequestion
special CallApprenticeFunction apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON
compare VAR_RESULT, 3 call Apprentice_EventScript_Hide
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC6
setvar VAR_0x8004, APPRENTICE_FUNC_16
setvar VAR_0x8005, 0
copyvar VAR_0x8006, VAR_0x8007
special CallApprenticeFunction
setvar VAR_0x8004, APPRENTICE_FUNC_15
special CallApprenticeFunction
apprentice_msg TRUE, 7
call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 case DIR_NORTH, Apprentice_EventScript_LeaveNorth
goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 goto Apprentice_EventScript_Leave
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6ABA: @ 82B6ABA Apprentice_EventScript_ChoseFirstMon: @ 82B6ABA
setvar VAR_0x8007, 0 setvar VAR_0x8007, APPRENTICE_BUFF_SPECIES1
return return
BattleFrontier_BattleTowerLobby_EventScript_2B6AC0: @ 82B6AC0 Apprentice_EventScript_ChoseSecondMon: @ 82B6AC0
setvar VAR_0x8007, 1 setvar VAR_0x8007, APPRENTICE_BUFF_SPECIES2
return return
BattleFrontier_BattleTowerLobby_EventScript_2B6AC6: @ 82B6AC6 Apprentice_EventScript_LastMonSelected: @ 82B6AC6
setvar VAR_0x8004, APPRENTICE_FUNC_4 setvar VAR_0x8004, APPRENTICE_FUNC_4
special CallApprenticeFunction special CallApprenticeFunction
return return
BattleFrontier_BattleTowerLobby_EventScript_2B6ACF: @ 82B6ACF Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF
setvar VAR_0x8004, APPRENTICE_FUNC_14 apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
setvar VAR_0x8005, 4
special CallApprenticeFunction
apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
apprentice_msg TRUE, 10 apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM
setvar VAR_0x8004, APPRENTICE_FUNC_15 apprentice_freequestion
special CallApprenticeFunction Apprentice_EventScript_ChooseHoldItem: @ 82B6B09
BattleFrontier_BattleTowerLobby_EventScript_2B6B09: @ 82B6B09
fadescreen 1 fadescreen 1
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
setvar VAR_0x8004, APPRENTICE_FUNC_19 apprentice_openbag
special CallApprenticeFunction
waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81 goto_if_eq Apprentice_EventScript_ConfirmHoldNothing
setvar VAR_0x8004, APPRENTICE_FUNC_20 setvar VAR_0x8004, APPRENTICE_FUNC_20
special CallApprenticeFunction special CallApprenticeFunction
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C goto_if_eq Apprentice_EventScript_AlreadySuggestedItem
apprentice_buff 0, APPRENTICE_BUFF_ITEM apprentice_buff 0, APPRENTICE_BUFF_ITEM
apprentice_msg TRUE, 12 apprentice_msg TRUE, APPRENTICE_MSG_THANKS_HELD_ITEM
setvar VAR_0x8004, APPRENTICE_FUNC_5 apprentice_answeredquestion
special CallApprenticeFunction call Apprentice_EventScript_Hide
call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 case DIR_NORTH, Apprentice_EventScript_LeaveNorth
goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 goto Apprentice_EventScript_Leave
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6B81: @ 82B6B81 Apprentice_EventScript_ConfirmHoldNothing: @ 82B6B81
setvar VAR_0x8004, APPRENTICE_FUNC_14 apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
setvar VAR_0x8005, 4
special CallApprenticeFunction
apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
apprentice_msg FALSE, 13 apprentice_msg FALSE, APPRENTICE_MSG_HOLD_NOTHING
apprentice_menu APPRENTICE_ASK_GIVE apprentice_menu APPRENTICE_ASK_GIVE
setvar VAR_0x8004, 15 apprentice_freequestion
special CallApprenticeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 goto_if_eq Apprentice_EventScript_ChooseHoldItem
Apprentice_EventScript_HoldNothing: @ 82B6BD4
BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: @ 82B6BD4 apprentice_msg TRUE, APPRENTICE_MSG_THANKS_NO_HELD_ITEM
apprentice_msg TRUE, 14 apprentice_answeredquestion
setvar VAR_0x8004, APPRENTICE_FUNC_5 call Apprentice_EventScript_Hide
special CallApprenticeFunction
call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 case DIR_NORTH, Apprentice_EventScript_LeaveNorth
goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 goto Apprentice_EventScript_Leave
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6C0C: @ 82B6C0C Apprentice_EventScript_AlreadySuggestedItem: @ 82B6C0C
setvar VAR_0x8004, APPRENTICE_FUNC_14 apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
setvar VAR_0x8005, 4
special CallApprenticeFunction
apprentice_buff 0, APPRENTICE_BUFF_ITEM apprentice_buff 0, APPRENTICE_BUFF_ITEM
apprentice_buff 1, APPRENTICE_BUFF_SPECIES3 apprentice_buff 1, APPRENTICE_BUFF_SPECIES3
apprentice_msg FALSE, 16 apprentice_msg FALSE, APPRENTICE_MSG_ITEM_ALREADY_SUGGESTED
apprentice_menu APPRENTICE_ASK_GIVE apprentice_menu APPRENTICE_ASK_GIVE
setvar VAR_0x8004, 15 apprentice_freequestion
special CallApprenticeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 goto_if_eq Apprentice_EventScript_ChooseHoldItem
goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4 goto Apprentice_EventScript_HoldNothing
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6C77: @ 82B6C77 Apprentice_EventScript_UseWhichMove: @ 82B6C77
setvar VAR_0x8004, APPRENTICE_FUNC_14 apprentice_initquestion APPRENTICE_QUESTION_WHICH_MOVE
setvar VAR_0x8005, 3
special CallApprenticeFunction
apprentice_buff 0, APPRENTICE_BUFF_SPECIES3 apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
apprentice_buff 1, APPRENTICE_BUFF_MOVE1 apprentice_buff 1, APPRENTICE_BUFF_MOVE1
apprentice_buff 2, APPRENTICE_BUFF_MOVE2 apprentice_buff 2, APPRENTICE_BUFF_MOVE2
apprentice_msg FALSE, 8 apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MOVE
apprentice_menu APPRENTICE_ASK_MOVES apprentice_menu APPRENTICE_ASK_MOVES
copyvar VAR_0x8005, VAR_RESULT copyvar VAR_0x8005, VAR_RESULT
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D50 call_if_eq Apprentice_EventScript_ChoseFirstMove
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D56 call_if_eq Apprentice_EventScript_ChoseSecondMove
setvar VAR_0x8004, APPRENTICE_FUNC_17 apprentice_setmove
special CallApprenticeFunction apprentice_answeredquestion
setvar VAR_0x8004, APPRENTICE_FUNC_5 apprentice_buffv 0, VAR_0x8007
special CallApprenticeFunction apprentice_freequestion
setvar VAR_0x8004, APPRENTICE_FUNC_16 apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MOVE
setvar VAR_0x8005, 0 call Apprentice_EventScript_Hide
copyvar VAR_0x8006, VAR_0x8007
special CallApprenticeFunction
setvar VAR_0x8004, APPRENTICE_FUNC_15
special CallApprenticeFunction
apprentice_msg TRUE, 9
call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 case DIR_NORTH, Apprentice_EventScript_LeaveNorth
goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 goto Apprentice_EventScript_Leave
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6D50: @ 82B6D50 Apprentice_EventScript_ChoseFirstMove: @ 82B6D50
setvar VAR_0x8007, 3 setvar VAR_0x8007, APPRENTICE_BUFF_MOVE1
return return
BattleFrontier_BattleTowerLobby_EventScript_2B6D56: @ 82B6D56 Apprentice_EventScript_ChoseSecondMove: @ 82B6D56
setvar VAR_0x8007, 4 setvar VAR_0x8007, APPRENTICE_BUFF_MOVE2
return return
BattleFrontier_BattleTowerLobby_EventScript_2B6D5C: @ 82B6D5C Apprentice_EventScript_PutWhichMonFirst: @ 82B6D5C
apprentice_msg FALSE, 4 apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON_FIRST
apprentice_menu APPRENTICE_ASK_3SPECIES apprentice_menu APPRENTICE_ASK_3SPECIES
copyvar VAR_0x8005, VAR_RESULT apprentice_setfirstmon VAR_RESULT
setvar VAR_0x8004, APPRENTICE_FUNC_18 apprentice_answeredquestion
special CallApprenticeFunction apprentice_buff 0, APPRENTICE_BUFF_FIRST_MON_SPECIES
setvar VAR_0x8004, APPRENTICE_FUNC_5 apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON_FIRST
special CallApprenticeFunction call Apprentice_EventScript_Hide
apprentice_buff 0, APPRENTICE_BUFF_SPECIES4
apprentice_msg TRUE, 5
call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 case DIR_NORTH, Apprentice_EventScript_LeaveNorth
goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 goto Apprentice_EventScript_Leave
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: @ 82B6DD4 @ Last question, after which the Apprentice leaves (and is saved) to be replaced by another
apprentice_msg TRUE, 11 Apprentice_EventScript_PickWinSpeech: @ 82B6DD4
apprentice_msg TRUE, APPRENTICE_MSG_PICK_WIN_SPEECH
setvar VAR_0x8004, APPRENTICE_FUNC_25 setvar VAR_0x8004, APPRENTICE_FUNC_25
special CallApprenticeFunction special CallApprenticeFunction
setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
@@ -272,52 +207,49 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: @ 82B6DD4
faceplayer faceplayer
setvar VAR_0x8004, APPRENTICE_FUNC_21 setvar VAR_0x8004, APPRENTICE_FUNC_21
special CallApprenticeFunction special CallApprenticeFunction
apprentice_buff 0, APPRENTICE_BUFF_EASY_CHAT apprentice_buff 0, APPRENTICE_BUFF_WIN_SPEECH
apprentice_msg TRUE, 15 apprentice_msg TRUE, APPRENTICE_MSG_THANKS_WIN_SPEECH
setvar VAR_0x8004, APPRENTICE_FUNC_9 apprentice_reset
special CallApprenticeFunction call Apprentice_EventScript_Hide
call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case DIR_NORTH, BattleFrontier_BattleTowerLobby_EventScript_2B6E54 case DIR_NORTH, Apprentice_EventScript_LeaveNorth
goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72 goto Apprentice_EventScript_Leave
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6E4D: @ 82B6E4D Apprentice_EventScript_Hide: @ 82B6E4D
setflag FLAG_HIDE_APPRENTICE setflag FLAG_HIDE_APPRENTICE
setflag FLAG_DAILY_APPRENTICE_LEAVES setflag FLAG_DAILY_APPRENTICE_LEAVES
return return
BattleFrontier_BattleTowerLobby_EventScript_2B6E54: @ 82B6E54 Apprentice_EventScript_LeaveNorth: @ 82B6E54
setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE apprentice_shouldleave
special CallApprenticeFunction
compare VAR_0x8004, FALSE @ Always TRUE here compare VAR_0x8004, FALSE @ Always TRUE here
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove goto_if_eq Apprentice_EventScript_DontMove
applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94 applymovement 6, Apprentice_Movement_LeaveNorth
waitmovement 0 waitmovement 0
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6E72: @ 82B6E72 Apprentice_EventScript_Leave: @ 82B6E72
setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE apprentice_shouldleave
special CallApprenticeFunction
compare VAR_0x8004, FALSE @ Always TRUE here compare VAR_0x8004, FALSE @ Always TRUE here
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove goto_if_eq Apprentice_EventScript_DontMove
applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95 applymovement 6, Apprentice_Movement_Leave
waitmovement 0 waitmovement 0
end end
BattleFrontier_BattleTowerLobby_EventScript_2B6E90: @ 82B6E90 Apprentice_EventScript_Gone: @ 82B6E90
release release
releaseall releaseall
end end
BattleFrontier_BattleTowerLobby_EventScript_ApprenticeDontMove: @ 82B6E93 Apprentice_EventScript_DontMove: @ 82B6E93
end end
BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94 Apprentice_Movement_LeaveNorth: @ 82B6E94
walk_fast_right walk_fast_right
BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 Apprentice_Movement_Leave: @ 82B6E95
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_right walk_fast_right
data/text/apprentice.inc
+48 -48
View File
@@ -62,7 +62,7 @@ gText_ApprenticeChallenge15:: @ 82B71F9
.string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice,\n" .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice,\n"
.string "and that's no lie.$" .string "and that's no lie.$"
gText_ApprenticeIntro0:: @ 82B7229 gText_ApprenticePleaseTeach0:: @ 82B7229
.string "Are you… {PLAYER}?\n" .string "Are you… {PLAYER}?\n"
.string "Oh! Sniff…sob…\p" .string "Oh! Sniff…sob…\p"
.string "Oh! S-sorry…\n" .string "Oh! S-sorry…\n"
@@ -100,7 +100,7 @@ gText_ApprenticeLevelModeThanks0:: @ 82B7423
.string "Thank you so much!\l" .string "Thank you so much!\l"
.string "Please talk with me again!$" .string "Please talk with me again!$"
gText_ApprenticeIntro1:: @ 82B74C1 gText_ApprenticePleaseTeach1:: @ 82B74C1
.string "Wowee! You're {PLAYER}, aren't you?\n" .string "Wowee! You're {PLAYER}, aren't you?\n"
.string "You're awesomely strong, aren't you?\p" .string "You're awesomely strong, aren't you?\p"
.string "I'm {STR_VAR_1}!\n" .string "I'm {STR_VAR_1}!\n"
@@ -127,7 +127,7 @@ gText_ApprenticeLevelModeThanks1:: @ 82B763F
.string "If we meet here again, please teach\n" .string "If we meet here again, please teach\n"
.string "me something else, teacher!$" .string "me something else, teacher!$"
gText_ApprenticeIntro2:: @ 82B76AC gText_ApprenticePleaseTeach2:: @ 82B76AC
.string "Um… Are you {PLAYER}?\n" .string "Um… Are you {PLAYER}?\n"
.string "My name is {STR_VAR_1}.\p" .string "My name is {STR_VAR_1}.\p"
.string "I want to become a POKéMON TRAINER,\n" .string "I want to become a POKéMON TRAINER,\n"
@@ -156,7 +156,7 @@ gText_ApprenticeLevelModeThanks2:: @ 82B7871
.string "If I have another question, I'll come\n" .string "If I have another question, I'll come\n"
.string "back here for your advice!$" .string "back here for your advice!$"
gText_ApprenticeIntro3:: @ 82B78D4 gText_ApprenticePleaseTeach3:: @ 82B78D4
.string "Oh? Huh? You're…\n" .string "Oh? Huh? You're…\n"
.string "No, that can't be true.\p" .string "No, that can't be true.\p"
.string "There isn't any way that someone\n" .string "There isn't any way that someone\n"
@@ -211,7 +211,7 @@ gText_ApprenticeLevelModeThanks3:: @ 82B7D18
.string "Thank you very much for spending\n" .string "Thank you very much for spending\n"
.string "time with someone like me.$" .string "time with someone like me.$"
gText_ApprenticeIntro4:: @ 82B7DD4 gText_ApprenticePleaseTeach4:: @ 82B7DD4
.string "Oh! You're {PLAYER}{KUN}, aren't you?\p" .string "Oh! You're {PLAYER}{KUN}, aren't you?\p"
.string "I've heard that you're tough at\n" .string "I've heard that you're tough at\n"
.string "POKéMON!\p" .string "POKéMON!\p"
@@ -246,7 +246,7 @@ gText_ApprenticeLevelModeThanks4:: @ 82B7FE8
.string "Okay, I'll look to you for advice again.\n" .string "Okay, I'll look to you for advice again.\n"
.string "Bye!$" .string "Bye!$"
gText_ApprenticeIntro5:: @ 82B8087 gText_ApprenticePleaseTeach5:: @ 82B8087
.string "Oh, hi, there! {PLAYER}{KUN}!\n" .string "Oh, hi, there! {PLAYER}{KUN}!\n"
.string "I know you because you're famous!\l" .string "I know you because you're famous!\l"
.string "Call me {STR_VAR_1}! Glad to meet you!\p" .string "Call me {STR_VAR_1}! Glad to meet you!\p"
@@ -282,7 +282,7 @@ gText_ApprenticeLevelModeThanks5:: @ 82B8356
.string "…Whoops, I'd better go to work!\n" .string "…Whoops, I'd better go to work!\n"
.string "Thanks! See you around!$" .string "Thanks! See you around!$"
gText_ApprenticeIntro6:: @ 82B83CE gText_ApprenticePleaseTeach6:: @ 82B83CE
.string "No way! Uh-uh!\n" .string "No way! Uh-uh!\n"
.string "Are you maybe the real {PLAYER}?\p" .string "Are you maybe the real {PLAYER}?\p"
.string "A-hah! Awesome! I'm {STR_VAR_1},\n" .string "A-hah! Awesome! I'm {STR_VAR_1},\n"
@@ -322,7 +322,7 @@ gText_ApprenticeLevelModeThanks6:: @ 82B8656
.string "Let's meet here again, okay?\n" .string "Let's meet here again, okay?\n"
.string "Thanks!$" .string "Thanks!$"
gText_ApprenticeIntro7:: @ 82B86EA gText_ApprenticePleaseTeach7:: @ 82B86EA
.string "I beg your pardon, but…\n" .string "I beg your pardon, but…\n"
.string "Are you {PLAYER}?\p" .string "Are you {PLAYER}?\p"
.string "I'm {STR_VAR_1}, and I am delighted to\n" .string "I'm {STR_VAR_1}, and I am delighted to\n"
@@ -361,7 +361,7 @@ gText_ApprenticeLevelModeThanks7:: @ 82B8957
.string "I hope I can count on you again.\l" .string "I hope I can count on you again.\l"
.string "Please take care!$" .string "Please take care!$"
gText_ApprenticeIntro8:: @ 82B89C6 gText_ApprenticePleaseTeach8:: @ 82B89C6
.string "Eek! Eek! {PLAYER}!\n" .string "Eek! Eek! {PLAYER}!\n"
.string "You spoke to me!\l" .string "You spoke to me!\l"
.string "I… I'm overjoyed!\p" .string "I… I'm overjoyed!\p"
@@ -398,7 +398,7 @@ gText_ApprenticeLevelModeThanks8:: @ 82B8C20
.string "I hope you'll be willing to teach me\n" .string "I hope you'll be willing to teach me\n"
.string "some more another time.$" .string "some more another time.$"
gText_ApprenticeIntro9:: @ 82B8CAA gText_ApprenticePleaseTeach9:: @ 82B8CAA
.string "Whoa! Could you be…\n" .string "Whoa! Could you be…\n"
.string "Might you be… {PLAYER}{KUN}?!\l" .string "Might you be… {PLAYER}{KUN}?!\l"
.string "That strong and famous TRAINER?\l" .string "That strong and famous TRAINER?\l"
@@ -432,7 +432,7 @@ gText_ApprenticeLevelModeThanks9:: @ 82B8ED5
.string "All right, I'll look to you as my mentor!\n" .string "All right, I'll look to you as my mentor!\n"
.string "Adios!$" .string "Adios!$"
gText_ApprenticeIntro10:: @ 82B8F45 gText_ApprenticePleaseTeach10:: @ 82B8F45
.string "Oh, hey, {PLAYER}{KUN}, right?\n" .string "Oh, hey, {PLAYER}{KUN}, right?\n"
.string "The police were looking for you!\p" .string "The police were looking for you!\p"
.string "… … …\n" .string "… … …\n"
@@ -473,7 +473,7 @@ gText_ApprenticeLevelModeThanks10:: @ 82B9204
.string "Thanks, master!\n" .string "Thanks, master!\n"
.string "I hope you'll keep teaching me!$" .string "I hope you'll keep teaching me!$"
gText_ApprenticeIntro11:: @ 82B929C gText_ApprenticePleaseTeach11:: @ 82B929C
.string "A-H-O-Y!\n" .string "A-H-O-Y!\n"
.string "And that spells ahoy, and it means hi!\p" .string "And that spells ahoy, and it means hi!\p"
.string "I'm {STR_VAR_1}, the rappin' SAILOR\n" .string "I'm {STR_VAR_1}, the rappin' SAILOR\n"
@@ -513,7 +513,7 @@ gText_ApprenticeLevelModeThanks11:: @ 82B9564
.string "If it's advice I ever need,\n" .string "If it's advice I ever need,\n"
.string "{PLAYER}, your word I'll always heed!$" .string "{PLAYER}, your word I'll always heed!$"
gText_ApprenticeIntro12:: @ 82B95D8 gText_ApprenticePleaseTeach12:: @ 82B95D8
.string "Say, hey, aren't you {PLAYER}?\n" .string "Say, hey, aren't you {PLAYER}?\n"
.string "What should I do? Talk to you?\l" .string "What should I do? Talk to you?\l"
.string "Why not? I'm already talking to you!\p" .string "Why not? I'm already talking to you!\p"
@@ -550,7 +550,7 @@ gText_ApprenticeLevelModeThanks12:: @ 82B989A
.string "but don't you forget about me.\p" .string "but don't you forget about me.\p"
.string "See you again, my smart friend!$" .string "See you again, my smart friend!$"
gText_ApprenticeIntro13:: @ 82B992D gText_ApprenticePleaseTeach13:: @ 82B992D
.string "Oh, hi! You there!\n" .string "Oh, hi! You there!\n"
.string "Can I get you to massage my shoulder?\p" .string "Can I get you to massage my shoulder?\p"
.string "…Yes, there! That's it!\n" .string "…Yes, there! That's it!\n"
@@ -584,7 +584,7 @@ gText_ApprenticeLevelModeThanks13:: @ 82B9B76
.string "I hope I can keep hitting you up for\n" .string "I hope I can keep hitting you up for\n"
.string "help--after all, you're my mentor!$" .string "help--after all, you're my mentor!$"
gText_ApprenticeIntro14:: @ 82B9BF2 gText_ApprenticePleaseTeach14:: @ 82B9BF2
.string "Er… Um…\n" .string "Er… Um…\n"
.string "{PLAYER}{KUN}…?\p" .string "{PLAYER}{KUN}…?\p"
.string "Please, don't look at me that way.\n" .string "Please, don't look at me that way.\n"
@@ -625,7 +625,7 @@ gText_ApprenticeLevelModeThanks14:: @ 82B9EAA
.string "If we meet again, I hope you will be\l" .string "If we meet again, I hope you will be\l"
.string "as helpful.$" .string "as helpful.$"
gText_ApprenticeIntro15:: @ 82B9F55 gText_ApprenticePleaseTeach15:: @ 82B9F55
.string "Hm? You appear to be {PLAYER}{KUN}…\n" .string "Hm? You appear to be {PLAYER}{KUN}…\n"
.string "But are you really real?\p" .string "But are you really real?\p"
.string "You may call me {STR_VAR_1}.\p" .string "You may call me {STR_VAR_1}.\p"
@@ -677,12 +677,12 @@ gText_ApprenticeHoldNothing0:: @ 82BA34E
.string "Oh, really? I shouldn't make\n" .string "Oh, really? I shouldn't make\n"
.string "my {STR_VAR_1} hold anything?$" .string "my {STR_VAR_1} hold anything?$"
gText_ApprenticeThanksHeldItem0:: @ 82BA380 gText_ApprenticeThanksNoHeldItem0:: @ 82BA380
.string "Oh, okay! I'm delighted it's settled!\n" .string "Oh, okay! I'm delighted it's settled!\n"
.string "Awesome! Wicked! Awoooh!\p" .string "Awesome! Wicked! Awoooh!\p"
.string "Thank you so much!$" .string "Thank you so much!$"
gText_ApprenticeThanksHaveHeldItem0:: @ 82BA3D2 gText_ApprenticeThanksHeldItem0:: @ 82BA3D2
.string "Oh, I'm so glad…\n" .string "Oh, I'm so glad…\n"
.string "I think I have that {STR_VAR_1}, too.\p" .string "I think I have that {STR_VAR_1}, too.\p"
.string "I'm delighted it's settled!\n" .string "I'm delighted it's settled!\n"
@@ -709,11 +709,11 @@ gText_ApprenticeHoldNothing1:: @ 82BA58C
.string "Huh? You mean my {STR_VAR_1} doesn't\n" .string "Huh? You mean my {STR_VAR_1} doesn't\n"
.string "have to hold anything?$" .string "have to hold anything?$"
gText_ApprenticeThanksHeldItem1:: @ 82BA5BF gText_ApprenticeThanksNoHeldItem1:: @ 82BA5BF
.string "Oh, I get it! I'll do that!\n" .string "Oh, I get it! I'll do that!\n"
.string "Thanks for teaching me!$" .string "Thanks for teaching me!$"
gText_ApprenticeThanksHaveHeldItem1:: @ 82BA5F3 gText_ApprenticeThanksHeldItem1:: @ 82BA5F3
.string "Oh, wow! One {STR_VAR_1}, huh?\n" .string "Oh, wow! One {STR_VAR_1}, huh?\n"
.string "Okay, I'll do that!\p" .string "Okay, I'll do that!\p"
.string "Thanks for teaching me!$" .string "Thanks for teaching me!$"
@@ -735,11 +735,11 @@ gText_ApprenticeHoldNothing2:: @ 82BA742
.string "Oh, then my {STR_VAR_1} doesn't have\n" .string "Oh, then my {STR_VAR_1} doesn't have\n"
.string "to hold anything?$" .string "to hold anything?$"
gText_ApprenticeThanksHeldItem2:: @ 82BA770 gText_ApprenticeThanksNoHeldItem2:: @ 82BA770
.string "Okay, I got it!\n" .string "Okay, I got it!\n"
.string "See you again!$" .string "See you again!$"
gText_ApprenticeThanksHaveHeldItem2:: @ 82BA78F gText_ApprenticeThanksHeldItem2:: @ 82BA78F
.string "Oh, the item {STR_VAR_1}?\n" .string "Oh, the item {STR_VAR_1}?\n"
.string "Understood!\p" .string "Understood!\p"
.string "I'll do my best to find one!\n" .string "I'll do my best to find one!\n"
@@ -768,13 +768,13 @@ gText_ApprenticeHoldNothing3:: @ 82BA96B
.string "A POKéMON belonging to someone like me\n" .string "A POKéMON belonging to someone like me\n"
.string "would be better off without an item?$" .string "would be better off without an item?$"
gText_ApprenticeThanksHeldItem3:: @ 82BA9B7 gText_ApprenticeThanksNoHeldItem3:: @ 82BA9B7
.string "I understand…\n" .string "I understand…\n"
.string "You're saying I shouldn't rely on items.\l" .string "You're saying I shouldn't rely on items.\l"
.string "I'll do my best not to!\p" .string "I'll do my best not to!\p"
.string "Thank you very much!$" .string "Thank you very much!$"
gText_ApprenticeThanksHaveHeldItem3:: @ 82BAA1B gText_ApprenticeThanksHeldItem3:: @ 82BAA1B
.string "The item {STR_VAR_1}, okay.\n" .string "The item {STR_VAR_1}, okay.\n"
.string "I'm not sure if I can get one…\l" .string "I'm not sure if I can get one…\l"
.string "No! I'll do my best to get it.\p" .string "No! I'll do my best to get it.\p"
@@ -804,7 +804,7 @@ gText_ApprenticeHoldNothing4:: @ 82BAC43
.string "Oh! So my {STR_VAR_1} should do\n" .string "Oh! So my {STR_VAR_1} should do\n"
.string "the best it can empty-handed?$" .string "the best it can empty-handed?$"
gText_ApprenticeThanksHeldItem4:: @ 82BAC78 gText_ApprenticeThanksNoHeldItem4:: @ 82BAC78
.string "If you think that's best, I'll do that.\p" .string "If you think that's best, I'll do that.\p"
.string "Knowing that you made the decision,\n" .string "Knowing that you made the decision,\n"
.string "{PLAYER}{KUN}, I won't be so upset if\l" .string "{PLAYER}{KUN}, I won't be so upset if\l"
@@ -812,7 +812,7 @@ gText_ApprenticeThanksHeldItem4:: @ 82BAC78
.string "Okay, I'll look to you for advice again.\n" .string "Okay, I'll look to you for advice again.\n"
.string "Bye!$" .string "Bye!$"
gText_ApprenticeThanksHaveHeldItem4:: @ 82BAD17 gText_ApprenticeThanksHeldItem4:: @ 82BAD17
.string "The item {STR_VAR_1}, huh?\n" .string "The item {STR_VAR_1}, huh?\n"
.string "Not bad. I'll use it!\p" .string "Not bad. I'll use it!\p"
.string "Knowing that you made the decision,\n" .string "Knowing that you made the decision,\n"
@@ -844,13 +844,13 @@ gText_ApprenticeHoldNothing5:: @ 82BAF4E
.string "Oh, so me being a busy guy, you say\n" .string "Oh, so me being a busy guy, you say\n"
.string "my {STR_VAR_1} doesn't need anything?$" .string "my {STR_VAR_1} doesn't need anything?$"
gText_ApprenticeThanksHeldItem5:: @ 82BAF8F gText_ApprenticeThanksNoHeldItem5:: @ 82BAF8F
.string "Okay, gotcha.\n" .string "Okay, gotcha.\n"
.string "I won't need any time for that.\p" .string "I won't need any time for that.\p"
.string "Thanks today!\n" .string "Thanks today!\n"
.string "See you around!$" .string "See you around!$"
gText_ApprenticeThanksHaveHeldItem5:: @ 82BAFDB gText_ApprenticeThanksHeldItem5:: @ 82BAFDB
.string "Okay, gotcha.\n" .string "Okay, gotcha.\n"
.string "I'll find time somehow and find\l" .string "I'll find time somehow and find\l"
.string "that {STR_VAR_1} you recommended.\p" .string "that {STR_VAR_1} you recommended.\p"
@@ -877,14 +877,14 @@ gText_ApprenticeHoldNothing6:: @ 82BB18C
.string "Is that right? My {STR_VAR_1} doesn't\n" .string "Is that right? My {STR_VAR_1} doesn't\n"
.string "need to hold an item, you're saying.$" .string "need to hold an item, you're saying.$"
gText_ApprenticeThanksHeldItem6:: @ 82BB1CE gText_ApprenticeThanksNoHeldItem6:: @ 82BB1CE
.string "Okay, that's what I'll do!\p" .string "Okay, that's what I'll do!\p"
.string "I guess that's about all I wanted\n" .string "I guess that's about all I wanted\n"
.string "to ask you today.\p" .string "to ask you today.\p"
.string "Let's meet here again, okay?\n" .string "Let's meet here again, okay?\n"
.string "Thanks!$" .string "Thanks!$"
gText_ApprenticeThanksHaveHeldItem6:: @ 82BB242 gText_ApprenticeThanksHeldItem6:: @ 82BB242
.string "Uh-huh! One {STR_VAR_1}.\n" .string "Uh-huh! One {STR_VAR_1}.\n"
.string "What a cool choice!\l" .string "What a cool choice!\l"
.string "I'll definitely try that!\p" .string "I'll definitely try that!\p"
@@ -919,14 +919,14 @@ gText_ApprenticeHoldNothing7:: @ 82BB4C3
.string "In other words… My POKéMON has\n" .string "In other words… My POKéMON has\n"
.string "no need to hold an item?$" .string "no need to hold an item?$"
gText_ApprenticeThanksHeldItem7:: @ 82BB4FB gText_ApprenticeThanksNoHeldItem7:: @ 82BB4FB
.string "I understand clearly now!\n" .string "I understand clearly now!\n"
.string "I will keep trying like this.\p" .string "I will keep trying like this.\p"
.string "Thank you, {PLAYER}.\n" .string "Thank you, {PLAYER}.\n"
.string "I hope I can count on you again.\l" .string "I hope I can count on you again.\l"
.string "Please take care!$" .string "Please take care!$"
gText_ApprenticeThanksHaveHeldItem7:: @ 82BB575 gText_ApprenticeThanksHeldItem7:: @ 82BB575
.string "One {STR_VAR_1} it is!\n" .string "One {STR_VAR_1} it is!\n"
.string "I will order it right away.\p" .string "I will order it right away.\p"
.string "Thank you, {PLAYER}.\n" .string "Thank you, {PLAYER}.\n"
@@ -951,13 +951,13 @@ gText_ApprenticeHoldNothing8:: @ 82BB6E5
.string "Oh, wow! I didn't expect that answer!\n" .string "Oh, wow! I didn't expect that answer!\n"
.string "So, a hold item isn't necessary?$" .string "So, a hold item isn't necessary?$"
gText_ApprenticeThanksHeldItem8:: @ 82BB72C gText_ApprenticeThanksNoHeldItem8:: @ 82BB72C
.string "Perfectly understood!\n" .string "Perfectly understood!\n"
.string "I'll keep at this without an item!\p" .string "I'll keep at this without an item!\p"
.string "I hope you'll be willing to teach me\n" .string "I hope you'll be willing to teach me\n"
.string "some more another time.$" .string "some more another time.$"
gText_ApprenticeThanksHaveHeldItem8:: @ 82BB7A2 gText_ApprenticeThanksHeldItem8:: @ 82BB7A2
.string "{STR_VAR_1}! I'll use that!\p" .string "{STR_VAR_1}! I'll use that!\p"
.string "Um… Could it be, {PLAYER}, you also\n" .string "Um… Could it be, {PLAYER}, you also\n"
.string "make your POKéMON hold that item?\p" .string "make your POKéMON hold that item?\p"
@@ -986,13 +986,13 @@ gText_ApprenticeHoldNothing9:: @ 82BB970
.string "Oh? So, you're saying my {STR_VAR_1}\n" .string "Oh? So, you're saying my {STR_VAR_1}\n"
.string "can win without holding any item?$" .string "can win without holding any item?$"
gText_ApprenticeThanksHeldItem9:: @ 82BB9AE gText_ApprenticeThanksNoHeldItem9:: @ 82BB9AE
.string "Si, bueno!\n" .string "Si, bueno!\n"
.string "I'll give it my best shot, like, slam!\p" .string "I'll give it my best shot, like, slam!\p"
.string "All right, thanks, as always!\n" .string "All right, thanks, as always!\n"
.string "Adios!$" .string "Adios!$"
gText_ApprenticeThanksHaveHeldItem9:: @ 82BBA05 gText_ApprenticeThanksHeldItem9:: @ 82BBA05
.string "Uh-huh, that's one {STR_VAR_1}?\n" .string "Uh-huh, that's one {STR_VAR_1}?\n"
.string "Si, bueno!\l" .string "Si, bueno!\l"
.string "I'll go find me one, like, bam!\p" .string "I'll go find me one, like, bam!\p"
@@ -1023,7 +1023,7 @@ gText_ApprenticeHoldNothing10:: @ 82BBC1C
.string "What's that mean?\n" .string "What's that mean?\n"
.string "Don't make it hold anything?$" .string "Don't make it hold anything?$"
gText_ApprenticeThanksHeldItem10:: @ 82BBC4B gText_ApprenticeThanksNoHeldItem10:: @ 82BBC4B
.string "Okay, so it shouldn't hold anything.\n" .string "Okay, so it shouldn't hold anything.\n"
.string "Then, I'd better get something for it!\p" .string "Then, I'd better get something for it!\p"
.string "Just kidding!\n" .string "Just kidding!\n"
@@ -1031,7 +1031,7 @@ gText_ApprenticeThanksHeldItem10:: @ 82BBC4B
.string "Thanks, master!\n" .string "Thanks, master!\n"
.string "I hope you'll keep teaching me!$" .string "I hope you'll keep teaching me!$"
gText_ApprenticeThanksHaveHeldItem10:: @ 82BBCF6 gText_ApprenticeThanksHeldItem10:: @ 82BBCF6
.string "Okay, so it's one {STR_VAR_1}!\n" .string "Okay, so it's one {STR_VAR_1}!\n"
.string "I'll make it hold anything but that!\p" .string "I'll make it hold anything but that!\p"
.string "Just kidding!\n" .string "Just kidding!\n"
@@ -1062,13 +1062,13 @@ gText_ApprenticeHoldNothing11:: @ 82BBEE5
.string "My {STR_VAR_1} doesn't need to be\l" .string "My {STR_VAR_1} doesn't need to be\l"
.string "holding anything tight?$" .string "holding anything tight?$"
gText_ApprenticeThanksHeldItem11:: @ 82BBF25 gText_ApprenticeThanksNoHeldItem11:: @ 82BBF25
.string "Okay, I hear you, sure I do!\n" .string "Okay, I hear you, sure I do!\n"
.string "My POKéMON will go empty-handed, too!\p" .string "My POKéMON will go empty-handed, too!\p"
.string "If it's advice I ever need,\n" .string "If it's advice I ever need,\n"
.string "{PLAYER}, your word I'll always heed!$" .string "{PLAYER}, your word I'll always heed!$"
gText_ApprenticeThanksHaveHeldItem11:: @ 82BBFA4 gText_ApprenticeThanksHeldItem11:: @ 82BBFA4
.string "Okay, one {STR_VAR_1},\n" .string "Okay, one {STR_VAR_1},\n"
.string "that's what I'll use.\l" .string "that's what I'll use.\l"
.string "I was right to make you choose!\p" .string "I was right to make you choose!\p"
@@ -1101,14 +1101,14 @@ gText_ApprenticeHoldNothing12:: @ 82BC213
.string "My {STR_VAR_1} needs nothing?\n" .string "My {STR_VAR_1} needs nothing?\n"
.string "Doesn't need to hold anything?$" .string "Doesn't need to hold anything?$"
gText_ApprenticeThanksHeldItem12:: @ 82BC247 gText_ApprenticeThanksNoHeldItem12:: @ 82BC247
.string "If holding nothing is the best,\n" .string "If holding nothing is the best,\n"
.string "I'll do as you suggest!\p" .string "I'll do as you suggest!\p"
.string "Well, {PLAYER}, I have to roam free,\n" .string "Well, {PLAYER}, I have to roam free,\n"
.string "but don't you forget about me.\p" .string "but don't you forget about me.\p"
.string "See you again, my smart friend!$" .string "See you again, my smart friend!$"
gText_ApprenticeThanksHaveHeldItem12:: @ 82BC2DD gText_ApprenticeThanksHeldItem12:: @ 82BC2DD
.string "If holding that {STR_VAR_1} is\n" .string "If holding that {STR_VAR_1} is\n"
.string "the best, I'll do as you suggest!\p" .string "the best, I'll do as you suggest!\p"
.string "Well, {PLAYER}, I have to roam free,\n" .string "Well, {PLAYER}, I have to roam free,\n"
@@ -1139,13 +1139,13 @@ gText_ApprenticeHoldNothing13:: @ 82BC514
.string "So your suggestion is my {STR_VAR_1}\n" .string "So your suggestion is my {STR_VAR_1}\n"
.string "doesn't have to hold anything?$" .string "doesn't have to hold anything?$"
gText_ApprenticeThanksHeldItem13:: @ 82BC555 gText_ApprenticeThanksNoHeldItem13:: @ 82BC555
.string "Hm, all right. That would be easier\n" .string "Hm, all right. That would be easier\n"
.string "for me, the way things are now.\p" .string "for me, the way things are now.\p"
.string "I hope I can keep hitting you up\n" .string "I hope I can keep hitting you up\n"
.string "for help like this.$" .string "for help like this.$"
gText_ApprenticeThanksHaveHeldItem13:: @ 82BC5CE gText_ApprenticeThanksHeldItem13:: @ 82BC5CE
.string "Hm, all right. That's one {STR_VAR_1}.\n" .string "Hm, all right. That's one {STR_VAR_1}.\n"
.string "My POKéMON's arm is fine, so I'll make\l" .string "My POKéMON's arm is fine, so I'll make\l"
.string "it hold that item right away.\p" .string "it hold that item right away.\p"
@@ -1177,7 +1177,7 @@ gText_ApprenticeHoldNothing14:: @ 82BC808
.string "Oh… Then, you think it would be better\n" .string "Oh… Then, you think it would be better\n"
.string "if my {STR_VAR_1} didn't have an item?$" .string "if my {STR_VAR_1} didn't have an item?$"
gText_ApprenticeThanksHeldItem14:: @ 82BC84D gText_ApprenticeThanksNoHeldItem14:: @ 82BC84D
.string "Oh… Okay!\n" .string "Oh… Okay!\n"
.string "I'll go without an item.\p" .string "I'll go without an item.\p"
.string "This is nerve-racking, though.\n" .string "This is nerve-racking, though.\n"
@@ -1186,7 +1186,7 @@ gText_ApprenticeThanksHeldItem14:: @ 82BC84D
.string "If we meet again, I hope you will be\l" .string "If we meet again, I hope you will be\l"
.string "as helpful.$" .string "as helpful.$"
gText_ApprenticeThanksHaveHeldItem14:: @ 82BC8EA gText_ApprenticeThanksHeldItem14:: @ 82BC8EA
.string "Oh… Okay!\n" .string "Oh… Okay!\n"
.string "I'll go with that {STR_VAR_1}.\p" .string "I'll go with that {STR_VAR_1}.\p"
.string "This is nerve-racking, though.\n" .string "This is nerve-racking, though.\n"
@@ -1220,12 +1220,12 @@ gText_ApprenticeHoldNothing15:: @ 82BCB75
.string "It's better if it held nothing?\n" .string "It's better if it held nothing?\n"
.string "Are you certain?$" .string "Are you certain?$"
gText_ApprenticeThanksHeldItem15:: @ 82BCBA6 gText_ApprenticeThanksNoHeldItem15:: @ 82BCBA6
.string "I see. If that's the case, that's fine.\n" .string "I see. If that's the case, that's fine.\n"
.string "I thank you for your time.\p" .string "I thank you for your time.\p"
.string "Let us meet again!$" .string "Let us meet again!$"
gText_ApprenticeThanksHaveHeldItem15:: @ 82BCBFC gText_ApprenticeThanksHeldItem15:: @ 82BCBFC
.string "One {STR_VAR_1}?\n" .string "One {STR_VAR_1}?\n"
.string "Are you certain?\p" .string "Are you certain?\p"
.string "I see. If that's the case, that's fine.\n" .string "I see. If that's the case, that's fine.\n"
include/apprentice.h
+1 -1
View File
@@ -10,7 +10,7 @@ struct ApprenticeTrainer
u8 facilityClass; u8 facilityClass;
u16 species[APPRENTICE_SPECIES_COUNT]; u16 species[APPRENTICE_SPECIES_COUNT];
u8 id; u8 id;
u16 easyChatWords[6]; u16 speechLost[EASY_CHAT_BATTLE_WORDS_COUNT];
}; };
extern const struct ApprenticeTrainer gApprentices[]; extern const struct ApprenticeTrainer gApprentices[];
include/constants/apprentice.h
+44 -20
View File
@@ -7,33 +7,57 @@
#define APPRENTICE_LVL_MODE_50 (FRONTIER_LVL_50 + 1) #define APPRENTICE_LVL_MODE_50 (FRONTIER_LVL_50 + 1)
#define APPRENTICE_LVL_MODE_OPEN (FRONTIER_LVL_OPEN + 1) #define APPRENTICE_LVL_MODE_OPEN (FRONTIER_LVL_OPEN + 1)
#define APPRENTICE_FUNC_0 0 #define APPRENTICE_FUNC_GAVE_LVLMODE 0
#define APPRENTICE_FUNC_1 1 #define APPRENTICE_FUNC_SET_LVLMODE 1
#define APPRENTICE_FUNC_2 2 #define APPRENTICE_FUNC_SET_ID 2
#define APPRENTICE_FUNC_3 3 #define APPRENTICE_FUNC_3 3
#define APPRENTICE_FUNC_4 4 #define APPRENTICE_FUNC_4 4
#define APPRENTICE_FUNC_5 5 #define APPRENTICE_FUNC_ANSWERED_QUESTION 5
#define APPRENTICE_FUNC_6 6 #define APPRENTICE_FUNC_6 6
#define APPRENTICE_FUNC_MENU 7 #define APPRENTICE_FUNC_MENU 7
#define APPRENTICE_FUNC_PRINT_MSG 8 #define APPRENTICE_FUNC_PRINT_MSG 8
#define APPRENTICE_FUNC_9 9 #define APPRENTICE_FUNC_RESET 9
#define APPRENTICE_FUNC_SET_TRUE_1 10 #define APPRENTICE_FUNC_CHECK_GONE 10
#define APPRENTICE_FUNC_11 11 #define APPRENTICE_FUNC_GET_QUESTION 11
#define APPRENTICE_FUNC_12 12 #define APPRENTICE_FUNC_GET_NUM_PARTY_MONS 12
#define APPRENTICE_FUNC_13 13 #define APPRENTICE_FUNC_SET_PARTY_MON 13
#define APPRENTICE_FUNC_14 14 #define APPRENTICE_FUNC_INIT_QUESTION_DATA 14
#define APPRENTICE_FUNC_15 15 #define APPRENTICE_FUNC_FREE_QUESTION_DATA 15
#define APPRENTICE_FUNC_16 16 #define APPRENTICE_FUNC_BUFFER_STRING 16
#define APPRENTICE_FUNC_17 17 #define APPRENTICE_FUNC_SET_MOVE 17
#define APPRENTICE_FUNC_18 18 #define APPRENTICE_FUNC_SET_FIRST_MON 18
#define APPRENTICE_FUNC_19 19 #define APPRENTICE_FUNC_OPEN_BAG 19
#define APPRENTICE_FUNC_20 20 #define APPRENTICE_FUNC_20 20
#define APPRENTICE_FUNC_21 21 #define APPRENTICE_FUNC_21 21
#define APPRENTICE_FUNC_22 22 #define APPRENTICE_FUNC_SET_GFX_SAVED 22
#define APPRENTICE_FUNC_23 23 #define APPRENTICE_FUNC_SET_GFX 23
#define APPRENTICE_FUNC_24 24 #define APPRENTICE_FUNC_SHOULD_LEAVE 24
#define APPRENTICE_FUNC_25 25 #define APPRENTICE_FUNC_25 25
#define APPRENTICE_MSG_PLEASE_TEACH 0
#define APPRENTICE_MSG_REJECT 1
#define APPRENTICE_MSG_WHICH_LVL_MODE 2
#define APPRENTICE_MSG_THANKS_LVL_MODE 3
#define APPRENTICE_MSG_WHICH_MON_FIRST 4
#define APPRENTICE_MSG_THANKS_MON_FIRST 5
#define APPRENTICE_MSG_WHICH_MON 6
#define APPRENTICE_MSG_THANKS_MON 7
#define APPRENTICE_MSG_WHICH_MOVE 8
#define APPRENTICE_MSG_THANKS_MOVE 9
#define APPRENTICE_MSG_WHAT_HELD_ITEM 10
#define APPRENTICE_MSG_PICK_WIN_SPEECH 11
#define APPRENTICE_MSG_THANKS_HELD_ITEM 12
#define APPRENTICE_MSG_HOLD_NOTHING 13
#define APPRENTICE_MSG_THANKS_NO_HELD_ITEM 14
#define APPRENTICE_MSG_THANKS_WIN_SPEECH 15
#define APPRENTICE_MSG_ITEM_ALREADY_SUGGESTED 16
#define APPRENTICE_QUESTION_WHICH_FIRST 1
#define APPRENTICE_QUESTION_WHICH_MON 2
#define APPRENTICE_QUESTION_WHICH_MOVE 3
#define APPRENTICE_QUESTION_WHAT_ITEM 4
#define APPRENTICE_QUESTION_WIN_SPEECH 5
#define APPRENTICE_ASK_WHICH_LEVEL 0 #define APPRENTICE_ASK_WHICH_LEVEL 0
#define APPRENTICE_ASK_3SPECIES 1 #define APPRENTICE_ASK_3SPECIES 1
#define APPRENTICE_ASK_2SPECIES 2 #define APPRENTICE_ASK_2SPECIES 2
@@ -48,8 +72,8 @@
#define APPRENTICE_BUFF_MOVE2 4 #define APPRENTICE_BUFF_MOVE2 4
#define APPRENTICE_BUFF_ITEM 5 #define APPRENTICE_BUFF_ITEM 5
#define APPRENTICE_BUFF_NAME 6 #define APPRENTICE_BUFF_NAME 6
#define APPRENTICE_BUFF_EASY_CHAT 7 #define APPRENTICE_BUFF_WIN_SPEECH 7
#define APPRENTICE_BUFF_LEVEL 8 #define APPRENTICE_BUFF_LEVEL 8
#define APPRENTICE_BUFF_SPECIES4 9 #define APPRENTICE_BUFF_FIRST_MON_SPECIES 9
#endif // GUARD_CONSTANTS_APPRENTICE_H #endif // GUARD_CONSTANTS_APPRENTICE_H
include/global.h
+4 -4
View File
@@ -223,7 +223,7 @@ struct Apprentice
u8 field_1; u8 field_1;
u8 number; u8 number;
struct ApprenticeMon party[MULTI_PARTY_SIZE]; struct ApprenticeMon party[MULTI_PARTY_SIZE];
u16 easyChatWords[EASY_CHAT_BATTLE_WORDS_COUNT]; u16 speechWon[EASY_CHAT_BATTLE_WORDS_COUNT];
u8 playerId[TRAINER_ID_LENGTH]; u8 playerId[TRAINER_ID_LENGTH];
u8 playerName[PLAYER_NAME_LENGTH]; u8 playerName[PLAYER_NAME_LENGTH];
u8 language; u8 language;
@@ -415,9 +415,9 @@ struct Sav2_B8
struct PlayersApprentice struct PlayersApprentice
{ {
/*0xB0*/ u8 id; /*0xB0*/ u8 id;
/*0xB1*/ u8 lvlMode:2; //0: Unassigned, 1: Lv 50, 2: Open Lv /*0xB1*/ u8 lvlMode:2; //0: Unassigned, 1: Lv 50, 2: Open Lv
/*0xB1*/ u8 field_B1_1:4; /*0xB1*/ u8 questionsAnswered:4;
/*0xB1*/ u8 field_B1_2:2; /*0xB1*/ u8 firstMonId:2;
/*0xB2*/ u8 field_B2_0:3; /*0xB2*/ u8 field_B2_0:3;
/*0xB2*/ u8 field_B2_1:2; /*0xB2*/ u8 field_B2_1:2;
/*0xB3*/ u8 field_B3; /*0xB3*/ u8 field_B3;
include/item_menu.h
+1 -1
View File
@@ -71,7 +71,7 @@ extern u16 gSpecialVar_ItemId;
void sub_81AAC14(void); void sub_81AAC14(void);
void FavorLadyOpenBagMenu(void); void FavorLadyOpenBagMenu(void);
void QuizLadyOpenBagMenu(void); void QuizLadyOpenBagMenu(void);
void sub_81AAC28(void); void ApprenticeOpenBagMenu(void);
void sub_81AABB0(void); void sub_81AABB0(void);
void SetInitialScrollAndCursorPositions(u8 pocketId); void SetInitialScrollAndCursorPositions(u8 pocketId);
void bag_menu_mail_related(void); void bag_menu_mail_related(void);
src/apprentice.c
+244 -231
View File
File diff suppressed because it is too large Load Diff
src/easy_chat.c
+1 -1
View File
@@ -1320,7 +1320,7 @@ void ShowEasyChatScreen(void)
words = &gSaveBlock1Ptr->lilycoveLady.quiz.correctAnswer; words = &gSaveBlock1Ptr->lilycoveLady.quiz.correctAnswer;
break; break;
case EASY_CHAT_TYPE_APPRENTICE: case EASY_CHAT_TYPE_APPRENTICE:
words = gSaveBlock2Ptr->apprentices[0].easyChatWords; words = gSaveBlock2Ptr->apprentices[0].speechWon;
break; break;
case EASY_CHAT_TYPE_QUESTIONNAIRE: case EASY_CHAT_TYPE_QUESTIONNAIRE:
words = sub_801B058(); words = sub_801B058();
src/frontier_util.c
+3 -3
View File
@@ -1725,7 +1725,7 @@ void CopyFrontierTrainerText(u8 whichText, u16 trainerId)
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
FrontierSpeechToString(GetRecordedBattleEasyChatSpeech()); FrontierSpeechToString(GetRecordedBattleEasyChatSpeech());
else else
FrontierSpeechToString(gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].easyChatWords); FrontierSpeechToString(gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].speechWon);
} }
break; break;
case FRONTIER_PLAYER_WON_TEXT: case FRONTIER_PLAYER_WON_TEXT:
@@ -1753,12 +1753,12 @@ void CopyFrontierTrainerText(u8 whichText, u16 trainerId)
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
{ {
trainerId = GetRecordedBattleApprenticeId(); trainerId = GetRecordedBattleApprenticeId();
FrontierSpeechToString(gApprentices[trainerId].easyChatWords); FrontierSpeechToString(gApprentices[trainerId].speechLost);
} }
else else
{ {
trainerId = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id; trainerId = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id;
FrontierSpeechToString(gApprentices[trainerId].easyChatWords); FrontierSpeechToString(gApprentices[trainerId].speechLost);
} }
} }
break; break;
src/item_menu.c
+4 -4
View File
@@ -119,7 +119,7 @@ void sub_81AD9C0(u8);
void sub_81ADB14(u8); void sub_81ADB14(u8);
void sub_81ADA7C(u8); void sub_81ADA7C(u8);
void sub_81ADC0C(u8); void sub_81ADC0C(u8);
void bag_menu_leave_maybe(void); void CB2_ApprenticeExitBagMenu(void);
void CB2_FavorLadyExitBagMenu(void); void CB2_FavorLadyExitBagMenu(void);
void CB2_QuizLadyExitBagMenu(void); void CB2_QuizLadyExitBagMenu(void);
void sub_81ABA6C(void); void sub_81ABA6C(void);
@@ -492,9 +492,9 @@ void sub_81AAC14(void)
GoToBagMenu(RETURN_LOCATION_PC, POCKETS_COUNT, sub_816B31C); GoToBagMenu(RETURN_LOCATION_PC, POCKETS_COUNT, sub_816B31C);
} }
void sub_81AAC28(void) void ApprenticeOpenBagMenu(void)
{ {
GoToBagMenu(RETURN_LOCATION_FIELD_6, POCKETS_COUNT, bag_menu_leave_maybe); GoToBagMenu(RETURN_LOCATION_FIELD_6, POCKETS_COUNT, CB2_ApprenticeExitBagMenu);
gSpecialVar_0x8005 = 0; gSpecialVar_0x8005 = 0;
gSpecialVar_Result = 0; gSpecialVar_Result = 0;
} }
@@ -2203,7 +2203,7 @@ void unknown_ItemMenu_Show(u8 taskId)
unknown_ItemMenu_Confirm(taskId); unknown_ItemMenu_Confirm(taskId);
} }
void bag_menu_leave_maybe(void) void CB2_ApprenticeExitBagMenu(void)
{ {
gFieldCallback = Apprentice_EnableBothScriptContexts; gFieldCallback = Apprentice_EnableBothScriptContexts;
SetMainCallback2(CB2_ReturnToField); SetMainCallback2(CB2_ReturnToField);
src/recorded_battle.c
+8 -8
View File
@@ -409,12 +409,12 @@ bool32 MoveRecordedBattleToSaveData(void)
if (sBattleOutcome == B_OUTCOME_WON) if (sBattleOutcome == B_OUTCOME_WON)
{ {
for (i = 0; i < 6; i++) for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].speechLost[i]; battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].speechLost[i];
} }
else else
{ {
for (i = 0; i < 6; i++) for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].speechWon[i]; battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].speechWon[i];
} }
battleSave->recordMixFriendLanguage = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].language; battleSave->recordMixFriendLanguage = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_FRIEND].language;
@@ -427,12 +427,12 @@ bool32 MoveRecordedBattleToSaveData(void)
if (sBattleOutcome == B_OUTCOME_WON) if (sBattleOutcome == B_OUTCOME_WON)
{ {
for (i = 0; i < 6; i++) for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].speechLost[i]; battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].speechLost[i];
} }
else else
{ {
for (i = 0; i < 6; i++) for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].speechWon[i]; battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].speechWon[i];
} }
battleSave->recordMixFriendLanguage = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].language; battleSave->recordMixFriendLanguage = gSaveBlock2Ptr->frontier.towerRecords[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_FRIEND].language;
@@ -449,15 +449,15 @@ bool32 MoveRecordedBattleToSaveData(void)
if (gTrainerBattleOpponent_A >= TRAINER_RECORD_MIXING_APPRENTICE) if (gTrainerBattleOpponent_A >= TRAINER_RECORD_MIXING_APPRENTICE)
{ {
battleSave->apprenticeId = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].id; battleSave->apprenticeId = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].id;
for (i = 0; i < 6; i++) for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].easyChatWords[i]; battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].speechWon[i];
battleSave->apprenticeLanguage = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].language; battleSave->apprenticeLanguage = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_A - TRAINER_RECORD_MIXING_APPRENTICE].language;
} }
else if (gTrainerBattleOpponent_B >= TRAINER_RECORD_MIXING_APPRENTICE) else if (gTrainerBattleOpponent_B >= TRAINER_RECORD_MIXING_APPRENTICE)
{ {
battleSave->apprenticeId = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].id; battleSave->apprenticeId = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].id;
for (i = 0; i < 6; i++) for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].easyChatWords[i]; battleSave->easyChatSpeech[i] = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].speechWon[i];
battleSave->apprenticeLanguage = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].language; battleSave->apprenticeLanguage = gSaveBlock2Ptr->apprentices[gTrainerBattleOpponent_B - TRAINER_RECORD_MIXING_APPRENTICE].language;
} }
else if (gPartnerTrainerId >= TRAINER_RECORD_MIXING_APPRENTICE) else if (gPartnerTrainerId >= TRAINER_RECORD_MIXING_APPRENTICE)