dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document some Quest Log

Browse Source
This commit is contained in:
GriffinR
2020-01-14 21:27:45 -05:00
parent 2f81b4a204
commit 04d176334a
126 changed files with 2157 additions and 2068 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
+1 -1
View File
@@ -1926,7 +1926,7 @@ sub_8081668: @ 8081668
bl sub_8055DB8
bl LoadPlayerParty
bl SavePlayerBag
bl sub_81134B8
bl Special_UpdateTrainerFansAfterLinkBattle
ldr r0, _080816B8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x5
asm/field_control_avatar.s
+6 -6
View File
@@ -100,7 +100,7 @@ _0806C914:
orrs r0, r1
strb r0, [r5]
_0806C940:
ldr r0, _0806CA18 @ =gUnknown_203ADFA
ldr r0, _0806CA18 @ =gQuestLogState
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -158,7 +158,7 @@ _0806C996:
orrs r0, r1
strb r0, [r5, 0x1]
_0806C9AC:
ldr r0, _0806CA18 @ =gUnknown_203ADFA
ldr r0, _0806CA18 @ =gQuestLogState
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -198,7 +198,7 @@ _0806C9E6:
orrs r0, r1
strb r0, [r5]
_0806C9F6:
ldr r0, _0806CA18 @ =gUnknown_203ADFA
ldr r0, _0806CA18 @ =gQuestLogState
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -214,7 +214,7 @@ _0806C9F6:
b _0806CA3E
.align 2, 0
_0806CA14: .4byte gPlayerAvatar
_0806CA18: .4byte gUnknown_203ADFA
_0806CA18: .4byte gQuestLogState
_0806CA1C:
movs r0, 0x80
ands r0, r1
@@ -1787,7 +1787,7 @@ sub_806D698: @ 806D698
bl InUnionRoom
cmp r0, 0x1
beq _0806D72C
ldr r0, _0806D6E0 @ =gUnknown_203ADFA
ldr r0, _0806D6E0 @ =gQuestLogState
ldrb r0, [r0]
cmp r0, 0x2
beq _0806D72C
@@ -1813,7 +1813,7 @@ sub_806D698: @ 806D698
bl ScriptContext1_SetupScript
b _0806D730
.align 2, 0
_0806D6E0: .4byte gUnknown_203ADFA
_0806D6E0: .4byte gQuestLogState
_0806D6E4: .4byte gPlayerAvatar
_0806D6E8: .4byte gUnknown_81A8CED
_0806D6EC:
asm/field_effect.s
+2 -2
View File
@@ -7227,7 +7227,7 @@ _08086BA4: .4byte sub_8086990
thumb_func_start sub_8086BA8
sub_8086BA8: @ 8086BA8
push {lr}
ldr r0, _08086BC8 @ =gUnknown_203ADFA
ldr r0, _08086BC8 @ =gQuestLogState
ldrb r0, [r0]
cmp r0, 0x1
bne _08086BBA
@@ -7242,7 +7242,7 @@ _08086BBA:
pop {r1}
bx r1
.align 2, 0
_08086BC8: .4byte gUnknown_203ADFA
_08086BC8: .4byte gQuestLogState
_08086BCC: .4byte sub_8086BD0
thumb_func_end sub_8086BA8
asm/field_message_box.s
+2 -2
View File
@@ -53,7 +53,7 @@ _08069398:
beq _080693EA
b _08069402
_0806939E:
ldr r0, _080693BC @ =gUnknown_203ADFA
ldr r0, _080693BC @ =gQuestLogState
ldrb r0, [r0]
cmp r0, 0x2
bne _080693C4
@@ -68,7 +68,7 @@ _0806939E:
bl TextWindow_LoadTilesStdFrame1
b _080693E2
.align 2, 0
_080693BC: .4byte gUnknown_203ADFA
_080693BC: .4byte gQuestLogState
_080693C0: .4byte gTextFlags
_080693C4:
bl IsMsgSignPost
asm/link_rfu_2.s
+8 -8
View File
@@ -935,7 +935,7 @@ _080F8DBC: .4byte 0x00000993
thumb_func_start sub_80F8DC0
sub_80F8DC0: @ 80F8DC0
push {r4-r6,lr}
ldr r0, _080F8DE0 @ =gUnknown_203ADFA
ldr r0, _080F8DE0 @ =gQuestLogState
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -950,7 +950,7 @@ sub_80F8DC0: @ 80F8DC0
ldr r0, _080F8DE8 @ =sub_80F8738
b _080F8DF2
.align 2, 0
_080F8DE0: .4byte gUnknown_203ADFA
_080F8DE0: .4byte gQuestLogState
_080F8DE4: .4byte gUnknown_3005450
_080F8DE8: .4byte sub_80F8738
_080F8DEC:
@@ -1021,7 +1021,7 @@ _080F8E70: .4byte gUnknown_843ED88
thumb_func_start sub_80F8E74
sub_80F8E74: @ 80F8E74
push {lr}
ldr r0, _080F8E98 @ =gUnknown_203ADFA
ldr r0, _080F8E98 @ =gQuestLogState
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -1038,7 +1038,7 @@ _080F8E92:
pop {r0}
bx r0
.align 2, 0
_080F8E98: .4byte gUnknown_203ADFA
_080F8E98: .4byte gQuestLogState
_080F8E9C: .4byte sub_80F8738
_080F8EA0: .4byte gUnknown_3005450
thumb_func_end sub_80F8E74
@@ -1106,7 +1106,7 @@ _080F8F0A:
thumb_func_start sub_80F8F10
sub_80F8F10: @ 80F8F10
push {lr}
ldr r0, _080F8F34 @ =gUnknown_203ADFA
ldr r0, _080F8F34 @ =gQuestLogState
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -1123,7 +1123,7 @@ _080F8F2E:
pop {r0}
bx r0
.align 2, 0
_080F8F34: .4byte gUnknown_203ADFA
_080F8F34: .4byte gQuestLogState
_080F8F38: .4byte sub_80F893C
_080F8F3C: .4byte gUnknown_3005450
thumb_func_end sub_80F8F10
@@ -7040,7 +7040,7 @@ _080FBBFC: .4byte sub_80F8D20
thumb_func_start sub_80FBC00
sub_80FBC00: @ 80FBC00
push {r4-r7,lr}
ldr r0, _080FBC4C @ =gUnknown_203ADFA
ldr r0, _080FBC4C @ =gQuestLogState
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -7076,7 +7076,7 @@ _080FBC46:
pop {r0}
bx r0
.align 2, 0
_080FBC4C: .4byte gUnknown_203ADFA
_080FBC4C: .4byte gQuestLogState
_080FBC50: .4byte gUnknown_3005450
_080FBC54: .4byte sub_80FB5EC
_080FBC58: .4byte gUnknown_203ABF0
asm/link_rfu_3.s
+2 -2
View File
@@ -7565,7 +7565,7 @@ InitUnionRoom: @ 811999C
adds r6, r0, 0
movs r0, 0xFF
strb r0, [r5]
ldr r0, _081199EC @ =gUnknown_203ADFA
ldr r0, _081199EC @ =gQuestLogState
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -7596,7 +7596,7 @@ _081199E0:
bx r0
.align 2, 0
_081199E8: .4byte gUnknown_203B04C
_081199EC: .4byte gUnknown_203ADFA
_081199EC: .4byte gQuestLogState
_081199F0: .4byte sub_81199FC
_081199F4: .4byte gUnknown_203B05C
_081199F8: .4byte gUnknown_300202C
asm/macros/event.inc
+4 -4
View File
@@ -1627,9 +1627,9 @@
call EventScript_SetGymTrainers
.endm
@ Appears frequently at start of NPC scripts. Should be used once named/understood
.macro unk_questlog
special sub_8110AB4
@ Jumps to dest if the Quest Log is currently showing playback scenes (dest is usually a release/end)
.macro goto_if_questlog dest:req
special Special_GetQuestLogState
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_eq \dest
.endm
asm/overworld.s
+4 -4
View File
@@ -3360,7 +3360,7 @@ sub_8056534: @ 8056534
lsrs r0, 24
cmp r0, 0x1
beq _08056554
ldr r0, _08056564 @ =gUnknown_203ADFA
ldr r0, _08056564 @ =gQuestLogState
ldrb r0, [r0]
cmp r0, 0x2
bne _08056568
@@ -3370,7 +3370,7 @@ _08056554:
.align 2, 0
_0805655C: .4byte gMain
_08056560: .4byte sub_80565B4
_08056564: .4byte gUnknown_203ADFA
_08056564: .4byte gQuestLogState
_08056568:
ldrh r0, [r4, 0x2E]
ldrh r1, [r4, 0x2C]
@@ -4145,7 +4145,7 @@ _08056BFA:
_08056BFE:
bl mli4_mapscripts_and_other
bl sub_8057114
ldr r0, _08056C1C @ =gUnknown_203ADFA
ldr r0, _08056C1C @ =gQuestLogState
ldrb r0, [r0]
cmp r0, 0x2
beq _08056C16
@@ -4155,7 +4155,7 @@ _08056C16:
bl sub_812B35C
b _08056CCA
.align 2, 0
_08056C1C: .4byte gUnknown_203ADFA
_08056C1C: .4byte gQuestLogState
_08056C20:
bl InitCurrentFlashLevelScanlineEffect
bl sub_8056F1C
asm/pokemon_storage_system.s
+1 -1
View File
@@ -8649,7 +8649,7 @@ _0808FF62:
strb r6, [r1, 0x5]
_0808FF64:
adds r0, r2, 0
bl sub_8113550
bl SetQuestLogEvent
_0808FF6A:
pop {r4-r7}
pop {r0}
asm/union_room_chat.s
+1 -1
View File
@@ -165,7 +165,7 @@ _08128554:
bl SetMainCallback2
movs r0, 0x11
movs r1, 0
bl sub_8113550
bl SetQuestLogEvent
ldr r0, _081285A8 @ =sub_81285E8
movs r1, 0x8
bl CreateTask
data/event_scripts.s
+5 -8
View File
@@ -27,6 +27,7 @@
#include "constants/field_weather.h"
#include "constants/union_room.h"
#include "constants/trade.h"
#include "constants/quest_log.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
@@ -1179,7 +1180,7 @@ EventScript_ResetAllMapFlags:: @ 81A6481
EventScript_1A651A:: @ 81A651A
clearflag FLAG_HIDE_POSTGAME_GOSSIPERS
call EventScript_ResetEliteFour
special sub_81130A8
special Special_UpdateTrainerFanClubGameClear
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, FALSE
call_if_eq EventScript_1A653B
@@ -1247,9 +1248,7 @@ EventScript_OutOfCenterPartyHeal:: @ 81A6C26
EventScript_WallTownMap:: @ 81A6C32
lockall
msgbox Text_ATownMap
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
fadescreen FADE_TO_BLACK
special Special_TownMap
waitstate
@@ -1594,7 +1593,7 @@ gUnknown_81A7ADB:: @ 81A7ADB
release
end
EventScript_1A7AE0:: @ 81A7AE0
EventScript_ReleaseEnd:: @ 81A7AE0
release
end
@@ -2005,9 +2004,7 @@ EventScript_1B2993:: @ 81B2993
EventScript_1B2994:: @ 81B2994
applymovement 1, Movement_FacePlayer
waitmovement 0
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
compare VAR_0x8008, 0
goto_if_eq EventScript_1B29C6
data/maps/BirthIsland_Exterior/scripts.inc
+1 -3
View File
@@ -42,9 +42,7 @@ BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D
BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
lock
faceplayer
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special DoDeoxysRockInteraction
waitstate
data/maps/CeladonCity_Condominiums_3F/scripts.inc
+1 -3
View File
@@ -31,9 +31,7 @@ EventScript_16C418:: @ 816C418
message Text_1963CD
waitmessage
delay 60
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special Special_ShowDiploma
waitstate
release
data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+2 -6
View File
@@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
end
CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
@@ -42,9 +40,7 @@ Items_16BB38:: @ 816BB38
end
CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+1 -3
View File
@@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
end
CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+2 -6
View File
@@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
end
CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
@@ -40,9 +38,7 @@ Items_16BC84:: @ 816BC84
end
CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
.byte 0
CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/CeladonCity_GameCorner/scripts.inc
+1 -3
View File
@@ -19,9 +19,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
end
CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
showmoneybox 0, 0, 0
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+3 -9
View File
@@ -13,9 +13,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
lock
faceplayer
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CBB2
@@ -250,9 +248,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
lock
faceplayer
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CE47
@@ -347,9 +343,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
lock
faceplayer
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CFB2
data/maps/CeruleanCave_B1F/scripts.inc
+1 -3
View File
@@ -23,9 +23,7 @@ EventScript_1624F1:: @ 81624F1
return
CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/CeruleanCity_House4/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
.byte 0
CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
data/maps/CeruleanCity_House5/scripts.inc
+1 -3
View File
@@ -174,9 +174,7 @@ CeruleanCity_House5_EventScript_NotEnoughBerryPowder:: @ 816B0CC
CeruleanCity_House5_EventScript_BerryCrushRankings:: @ 816B0DA
lockall
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special ShowBerryCrushRankings
waitstate
releaseall
data/maps/CeruleanCity_Mart/scripts.inc
+1 -3
View File
@@ -10,9 +10,7 @@ CeruleanCity_Mart_EventScript_Woman:: @ 816ACA7
end
CeruleanCity_Mart_EventScript_Clerk:: @ 816ACB0
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/CinnabarIsland_Mart/scripts.inc
+1 -3
View File
@@ -10,9 +10,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
end
CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+1 -3
View File
@@ -24,9 +24,7 @@ EventScript_164C52:: @ 8164C52
applymovement 1, Movement_164CC8
waitmovement 0
msgbox gUnknown_817D062
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_164CB6
goto_if_questlog EventScript_164CB6
trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086
msgbox gUnknown_817D0B2
closemessage
data/maps/FiveIsland_MemorialPillar/scripts.inc
+1 -3
View File
@@ -32,9 +32,7 @@ EventScript_168A22:: @ 8168A22
end
FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lockall
goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD
.byte 0
FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D
.byte 0
FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/FourIsland/scripts.inc
+1 -3
View File
@@ -70,9 +70,7 @@ Movement_167D52:: @ 8167D52
step_end
FourIsland_EventScript_167D55:: @ 8167D55
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/FourIsland_Mart/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD
.byte 0
FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/FourIsland_PokemonDayCare/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F
.byte 0
FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
specialvar VAR_RESULT, GetDaycareState
data/maps/FuchsiaCity_Mart/scripts.inc
+1 -3
View File
@@ -10,9 +10,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA
end
FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+1 -3
View File
@@ -41,9 +41,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3
end
IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/LavenderTown_Mart/scripts.inc
+1 -3
View File
@@ -14,9 +14,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362
end
LavenderTown_Mart_EventScript_16B36B:: @ 816B36B
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/MtEmber_Summit/scripts.inc
+1 -3
View File
@@ -23,9 +23,7 @@ EventScript_163B2F:: @ 8163B2F
return
MtEmber_Summit_EventScript_163B33:: @ 8163B33
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/NavelRock_Base/scripts.inc
+1 -3
View File
@@ -29,9 +29,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120
return
NavelRock_Base_EventScript_Lugia:: @ 8165134
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/NavelRock_Summit/scripts.inc
+1 -3
View File
@@ -32,9 +32,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7
return
NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lockall
setvar VAR_TEMP_1, 1
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -3
View File
@@ -44,9 +44,7 @@ EventScript_168DAF:: @ 8168DAF
end
EventScript_168DB9:: @ 8168DB9
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
goto_if_lt EventScript_168E46
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+1 -3
View File
@@ -31,9 +31,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB
gUnknown_8168CE4:: @ 8168CE4
PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
setvar VAR_0x8004, 32
special Special_SetSomeVariable
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -3
View File
@@ -978,9 +978,7 @@ EventScript_1699F9:: @ 81699F9
end
EventScript_1699FB:: @ 81699FB
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E
goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78
data/maps/PewterCity_Mart/scripts.inc
+1 -3
View File
@@ -10,9 +10,7 @@ PewterCity_Mart_EventScript_Boy:: @ 816A6D7
end
PewterCity_Mart_EventScript_Clerk:: @ 816A6E0
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+1 -3
View File
@@ -55,9 +55,7 @@ EventScript_162B76:: @ 8162B76
delay 20
call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3
call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_162C68
goto_if_questlog EventScript_162C68
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
savebgm MUS_WIN_GYM
data/maps/PokemonLeague_LancesRoom/scripts.inc
+1 -1
View File
@@ -139,7 +139,7 @@ EventScript_162AA1:: @ 8162AA1
EventScript_162AAB:: @ 8162AAB
setvar VAR_0x8004, 0
special sub_8113530
special Special_TryGainNewFanFromCounter
setflag FLAG_DEFEATED_LANCE
call EventScript_1A7563
msgbox gUnknown_8178A52
data/maps/PokemonTower_6F/scripts.inc
+1 -3
View File
@@ -5,9 +5,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
lockall
textcolor 2
msgbox gUnknown_817A2F8
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special ScrSpecial_StartMarowakBattle
waitstate
data/maps/PowerPlant/scripts.inc
+3 -9
View File
@@ -34,9 +34,7 @@ EventScript_1637B4:: @ 81637B4
return
PowerPlant_EventScript_1637B8:: @ 81637B8
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -75,9 +73,7 @@ EventScript_163824:: @ 8163824
end
PowerPlant_EventScript_16382F:: @ 816382F
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
@@ -106,9 +102,7 @@ EventScript_163884:: @ 8163884
end
PowerPlant_EventScript_16388D:: @ 816388D
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
data/maps/Route12/scripts.inc
+1 -3
View File
@@ -14,9 +14,7 @@ Route12_EventScript_168014:: @ 8168014
lock
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
msgbox gUnknown_81853CC, MSGBOX_YESNO
compare VAR_RESULT, NO
data/maps/Route12_FishingHouse/scripts.inc
+1 -3
View File
@@ -30,9 +30,7 @@ EventScript_16FF75:: @ 816FF75
end
EventScript_16FF7F:: @ 816FF7F
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
data/maps/Route16/scripts.inc
+1 -3
View File
@@ -33,9 +33,7 @@ Route16_EventScript_168121:: @ 8168121
lock
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_1681A3
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
msgbox gUnknown_81853CC, MSGBOX_YESNO
compare VAR_RESULT, NO
data/maps/SaffronCity_House1_2F/scripts.inc
+1 -3
View File
@@ -18,9 +18,7 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70
end
SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/SaffronCity_Mart/scripts.inc
+1 -3
View File
@@ -10,9 +10,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC
end
SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+81 -81
View File
@@ -78,38 +78,38 @@ SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
end
EventScript_16F15B:: @ 816F15B
special UpdateMovedSaffronFanClubMembers
setvar VAR_0x8004, 0
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
special Special_TryLoseFansFromPlayTime
setvar VAR_0x8004, FANCLUB_MEMBER1
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F207
setvar VAR_0x8004, 1
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
setvar VAR_0x8004, FANCLUB_MEMBER2
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F213
setvar VAR_0x8004, 2
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
setvar VAR_0x8004, FANCLUB_MEMBER3
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F21F
setvar VAR_0x8004, 3
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
setvar VAR_0x8004, FANCLUB_MEMBER4
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F22B
setvar VAR_0x8004, 4
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
setvar VAR_0x8004, FANCLUB_MEMBER5
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F237
setvar VAR_0x8004, 5
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
setvar VAR_0x8004, FANCLUB_MEMBER6
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F243
setvar VAR_0x8004, 6
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
setvar VAR_0x8004, FANCLUB_MEMBER7
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F24F
setvar VAR_0x8004, 7
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
setvar VAR_0x8004, FANCLUB_MEMBER8
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F25B
end
@@ -164,22 +164,22 @@ EventScript_16F267:: @ 816F267
SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
lock
faceplayer
setvar VAR_0x8004, 0
special BufferStreakTrainerText
setvar VAR_0x8004, FANCLUB_MEMBER1
special Special_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq EventScript_16F2EE
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F2C0
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F2E4
msgbox gUnknown_819C420
release
end
EventScript_16F2C0:: @ 816F2C0
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F2DA
msgbox gUnknown_819C390
@@ -204,22 +204,22 @@ EventScript_16F2EE:: @ 816F2EE
SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
lock
faceplayer
setvar VAR_0x8004, 3
special BufferStreakTrainerText
setvar VAR_0x8004, FANCLUB_MEMBER4
special Special_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq EventScript_16F365
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F337
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F35B
msgbox gUnknown_819CBD3
release
end
EventScript_16F337:: @ 816F337
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F351
msgbox gUnknown_819CB32
@@ -244,22 +244,22 @@ EventScript_16F365:: @ 816F365
SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
lock
faceplayer
setvar VAR_0x8004, 1
special BufferStreakTrainerText
setvar VAR_0x8004, FANCLUB_MEMBER2
special Special_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq EventScript_16F3DC
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F3AE
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F3D2
msgbox gUnknown_819C6BA
release
end
EventScript_16F3AE:: @ 816F3AE
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F3C8
msgbox gUnknown_819C5A9
@@ -284,22 +284,22 @@ EventScript_16F3DC:: @ 816F3DC
SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
lock
faceplayer
setvar VAR_0x8004, 2
special BufferStreakTrainerText
setvar VAR_0x8004, FANCLUB_MEMBER3
special Special_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq EventScript_16F453
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F425
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F449
msgbox gUnknown_819C986
release
end
EventScript_16F425:: @ 816F425
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F43F
msgbox gUnknown_819C81E
@@ -324,20 +324,20 @@ EventScript_16F453:: @ 816F453
SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
lock
faceplayer
setvar VAR_0x8004, 5
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
setvar VAR_0x8004, FANCLUB_MEMBER6
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F491
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F4B5
msgbox gUnknown_819D01F
release
end
EventScript_16F491:: @ 816F491
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F4AB
msgbox gUnknown_819CEDF
@@ -357,20 +357,20 @@ EventScript_16F4B5:: @ 816F4B5
SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
lock
faceplayer
setvar VAR_0x8004, 4
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
setvar VAR_0x8004, FANCLUB_MEMBER5
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F4F3
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F517
msgbox gUnknown_819CDDA
release
end
EventScript_16F4F3:: @ 816F4F3
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F50D
msgbox gUnknown_819CCF3
@@ -390,20 +390,20 @@ EventScript_16F517:: @ 816F517
SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
lock
faceplayer
setvar VAR_0x8004, 6
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
setvar VAR_0x8004, FANCLUB_MEMBER7
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F555
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F579
msgbox gUnknown_819D1AE
release
end
EventScript_16F555:: @ 816F555
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F56F
msgbox gUnknown_819D0E3
@@ -423,20 +423,20 @@ EventScript_16F579:: @ 816F579
SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
lock
faceplayer
setvar VAR_0x8004, 7
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
setvar VAR_0x8004, FANCLUB_MEMBER8
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F5B7
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F5DB
msgbox gUnknown_819D3D2
release
end
EventScript_16F5B7:: @ 816F5B7
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F5D1
msgbox gUnknown_819D2B4
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -3
View File
@@ -153,9 +153,7 @@ Movement_1631AA:: @ 81631AA
step_end
SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/SevenIsland_Mart/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30
.byte 0
SevenIsland_Mart_EventScript_170B31:: @ 8170B31
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+1 -3
View File
@@ -124,9 +124,7 @@ EventScript_164990:: @ 8164990
end
SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/SixIsland_Mart/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65
.byte 0
SixIsland_Mart_EventScript_171E66:: @ 8171E66
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/SixIsland_WaterPath_House1/scripts.inc
+1 -3
View File
@@ -4,9 +4,7 @@ SixIsland_WaterPath_House1_MapScripts:: @ 817206C
SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
lock
faceplayer
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
data/maps/ThreeIsland_BerryForest/scripts.inc
+1 -3
View File
@@ -17,9 +17,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
applymovement 1, Movement_163D22
waitmovement 0
msgbox gUnknown_817AE8E
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
waitse
playmoncry SPECIES_HYPNO, 2
waitmoncry
data/maps/ThreeIsland_Mart/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C
.byte 0
ThreeIsland_Mart_EventScript_17188D:: @ 817188D
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/TwoIsland/scripts.inc
+1 -3
View File
@@ -58,9 +58,7 @@ EventScript_167606:: @ 8167606
return
TwoIsland_EventScript_16760F:: @ 816760F
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND, 4
data/maps/TwoIsland_House/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ TwoIsland_House_MapScripts:: @ 8171618
.byte 0
TwoIsland_House_EventScript_171619:: @ 8171619
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/maps/VermilionCity/scripts.inc
+1 -3
View File
@@ -83,9 +83,7 @@ EventScript_166996:: @ 8166996
end
EventScript_1669BB:: @ 81669BB
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
call EventScript_166958
compare VAR_RESULT, 1
data/maps/VermilionCity_Gym/scripts.inc
+1 -3
View File
@@ -136,9 +136,7 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837
end
EventScript_16B843:: @ 816B843
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
copyvar VAR_0x8004, VAR_TEMP_0
copyvar VAR_0x8005, VAR_TEMP_1
data/maps/VermilionCity_Mart/scripts.inc
+1 -3
View File
@@ -10,9 +10,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D
end
VermilionCity_Mart_EventScript_16B666:: @ 816B666
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
data/maps/ViridianCity/scripts.inc
+2 -6
View File
@@ -140,9 +140,7 @@ EventScript_165A5B:: @ 8165A5B
EventScript_165A65:: @ 8165A65
msgbox gUnknown_817DE9B
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special ScrSpecial_StartOldManTutorialBattle
waitstate
@@ -235,9 +233,7 @@ ViridianCity_EventScript_165B2E:: @ 8165B2E
EventScript_165B4C:: @ 8165B4C
msgbox gUnknown_817DD4E
closemessage
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special ScrSpecial_StartOldManTutorialBattle
waitstate
data/maps/ViridianCity_Mart/scripts.inc
+1 -3
View File
@@ -54,9 +54,7 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268
faceplayer
compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
goto_if_eq EventScript_16A2A4
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
message Text_MayIHelpYou
waitmessage
pokemart Items_16A298
data/scripts/cable_club.inc
+9 -27
View File
@@ -14,9 +14,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE
return
CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
execram
@@ -599,9 +597,7 @@ Movement_PlayerEnterMinigameRoom:: @ 81BB8A2
step_end
CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 0
@@ -774,9 +770,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC
end
CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -886,9 +880,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92
return
CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -1149,9 +1141,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88
end
CableClub_EventScript_81BBFD8:: @ 81BBFD8
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet
specialvar VAR_RESULT, IsWirelessAdapterConnected
@@ -1200,9 +1190,7 @@ CableClub_OnResume:: @ 81BC05C
end
JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -1232,9 +1220,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4
end
JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -1371,9 +1357,7 @@ CableClub_EventScript_ExplainDodrioBerryPickingRequirements:: @ 81BC2DE
return
TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
special ShowPokemonJumpRecords
waitstate
@@ -1381,9 +1365,7 @@ TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7
end
TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords:: @ 81BC2FC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
special ShowDodrioBerryPickingRecords
waitstate
data/scripts/day_care.inc
+1 -3
View File
@@ -1,7 +1,5 @@
Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
showmoneybox 0, 0, 0
data/scripts/field_moves.inc
+4 -12
View File
@@ -1,7 +1,5 @@
EventScript_InteractWithCutTreeObject:: @ 81BDF13
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree
checkpartymove MOVE_CUT
@@ -61,9 +59,7 @@ Text_TreeCanBeCutDown:: @ 81BDFE3
.string "down!$"
EventScript_InteractWithRockSmashRockObject:: @ 81BE00C
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock
checkpartymove MOVE_ROCK_SMASH
@@ -126,9 +122,7 @@ Text_MonMaySmashRock:: @ 81BE0E2
.string "may be able to smash it.$"
EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder
goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength
@@ -189,9 +183,7 @@ Text_StrengthMadeMovingBouldersPossible:: @ 81BE284
.string "boulders around.$"
EventScript_InteractWithWaterfall:: @ 81BE2B7
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, PARTY_SIZE
data/scripts/move_tutors.inc
+1 -3
View File
@@ -447,9 +447,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2
end
TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
data/scripts/pc.inc
+1 -3
View File
@@ -1,7 +1,5 @@
EventScript_PC:: @ 81A6955
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled
setvar VAR_0x8004, 27
data/scripts/pkmn_center_nurse.inc
+2 -4
View File
@@ -1,7 +1,5 @@
EventScript_PkmnCenterNurse:: @ 81A6578
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
message Text_WelcomeWantToHealPkmn
waitmessage
multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1)
@@ -16,7 +14,7 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8
message Text_TakeYourPkmnForFewSeconds
waitmessage
call EventScript_PkmnCenterNurse_TakeAndHealPkmn
special sub_80CC524
special SetUsedPkmnCenterQuestLogEvent
goto EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom
end
data/scripts/pokedex_rating.inc
+1 -3
View File
@@ -1,7 +1,5 @@
ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro
call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro
data/scripts/seagallop.inc
+1 -3
View File
@@ -109,9 +109,7 @@ EventScript_1A90CC:: @ 81A90CC
EventScript_1A90DA:: @ 81A90DA
closemessage
delay 20
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
fadescreen FADE_TO_BLACK
special ScrSpecial_SeagallopFerry
data/scripts/surf.inc
+1 -3
View File
@@ -1,7 +1,5 @@
EventScript_UseSurf:: @ 81A6AC8
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_UseSurfEnd
goto_if_questlog EventScript_UseSurfEnd
checkpartymove MOVE_SURF
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_UseSurfEnd
data/scripts/trainer_battle.inc
+4 -12
View File
@@ -48,9 +48,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21
applymovement VAR_LAST_TALKED, Movement_1A4FC5
waitmovement 0
special PlayTrainerEncounterMusic
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A501A
goto_if_questlog EventScript_1A501A
battlebegin
ontrainerbattleend
@@ -64,9 +62,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A4FB8
goto_if_questlog EventScript_1A4FB8
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
@@ -87,9 +83,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A4FB8
goto_if_questlog EventScript_1A4FB8
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
@@ -122,9 +116,7 @@ EventScript_1A4FC7:: @ 81A4FC7
special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A501A
goto_if_questlog EventScript_1A501A
battlebegin
specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
compare VAR_RESULT, 0
data/specials.inc
+10 -10
View File
@@ -171,14 +171,14 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special ShouldMoveSaffronFanClubMember
def_special GetNumMovedSaffronFanClubMembers
def_special BufferStreakTrainerText
def_special sub_8113064
def_special UpdateMovedSaffronFanClubMembers
def_special sub_8113510
def_special sub_81130A8
def_special sub_8113530
def_special Special_IsFanClubMemberFanOfPlayer
def_special Special_GetNumFansOfPlayerInTrainerFanClub
def_special Special_BufferFanClubTrainerName
def_special Special_TryLoseFansFromPlayTimeAfterLinkBattle
def_special Special_TryLoseFansFromPlayTime
def_special Special_SetPlayerGotFirstFans
def_special Special_UpdateTrainerFanClubGameClear
def_special Special_TryGainNewFanFromCounter
def_special ScrSpecial_RockSmashWildEncounter
def_special nullsub_75
def_special nullsub_75
@@ -369,7 +369,7 @@ gSpecials:: @ 815FD60
def_special ChangeBoxPokemonNickname
def_special Special_UpdateTrainerCardPhotoIcons
def_special Special_StickerLadyGetBragFlags
def_special sub_80CC524
def_special SetUsedPkmnCenterQuestLogEvent
def_special IsWirelessAdapterConnected
def_special TryBecomeLinkLeader
def_special TryJoinLinkGroup
@@ -399,7 +399,7 @@ gSpecials:: @ 815FD60
def_special sub_811390C
def_special Special_GetMartClerkObjectId
def_special Special_BattleCardAction
def_special sub_8110AB4
def_special Special_GetQuestLogState
def_special sub_8112364
def_special Special_GetMENewsJisanItemAndState
def_special GetPCBoxToSendMon
data/strings.s
+3 -3
View File
@@ -1356,10 +1356,10 @@ gText_Withdraw::
gText_ReturnToPC:: @ 84178BE
.string "Return to the PC.$"
gUnknown_84178D0:: @ 84178D0
gText_LtSurge:: @ 84178D0
.string "LT. SURGE$"
gUnknown_84178DA:: @ 84178DA
gText_Koga:: @ 84178DA
.string "KOGA$"
gUnknown_84178DF:: @ 0x84178DF
@@ -2435,7 +2435,7 @@ gUnknown_8418BF3:: @ 0x8418BF3
gUnknown_8418C12:: @ 0x8418C12
.string "ポケモン リ-グ$"
gUnknown_8418C1B:: @ 8418C1B
gText_PokemonCenter:: @ 8418C1B
.string "POKéMON CENTER$"
gUnknown_8418C2A:: @ 8418C2A
data/text/quest_log.inc
+130 -129
View File
@@ -1,481 +1,482 @@
gUnknown_841A155:: @ 841A155
QuestLog_Text_PreviouslyOnYourQuest:: @ 841A155
.string "Previously on your quest…$"
gUnknown_841A16F:: @ 841A16F
QuestLog_Text_SwitchMon1WithMon2:: @ 841A16F
.string "{PLAYER} switched the POKéMON\n"
.string "{STR_VAR_1} with {STR_VAR_2}.$"
gUnknown_841A193:: @ 841A193
QuestLog_Text_SwappedHeldItemsOnMon:: @ 841A193
.string "Took the item {STR_VAR_2} from\n"
.string "{STR_VAR_1} and gave it the item\n"
.string "{STR_VAR_3} to hold.$"
gUnknown_841A1CD:: @ 841A1CD
QuestLog_Text_TookHeldItemFromMon:: @ 841A1CD
.string "Took the item {STR_VAR_2} from\n"
.string "{STR_VAR_1}.$"
gUnknown_841A1E7:: @ 841A1E7
QuestLog_Text_UsedItemOnMonAtThisLocation:: @ 841A1E7
.string "Used the item {STR_VAR_1} on {STR_VAR_2}\n"
.string "at this location.$"
gUnknown_841A210:: @ 841A210
QuestLog_Text_UsedTheItem:: @ 841A210
.string "{PLAYER} used the\n"
.string "{STR_VAR_1}.$"
gUnknown_841A220:: @ 841A220
QuestLog_Text_UsedTheKeyItem:: @ 841A220
.string "Used the item {STR_VAR_1}, which was\n"
.string "in the KEY ITEMS POCKET.$"
gUnknown_841A255:: @ 841A255
QuestLog_Text_MonLearnedMoveFromTM:: @ 841A255
.string "{STR_VAR_1} learned the move\n"
.string "{STR_VAR_2} from a TM.$"
gUnknown_841A277:: @ 841A277
QuestLog_Text_MonReplacedMoveWithTM:: @ 841A277
.string "{STR_VAR_1} learned the move\n"
.string "{STR_VAR_2} from a TM and forgot\n"
.string "the move {STR_VAR_3}.$"
gUnknown_841A2B0:: @ 841A2B0
QuestLog_Text_MonsWereFullyRestoredAtCenter:: @ 841A2B0
.string "POKéMON were fully restored\n"
.string "at a POKéMON CENTER.$"
gUnknown_841A2E1:: @ 841A2E1
QuestLog_Text_PlayerBattledChampionRival:: @ 841A2E1
.string "{DYNAMIC 0x00} had a marvelous battle\n"
.string "with the CHAMPION, {DYNAMIC 0x01}.$"
gUnknown_841A312:: @ 841A312
QuestLog_Text_PlayerSentOutMon1RivalSentOutMon2:: @ 841A312
.string "In the end, {DYNAMIC 0x00} sent out {DYNAMIC 0x01}\n"
.string "while {DYNAMIC 0x02} countered with\n"
.string "{DYNAMIC 0x03}.$"
gUnknown_841A349:: @ 841A349
QuestLog_Text_WonTheMatchAsAResult:: @ 841A349
.string "And, as a result of battling with every\n"
.string "bit of power, {DYNAMIC 0x00} won\n"
.string "the match.$"
gUnknown_841A391:: @ 841A391
QuestLog_Text_StoredItemInPC:: @ 841A391
.string "Removed the item {STR_VAR_1} from\n"
.string "the BAG's ITEMS POCKET and stored it\n"
.string "on the PC.$"
gUnknown_841A3DA:: @ 841A3DA
QuestLog_Text_WithdrewItemFromPC:: @ 841A3DA
.string "{PLAYER} withdrew the item {STR_VAR_1}\n"
.string "from the PC.$"
gUnknown_841A3FF:: @ 841A3FF
QuestLog_Text_TradedMon1ForPersonsMon2:: @ 841A3FF
.string "Traded {STR_VAR_3} in exchange for\n"
.string "{STR_VAR_1}'s {STR_VAR_2}.$"
gUnknown_841A422:: @ 841A422
QuestLog_Text_SingleBattleWithPersonResultedInOutcome:: @ 841A422
.string "Took on {DYNAMIC 0x00} in a SINGLE BATTLE.\n"
.string "It was a hotly contested match that\n"
.string "resulted in a {DYNAMIC 0x01}.$"
gUnknown_841A477:: @ 841A477
QuestLog_Text_DoubleBattleWithPersonResultedInOutcome:: @ 841A477
.string "Took on {DYNAMIC 0x00} in a DOUBLE BATTLE.\n"
.string "It was an extended match that resulted\n"
.string "in a {DYNAMIC 0x01}.$"
gUnknown_841A4C6:: @ 841A4C6
QuestLog_Text_MultiBattleWithPeopleResultedInOutcome:: @ 841A4C6
.string "{DYNAMIC 0x00} and {DYNAMIC 0x01} took on\n"
.string "{DYNAMIC 0x02} and {DYNAMIC 0x03} in a\n"
.string "MULTI BATTLE and got a {DYNAMIC 0x04}.$"
gUnknown_841A502::
QuestLog_Text_Win::
.string "win$"
gUnknown_841A506::
QuestLog_Text_Loss::
.string "loss$"
gUnknown_841A50B:: @ 841A50B
QuestLog_Text_MingledInUnionRoom:: @ 841A50B
.string "Mingled with other TRAINERS in\n"
.string "the UNION ROOM.$"
gUnknown_841A53A::
QuestLog_Text_DepartedPlaceInTownForNextDestination:: @ 841A53A
.string "Departed {STR_VAR_2}\n"
.string "in {STR_VAR_1} for the next\n"
.string "destination.$"
gUnknown_841A566:: @ 841A566
QuestLog_Text_SwitchedMonsBetweenBoxes:: @ 841A566
.string "After consideration, switched\n"
.string "{DYNAMIC 0x01} in {DYNAMIC 0x00} with\n"
.string "{DYNAMIC 0x03} in {DYNAMIC 0x02}.$"
gUnknown_841A59C:: @ 841A59C
QuestLog_Text_MovedMonToNewBox:: @ 841A59C
.string "After deep thought, switched\n"
.string "{DYNAMIC 0x01} in BOX “{DYNAMIC 0x00}” to\n"
.string "the BOX “{DYNAMIC 0x02}.”$"
gUnknown_841A5D9:: @ 841A5D9
QuestLog_Text_SwitchedMonsWithinBox:: @ 841A5D9
.string "Switched around {DYNAMIC 0x01} and\n"
.string "{DYNAMIC 0x02} in {DYNAMIC 0x00}.$"
gUnknown_841A5FA:: @ 841A5FA
QuestLog_Text_MovedMonWithinBox:: @ 841A5FA
.string "Moved {DYNAMIC 0x01} in {DYNAMIC 0x00}.$"
gUnknown_841A60A:: @ 841A60A
QuestLog_Text_SwitchedPartyMonForPCMon:: @ 841A60A
.string "Switched {DYNAMIC 0x01} in {DYNAMIC 0x00}\n"
.string "with {DYNAMIC 0x02} in the party.$"
gUnknown_841A632:: @ 841A632
QuestLog_Text_WithdrewMonFromPC:: @ 841A632
.string "Added {DYNAMIC 0x01} in {DYNAMIC 0x00}\n"
.string "to the party.$"
gUnknown_841A64F:: @ 841A64F
QuestLog_Text_DepositedMonInPC:: @ 841A64F
.string "Moved {DYNAMIC 0x00} from the party\n"
.string "to {DYNAMIC 0x01}.$"
gUnknown_841A66E:: @ 841A66E
QuestLog_Text_SwitchedMultipleMons:: @ 841A66E
.string "Moved a group of POKéMON in\n"
.string "{DYNAMIC 0x00} to {DYNAMIC 0x01}.$"
gUnknown_841A694:: @ 841A694
QuestLog_Text_ADifferentSpot:: @ 841A694
.string "a different spot$"
gUnknown_841A6A5:: @ 841A6A5
QuestLog_Text_GaveMonHeldItemFromPC:: @ 841A6A5
.string "Removed the item {STR_VAR_1} from\n"
.string "{PLAYER}'s PC and gave it to {STR_VAR_2}\n"
.string "to hold.$"
gUnknown_841A6E1:: @ 841A6E1
QuestLog_Text_SwappedHeldItemFromPC:: @ 841A6E1
.string "Removed the item {STR_VAR_1} from\n"
.string "a PC, gave it to {STR_VAR_2}, and put\n"
.string "the {STR_VAR_3} it held in the BAG.$"
gUnknown_841A732:: @ 841A732
QuestLog_Text_ChattedWithManyTrainers:: @ 841A732
.string "Chatted with many TRAINERS.$"
gUnknown_841A74E::
QuestLog_Text_Handily::
.string "handily$"
gUnknown_841A756::
QuestLog_Text_Tenaciously::
.string "tenaciously$"
gUnknown_841A762::
QuestLog_Text_Somehow::
.string "somehow$"
gUnknown_841A76A:: @ 841A76A
QuestLog_Text_TradedMon1ForTrainersMon2:: @ 841A76A
.string "Met and traded with {STR_VAR_1}.\n"
.string "Obtained the TRAINER's {STR_VAR_2} in\n"
.string "exchange for {STR_VAR_3}.$"
gUnknown_841A7B0:: @ 841A7B0
QuestLog_Text_BattledTrainerEndedInOutcome:: @ 841A7B0
.string "Met and battled {STR_VAR_1}.\n"
.string "The match ended in a {STR_VAR_2}.$"
gUnknown_841A7DD:: @ 841A7DD
QuestLog_Text_BoughtItem:: @ 841A7DD
.string "Went to the POKéMON MART in\n"
.string "{DYNAMIC 0x00} and bought one \n"
.string "{DYNAMIC 0x01}.$"
gUnknown_841A810:: @ 841A810
QuestLog_Text_BoughtItemsIncludingItem:: @ 841A810
.string "Went to the POKéMON MART in\n"
.string "{DYNAMIC 0x00} and spent ¥{DYNAMIC 0x02} for\n"
.string "items including {DYNAMIC 0x01}(s).$"
gUnknown_841A858:: @ 841A858
QuestLog_Text_SoldNumOfItem:: @ 841A858
.string "{DYNAMIC 0x00} went to the POKéMON MART in\n"
.string "{DYNAMIC 0x01} and sold {DYNAMIC 0x03} of\n"
.string "the item {DYNAMIC 0x02}.$"
gUnknown_841A896:: @ 841A896
.string "Sold items including {DYNAMIC 0x01} at\n"
QuestLog_Text_SoldItemsIncludingItem:: @ 841A896
.string "Sold items including {DYNAMIC 0x01} at\n"
.string "the POKéMON MART in {DYNAMIC 0x00},\n"
.string "worth ¥{DYNAMIC 0x02}.$"
gUnknown_841A8D4:: @ 841A8D4
QuestLog_Text_JustOne:: @ 841A8D4
.string "just one$"
gUnknown_841A8DD:: @ 841A8DD
QuestLog_Text_Num:: @ 841A8DD
.string "{DYNAMIC 0x04}$"
gUnknown_841A8E0:: @ 841A8E0
QuestLog_Text_UsedSoftboiled:: @ 841A8E0
.string "{STR_VAR_1} shared its HP using the move\n"
.string "SOFTBOILED.$"
gUnknown_841A90C:: @ 841A90C
QuestLog_Text_UsedMilkDrink:: @ 841A90C
.string "{STR_VAR_1} shared its HP using the move\n"
.string "MILK DRINK.$"
gUnknown_841A938:: @ 841A938
QuestLog_Text_MonLearnedMoveFromHM:: @ 841A938
.string "{STR_VAR_1} securely learned the move\n"
.string "{STR_VAR_2} using an HM.$"
gUnknown_841A965:: @ 841A965
QuestLog_Text_MonReplacedMoveWithHM:: @ 841A965
.string "{STR_VAR_1} securely learned the move\n"
.string "{STR_VAR_2} using an HM and forgot\n"
.string "the move {STR_VAR_3}.$"
gUnknown_841A9A9:: @ 841A9A9
QuestLog_Text_DefeatedWildMon:: @ 841A9A9
.string "{DYNAMIC 0x05} managed to defeat the POKéMON\n"
.string "{DYNAMIC 0x01} in {DYNAMIC 0x00}.$"
gUnknown_841A9D4:: @ 841A9D4
QuestLog_Text_DefeatedWildMons:: @ 841A9D4
.string "Defeated {DYNAMIC 0x02} wild POKéMON including\n"
.string "{DYNAMIC 0x01} in {DYNAMIC 0x00}.$"
gUnknown_841AA01:: @ 841AA01
QuestLog_Text_CaughtWildMon:: @ 841AA01
.string "{DYNAMIC 0x05} managed to catch the POKéMON\n"
.string "{DYNAMIC 0x03} in {DYNAMIC 0x00}.$"
gUnknown_841AA2B:: @ 841AA2B
QuestLog_Text_CaughtWildMons:: @ 841AA2B
.string "Threw POKé BALLS in a frenzy, catching\n"
.string "{DYNAMIC 0x04} POKéMON including {DYNAMIC 0x03} here\n"
.string "in {DYNAMIC 0x00}.$"
gUnknown_841AA76:: @ 841AA76
QuestLog_Text_DefeatedWildMonAndCaughtWildMon:: @ 841AA76
.string "{DYNAMIC 0x05} defeated the POKéMON\n"
.string "{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\n"
.string "in {DYNAMIC 0x00}.$"
gUnknown_841AAAA:: @ 841AAAA
QuestLog_Text_DefeatedWildMonAndCaughtWildMons:: @ 841AAAA
.string "Defeated the POKéMON {DYNAMIC 0x01}\n"
.string "and caught {DYNAMIC 0x04} POKéMON including\n"
.string "{DYNAMIC 0x03} in {DYNAMIC 0x00}.$"
gUnknown_841AAEC:: @ 841AAEC
QuestLog_Text_DefeatedWildMonsAndCaughtWildMon:: @ 841AAEC
.string "{DYNAMIC 0x05} defeated {DYNAMIC 0x02} POKéMON including\n"
.string "{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\n"
.string "in {DYNAMIC 0x00}.$"
gUnknown_841AB29:: @ 841AB29
QuestLog_Text_DefeatedWildMonsAndCaughtWildMons:: @ 841AB29
.string "Defeated {DYNAMIC 0x02} POKéMON including\n"
.string "{DYNAMIC 0x01} and caught {DYNAMIC 0x04} POKéMON\n"
.string "including {DYNAMIC 0x03} in {DYNAMIC 0x00}.$"
gUnknown_841AB74:: @ 841AB74
QuestLog_Text_GaveMonHeldItem:: @ 841AB74
.string "Made {STR_VAR_1} hold the item\n"
.string "{STR_VAR_2}.$"
gUnknown_841AB8E:: @ 841AB8E
QuestLog_Text_GaveMonHeldItem2:: @ 841AB8E
.string "{PLAYER} made {STR_VAR_1} hold the item\n"
.string "{STR_VAR_2}.$"
gUnknown_841ABAB:: @ 841ABAB
QuestLog_Text_UsedCut:: @ 841ABAB
.string "{STR_VAR_1} used the Hidden Move\n"
.string "CUT here.$"
gUnknown_841ABCD:: @ 841ABCD
QuestLog_Text_UsedFly:: @ 841ABCD
.string "{STR_VAR_1} used the Hidden Move\n"
.string "FLY and flew to {STR_VAR_2}.$"
gUnknown_841ABF9:: @ 841ABF9
QuestLog_Text_UsedSurf:: @ 841ABF9
.string "{STR_VAR_1} used the Hidden Move\n"
.string "SURF and rode the waves.$"
gUnknown_841AC2A:: @ 841AC2A
QuestLog_Text_UsedStrength:: @ 841AC2A
.string "{STR_VAR_1} used the Hidden Move\n"
.string "STRENGTH here.$"
gUnknown_841AC51:: @ 841AC51
QuestLog_Text_UsedFlash:: @ 841AC51
.string "{STR_VAR_1} used the Hidden Move\n"
.string "FLASH and illuminated a pitch-black\n"
.string "cave.$"
gUnknown_841AC93:: @ 841AC93
QuestLog_Text_UsedRockSmash:: @ 841AC93
.string "{STR_VAR_1} used the Hidden Move\n"
.string "ROCK SMASH here.$"
gUnknown_841ACBC:: @ 841ACBC
QuestLog_Text_UsedWaterfall:: @ 841ACBC
.string "{STR_VAR_1} used the Hidden Move\n"
.string "WATERFALL to scale a raging torrent.$"
gUnknown_841ACF9:: @ 841ACF9
.string "{STR_VAR_1}è êÉÁ Ñこª& òざÏ\n"
.string "éで+わざ\n"
.string "ダ¡ビング& ÚÉっŒ!$"
@ Unused
QuestLog_Text_UsedDive:: @ 841ACF9
.string "{STR_VAR_1}は　ふかい　ところを　めざし\n"
.string "ひでんわざ\n"
.string "ダイビングを　つかった！$"
gUnknown_841AD1D:: @ 841AD1D
QuestLog_Text_UsedDigInLocation:: @ 841AD1D
.string "{STR_VAR_1} used DIG to escape from\n"
.string "{STR_VAR_2}.$"
gUnknown_841AD3C:: @ 841AD3C
QuestLog_Text_UsedSweetScent:: @ 841AD3C
.string "{STR_VAR_1} used SWEET SCENT to attract\n"
.string "wild POKéMON.$"
gUnknown_841AD69:: @ 841AD69
QuestLog_Text_UsedTeleportToLocation:: @ 841AD69
.string "{STR_VAR_1} used TELEPORT, transporting\n"
.string "the party to {STR_VAR_2}'s\n"
.string "{STR_VAR_3}.$"
gUnknown_841AD9E:: @ 841AD9E
QuestLog_Text_LeftTownsLocationForNextDestination:: @ 841AD9E
.string "{PLAYER} left {STR_VAR_1}'s\n"
.string "{STR_VAR_2} for the next\n"
.string "destination.$"
gUnknown_841ADC8:: @ 841ADC8
QuestLog_Text_PlayedGamesAtGameCorner:: @ 841ADC8
.string "Played a lot of games at the ROCKET\n"
.string "GAME CORNER in {STR_VAR_1}.$"
gUnknown_841ADFF:: @ 841ADFF
QuestLog_Text_RestedAtHome:: @ 841ADFF
.string "{PLAYER} rested comfortably at home.$"
gUnknown_841AE1E:: @ 841AE1E
QuestLog_Text_LeftOaksLab:: @ 841AE1E
.string "{PLAYER} left PROF. OAK's POKéMON\n"
.string "RESEARCH LAB.$"
gUnknown_841AE48:: @ 841AE48
QuestLog_Text_GymWasFullOfToughTrainers:: @ 841AE48
.string "The GYM in {STR_VAR_1} was full of\n"
.string "tough TRAINERS…\n"
.string "Preparations had to be made.$"
gUnknown_841AE8F:: @ 841AE8F
QuestLog_Text_DepartedGym:: @ 841AE8F
.string "Departed the GYM in {STR_VAR_1}.$"
gUnknown_841AEA7:: @ 841AEA7
QuestLog_Text_HadGreatTimeInSafariZone:: @ 841AEA7
.string "{PLAYER} had a great time with POKéMON\n"
.string "in the SAFARI ZONE.$"
gUnknown_841AEDC:: @ 841AEDC
QuestLog_Text_ManagedToGetOutOfLocation:: @ 841AEDC
.string "Managed to get out of {STR_VAR_2}\n"
.string "after wandering about.$"
gUnknown_841AF0C:: @ 841AF0C
QuestLog_Text_TookOnGymLeadersMonWithMonAndWon:: @ 841AF0C
.string "Took on {DYNAMIC 0x00} GYM LEADER\n"
.string "{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\n"
.string "and won {DYNAMIC 0x04}!$"
gUnknown_841AF3E:: @ 841AF3E
QuestLog_Text_TookOnEliteFoursMonWithMonAndWon:: @ 841AF3E
.string "Took on ELITE FOUR {DYNAMIC 0x00}'s\n"
.string "{DYNAMIC 0x01} with {DYNAMIC 0x02} and\n"
.string "won {DYNAMIC 0x03}!$"
gUnknown_841AF6D:: @ 841AF6D
QuestLog_Text_TookOnTrainersMonWithMonAndWon:: @ 841AF6D
.string "In {DYNAMIC 0x00}, took on\n"
.string "{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\n"
.string "and won {DYNAMIC 0x04}!$"
gUnknown_841AF98:: @ 841AF98
QuestLog_Text_Coolly:: @ 841AF98
.string "coolly$"
gUnknown_841AF9F:: @ 841AF9F
QuestLog_Text_Barely:: @ 841AF9F
.string "barely$"
gUnknown_841AFA6:: @ 841AFA6
QuestLog_Text_UsedEscapeRope:: @ 841AFA6
.string "{PLAYER} used an ESCAPE ROPE to get\n"
.string "out from {STR_VAR_2}.$"
gUnknown_841AFD1:: @ 841AFD1
QuestLog_Text_Draw:: @ 841AFD1
.string "draw$"
gUnknown_841AFD6:: @ 841AFD6
QuestLog_Text_DepartedTheLocationForNextDestination:: @ 841AFD6
.string "Departed from the {STR_VAR_2}\n"
.string "for the next destination.$"
gUnknown_841B005:: @ 841B005
QuestLog_Text_DepartedFromLocationToNextDestination:: @ 841B005
.string "{PLAYER} departed from\n"
.string "{STR_VAR_2} and made way\n"
.string "to the next destination.$"
gUnknown_841B03F:: @ 841B03F
QuestLog_Text_ObtainedItemInLocation:: @ 841B03F
.string "Here in {STR_VAR_1}, {PLAYER}\n"
.string "obtained the item {STR_VAR_2}.$"
gUnknown_841B064:: @ 841B064
QuestLog_Text_ArrivedInLocation:: @ 841B064
.string "Arrived in {STR_VAR_1}.$"
gUnknown_841B073:: @ 841B073
QuestLog_Text_SavedGameAtLocation:: @ 841B073
.string "And {PLAYER} saved the game at this\n"
.string "location: {STR_VAR_1}.$"
gQuestLogString_Home:: @ 841B09F
QuestLog_Text_Home:: @ 841B09F
.string "HOME$"
gQuestLogString_OakResearchLab:: @ 841B0A4
QuestLog_Text_OakResearchLab:: @ 841B0A4
.string "OAK RESEARCH LAB$"
gQuestLogString_Gym:: @ 841B0B5
QuestLog_Text_Gym:: @ 841B0B5
.string "GYM$"
gQuestLogString_PokemonLeagueGate:: @ 841B0B9
QuestLog_Text_PokemonLeagueGate:: @ 841B0B9
.string "POKéMON LEAGUE GATE$"
gQuestLogString_ViridianForest:: @ 841B0CD
QuestLog_Text_ViridianForest:: @ 841B0CD
.string "VIRIDIAN FOREST$"
gQuestLogString_PewterMuseumOfScience:: @ 841B0DD
QuestLog_Text_PewterMuseumOfScience:: @ 841B0DD
.string "PEWTER MUSEUM OF SCIENCE$"
gQuestLogString_MtMoon:: @ 841B0F6
QuestLog_Text_MtMoon:: @ 841B0F6
.string "MT. MOON$"
gQuestLogString_BikeShop:: @ 841B0FF
QuestLog_Text_BikeShop:: @ 841B0FF
.string "BIKE SHOP$"
gQuestLogString_BillSHouse:: @ 841B109
QuestLog_Text_BillsHouse:: @ 841B109
.string "BILL'S HOUSE$"
gQuestLogString_DayCare:: @ 841B116
QuestLog_Text_DayCare:: @ 841B116
.string "DAY CARE$"
gQuestLogString_UndergroundPath:: @ 841B11F
QuestLog_Text_UndergroundPath:: @ 841B11F
.string "UNDERGROUND PATH$"
gQuestLogString_PokemonFanClub:: @ 841B130
QuestLog_Text_PokemonFanClub:: @ 841B130
.string "POKéMON FAN CLUB$"
gQuestLogString_SSAnne:: @ 841B141
QuestLog_Text_SSAnne:: @ 841B141
.string "S.S. ANNE$"
gQuestLogString_DiglettSCave:: @ 841B14B
QuestLog_Text_DiglettsCave:: @ 841B14B
.string "DIGLETT'S CAVE$"
gQuestLogString_RockTunnel:: @ 841B15A
QuestLog_Text_RockTunnel:: @ 841B15A
.string "ROCK TUNNEL$"
gQuestLogString_PowerPlant:: @ 841B166
QuestLog_Text_PowerPlant:: @ 841B166
.string "POWER PLANT$"
gQuestLogString_PokemonTower:: @ 841B172
QuestLog_Text_PokemonTower:: @ 841B172
.string "POKéMON TOWER$"
gQuestLogString_VolunteerHouse:: @ 841B180
QuestLog_Text_VolunteerHouse:: @ 841B180
.string "VOLUNTEER HOUSE$"
gQuestLogString_NameRaterSHouse:: @ 841B190
QuestLog_Text_NameRatersHouse:: @ 841B190
.string "NAME RATER'S HOUSE$"
gQuestLogString_CeladonDeptStore:: @ 841B1A3
QuestLog_Text_CeladonDeptStore:: @ 841B1A3
.string "CELADON DEPT. STORE$"
gQuestLogString_CeladonMansion:: @ 841B1B7
QuestLog_Text_CeladonMansion:: @ 841B1B7
.string "CELADON MANSION$"
gQuestLogString_RocketGameCorner:: @ 841B1C7
QuestLog_Text_RocketGameCorner:: @ 841B1C7
.string "ROCKET GAME CORNER$"
gQuestLogString_Restaurant:: @ 841B1DA
QuestLog_Text_Restaurant:: @ 841B1DA
.string "RESTAURANT$"
gQuestLogString_RocketHideout:: @ 841B1E5
QuestLog_Text_RocketHideout:: @ 841B1E5
.string "ROCKET HIDEOUT$"
gQuestLogString_SafariZone:: @ 841B1F4
QuestLog_Text_SafariZone:: @ 841B1F4
.string "SAFARI ZONE$"
gQuestLogString_WardenSHome:: @ 841B200
QuestLog_Text_WardensHome:: @ 841B200
.string "WARDEN'S HOME$"
gQuestLogString_FightingDojo:: @ 841B20E
QuestLog_Text_FightingDojo:: @ 841B20E
.string "FIGHTING DOJO$"
gQuestLogString_SilphCo:: @ 841B21C
QuestLog_Text_SilphCo:: @ 841B21C
.string "SILPH CO.$"
gQuestLogString_SeafoamIslands:: @ 841B226
QuestLog_Text_SeafoamIslands:: @ 841B226
.string "SEAFOAM ISLANDS$"
gQuestLogString_PokemonMansion:: @ 841B236
QuestLog_Text_PokemonMansion:: @ 841B236
.string "POKéMON MANSION$"
gQuestLogString_PokemonResearchLab:: @ 841B246
QuestLog_Text_PokemonResearchLab:: @ 841B246
.string "POKéMON RESEARCH LAB$"
gQuestLogString_VictoryRoad:: @ 841B25B
QuestLog_Text_VictoryRoad:: @ 841B25B
.string "VICTORY ROAD$"
gQuestLogString_PokemonLeague:: @ 841B268
QuestLog_Text_PokemonLeague:: @ 841B268
.string "POKéMON LEAGUE$"
gQuestLogString_CeruleanCave:: @ 841B277
QuestLog_Text_CeruleanCave:: @ 841B277
.string "CERULEAN CAVE$"
include/constants/global.h
+2
View File
@@ -32,6 +32,8 @@
#define BAG_TMHM_COUNT 58
#define BAG_BERRIES_COUNT 43
#define QUEST_LOG_SCENE_COUNT 4
#define MALE 0
#define FEMALE 1
include/constants/party_menu.h
+15 -1
View File
@@ -31,6 +31,20 @@
#define TUTOR_MOVE_BLAST_BURN 16
#define TUTOR_MOVE_HYDRO_CANNON 17
#define FIELD_MOVE_FLASH 0
#define FIELD_MOVE_CUT 1
#define FIELD_MOVE_FLY 2
#define FIELD_MOVE_STRENGTH 3
#define FIELD_MOVE_SURF 4
#define FIELD_MOVE_ROCK_SMASH 5
#define FIELD_MOVE_WATERFALL 6
#define FIELD_MOVE_TELEPORT 7
#define FIELD_MOVE_DIG 8
#define FIELD_MOVE_MILK_DRINK 9
#define FIELD_MOVE_SOFT_BOILED 10
#define FIELD_MOVE_SWEET_SCENT 11
#define FIELD_MOVE_END 12
#define PARTY_LAYOUT_SINGLE 0
#define PARTY_LAYOUT_DOUBLE 1
#define PARTY_LAYOUT_MULTI 2
@@ -58,7 +72,7 @@
#define PARTY_ACTION_USE_ITEM 3
#define PARTY_ACTION_ABILITY_PREVENTS 4
#define PARTY_ACTION_GIVE_ITEM 5
#define PARTY_ACTION_GIVE_PC_ITEM 6 // TODO: rename this one if necessary. Used for quest log.
#define PARTY_ACTION_GIVE_PC_ITEM 6
#define PARTY_ACTION_GIVE_MAILBOX_MAIL 7
#define PARTY_ACTION_SWITCH 8
#define PARTY_ACTION_SWITCHING 9
include/constants/quest_log.h
+133
View File
@@ -0,0 +1,133 @@
#ifndef GUARD_CONSTANTS_QUEST_LOG_H
#define GUARD_CONSTANTS_QUEST_LOG_H
// TODO: Name and use state constants
#define QL_STATE_1 1
#define QL_STATE_2 2
#define QL_STATE_3 3
#define QL_EVENT_0 0 // Null
#define QL_EVENT_1 1 // Null
#define QL_EVENT_2 2 // Null
#define QL_EVENT_SWITCHED_PARTY_ORDER 3
#define QL_EVENT_USED_ITEM 4
#define QL_EVENT_GAVE_HELD_ITEM 5
#define QL_EVENT_GAVE_HELD_ITEM_BAG 6
#define QL_EVENT_GAVE_HELD_ITEM_PC 7
#define QL_EVENT_TOOK_HELD_ITEM 8
#define QL_EVENT_SWAPPED_HELD_ITEM 9
#define QL_EVENT_SWAPPED_HELD_ITEM_PC 10
#define QL_EVENT_USED_PKMN_CENTER 11
#define QL_EVENT_LINK_TRADED 12
#define QL_EVENT_LINK_BATTLED_SINGLE 13
#define QL_EVENT_LINK_BATTLED_DOUBLE 14
#define QL_EVENT_LINK_BATTLED_MULTI 15
#define QL_EVENT_USED_UNION_ROOM 16
#define QL_EVENT_USED_UNION_ROOM_CHAT 17
#define QL_EVENT_LINK_TRADED_UNION 18
#define QL_EVENT_LINK_BATTLED_UNION 19
#define QL_EVENT_SWITCHED_MONS_BETWEEN_BOXES 20
#define QL_EVENT_SWITCHED_MONS_WITHIN_BOX 21
#define QL_EVENT_SWITCHED_PARTY_MON_FOR_PC_MON 22
#define QL_EVENT_MOVED_MON_BETWEEN_BOXES 23
#define QL_EVENT_MOVED_MON_WITHIN_BOX 24
#define QL_EVENT_WITHDREW_MON_PC 25
#define QL_EVENT_DEPOSITED_MON_PC 26
#define QL_EVENT_SWITCHED_MULTIPLE_MONS 27
#define QL_EVENT_DEPOSITED_ITEM_PC 28
#define QL_EVENT_WITHDREW_ITEM_PC 29
#define QL_EVENT_DEFEATED_GYM_LEADER 30
#define QL_EVENT_DEFEATED_WILD_MON 31
#define QL_EVENT_DEFEATED_E4_MEMBER 32
#define QL_EVENT_DEFEATED_CHAMPION 33
#define QL_EVENT_DEFEATED_TRAINER 34
#define QL_EVENT_DEPARTED 35
#define QL_EVENT_USED_FIELD_MOVE 36
#define QL_EVENT_BOUGHT_ITEM 37
#define QL_EVENT_SOLD_ITEM 38
#define QL_EVENT_39 39 // Null
#define QL_EVENT_OBTAINED_ITEM 40
#define QL_EVENT_41 41 // Null
#define QL_EVENT_ARRIVED 42
#define QL_EVENT_USED_POKEMART QL_EVENT_BOUGHT_ITEM - 1 // Used as a start pos for QL_EVENT_BOUGHT_ITEM / QL_EVENT_SOLD_ITEM
#define IS_LINK_QL_EVENT(event)((event) >= QL_EVENT_LINK_TRADED && (event) <= QL_EVENT_LINK_BATTLED_UNION)
#define IS_VALID_QL_EVENT(event)((event) >= QL_EVENT_SWITCHED_PARTY_ORDER && (event) <= QL_EVENT_ARRIVED)
#define QL_LOCATION_HOME 0
#define QL_LOCATION_OAKS_LAB 1
#define QL_LOCATION_VIRIDIAN_GYM 2
#define QL_LOCATION_LEAGUE_GATE_1 3
#define QL_LOCATION_LEAGUE_GATE_2 4
#define QL_LOCATION_VIRIDIAN_FOREST_1 5
#define QL_LOCATION_VIRIDIAN_FOREST_2 6
#define QL_LOCATION_PEWTER_MUSEUM 7
#define QL_LOCATION_PEWTER_GYM 8
#define QL_LOCATION_MT_MOON_1 9
#define QL_LOCATION_MT_MOON_2 10
#define QL_LOCATION_CERULEAN_GYM 11
#define QL_LOCATION_BIKE_SHOP 12
#define QL_LOCATION_BILLS_HOUSE 13
#define QL_LOCATION_DAY_CARE 14
#define QL_LOCATION_UNDERGROUND_PATH_1 15
#define QL_LOCATION_UNDERGROUND_PATH_2 16
#define QL_LOCATION_PKMN_FAN_CLUB 17
#define QL_LOCATION_VERMILION_GYM 18
#define QL_LOCATION_SS_ANNE 19
#define QL_LOCATION_DIGLETTS_CAVE_1 20
#define QL_LOCATION_DIGLETTS_CAVE_2 21
#define QL_LOCATION_ROCK_TUNNEL_1 22
#define QL_LOCATION_ROCK_TUNNEL_2 23
#define QL_LOCATION_POWER_PLANT 24
#define QL_LOCATION_PKMN_TOWER 25
#define QL_LOCATION_VOLUNTEER_HOUSE 26
#define QL_LOCATION_NAME_RATERS_HOUSE 27
#define QL_LOCATION_UNDERGROUND_PATH_3 28
#define QL_LOCATION_UNDERGROUND_PATH_4 29
#define QL_LOCATION_CELADON_DEPT_STORE 30
#define QL_LOCATION_CELADON_MANSION 31
#define QL_LOCATION_GAME_CORNER 32
#define QL_LOCATION_CELADON_GYM 33
#define QL_LOCATION_CELADON_RESTAURANT 34
#define QL_LOCATION_ROCKET_HIDEOUT 35
#define QL_LOCATION_SAFARI_ZONE 36
#define QL_LOCATION_FUCHSIA_GYM 37
#define QL_LOCATION_WARDENS_HOME 38
#define QL_LOCATION_FIGHTING_DOJO 39
#define QL_LOCATION_SAFFRON_GYM 40
#define QL_LOCATION_SILPH_CO 41
#define QL_LOCATION_SEAFOAM_ISLANDS_1 42
#define QL_LOCATION_SEAFOAM_ISLANDS_2 43
#define QL_LOCATION_PKMN_MANSION 44
#define QL_LOCATION_CINNABAR_GYM 45
#define QL_LOCATION_CINNABAR_LAB 46
#define QL_LOCATION_VICTORY_ROAD_1 47
#define QL_LOCATION_VICTORY_ROAD_2 48
#define QL_LOCATION_PKMN_LEAGUE 49
#define QL_LOCATION_CERULEAN_CAVE 50
#define QL_DEPARTED_TOWN_BUILDING 0
#define QL_DEPARTED_MUSEUM 1
#define QL_DEPARTED_GAME_CORNER 2
#define QL_DEPARTED_HOME 3
#define QL_DEPARTED_OAKS_LAB 4
#define QL_DEPARTED_GYM 5
#define QL_DEPARTED_SAFARI_ZONE 6
#define QL_DEPARTED_CAVE 7
#define QL_DEPARTED_MISC_BUILDING_1 8
#define QL_DEPARTED_MISC_BUILDING_2 9
#define FANCLUB_MEMBER1 0
#define FANCLUB_MEMBER2 1
#define FANCLUB_MEMBER3 2
#define FANCLUB_MEMBER4 3
#define FANCLUB_MEMBER5 4
#define FANCLUB_MEMBER6 5
#define FANCLUB_MEMBER7 6
#define FANCLUB_MEMBER8 7
#define NUM_TRAINER_FAN_CLUB_MEMBERS 8
#endif //GUARD_CONSTANTS_QUEST_LOG_H
include/constants/vars.h
+2 -2
View File
@@ -98,8 +98,8 @@
#define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035
#define VAR_RESORT_GORGEOUS_REQUESTED_MON 0x4036
#define VAR_PC_BOX_TO_SEND_MON 0x4037
#define VAR_0x4038 0x4038
#define VAR_0x4039 0x4039
#define VAR_FANCLUB_FAN_COUNTER 0x4038
#define VAR_FANCLUB_LOSE_FAN_TIMER 0x4039
#define VAR_ELEVATOR_FLOOR 0x403A
#define VAR_RESORT_GORGEOUS_REWARD 0x403B
#define VAR_0x403C 0x403C
include/event_scripts.h
+4 -3
View File
@@ -375,8 +375,9 @@ extern const u8 SecretBase_RedCave1_Text_2751E1[];
extern const u8 SecretBase_RedCave1_Text_2754F6[];
extern const u8 SecretBase_RedCave1_Text_2758CC[];
extern const u8 gUnknown_84178D0[];
extern const u8 gUnknown_84178DA[];
extern const u8 gText_LtSurge[];
extern const u8 gText_Koga[];
extern const u8 gText_PokemonCenter[];
// vs_seeker
extern const u8 gUnknown_81C137C[];
extern const u8 gUnknown_81C13D6[];
@@ -1177,7 +1178,7 @@ extern const u8 gText_PlayerSavedTheGame[];
extern const u8 gText_DifferentGameFile[];
// script_menu
extern const u8 EventScript_1A7AE0[];
extern const u8 EventScript_ReleaseEnd[];
extern const u8 CableClub_Text_TradeMonsUsingLinkCable[];
extern const u8 CableClub_Text_BattleUsingLinkCable[];
extern const u8 CableClub_Text_CancelSelectedItem[];
include/global.h
+8 -8
View File
@@ -601,17 +601,17 @@ struct QuestLogObjectEvent
struct QuestLog
{
/*0x0000*/ u8 unk_000;
/*0x0001*/ s8 unk_001;
/*0x0002*/ s8 unk_002;
/*0x0003*/ s8 unk_003;
/*0x0004*/ s16 unk_004;
/*0x0006*/ s16 unk_006;
/*0x0001*/ u8 mapGroup;
/*0x0002*/ u8 mapNum;
/*0x0003*/ u8 warpId;
/*0x0004*/ s16 x;
/*0x0006*/ s16 y;
/*0x0008*/ struct QuestLogObjectEvent unk_008[OBJECT_EVENTS_COUNT];
// These arrays hold the game state for
// playing back the quest log
/*0x0148*/ u8 flags[0x120];
/*0x02c8*/ u16 vars[0x100];
/*0x0148*/ u8 flags[FLAGS_COUNT];
/*0x02c8*/ u16 vars[VARS_COUNT];
/*0x0468*/ struct QuestLogNPCData npcData[64];
/*0x0568*/ u16 unk_568[128];
/*0x0668*/ u16 end[0];
@@ -746,7 +746,7 @@ struct SaveBlock1
/*0x0EE0*/ u8 flags[FLAGS_COUNT];
/*0x1000*/ u16 vars[VARS_COUNT];
/*0x1200*/ u32 gameStats[NUM_GAME_STATS];
/*0x1300*/ struct QuestLog questLog[4];
/*0x1300*/ struct QuestLog questLog[QUEST_LOG_SCENE_COUNT];
/*0x2CA0*/ u16 easyChatProfile[6];
/*0x2CAC*/ u16 easyChatBattleStart[6];
/*0x2CB8*/ u16 easyChatBattleWon[6];
include/item.h
+1 -1
View File
@@ -62,7 +62,7 @@ u8 ItemId_GetSecondaryId(u16 itemId);
u16 itemid_get_market_price(u16 itemId);
void ClearBag(void);
void ClearPCItemSlots(void);
void sub_809A824(u16 itemId);
void TrySetObtainedItemQuestLogEvent(u16 itemId);
bool8 AddBagItem(u16 itemId, u16 amount);
void SortPocketAndPlaceHMsFirst(struct BagPocket * pocket);
include/party_menu.h
+1 -1
View File
@@ -49,7 +49,7 @@ void CB2_SelectBagItemToGive(void);
void CB2_GiveHoldItem(void);
bool8 FieldCallback_PrepareFadeInFromMenu(void);
void CB2_ReturnToPartyMenuFromFlyMap(void);
void sub_8124C1C(const u8 *healLocCtrlData);
void SetUsedFlyQuestLogEvent(const u8 *healLocCtrlData);
void CB2_ShowPartyMenuForItemUse(void);
void ItemUseCB_Medicine(u8 taskId, TaskFunc func);
void ItemUseCB_MedicineStep(u8 taskId, TaskFunc func);
include/quest_log.h
+5 -4
View File
@@ -3,6 +3,7 @@
#include "global.h"
#include "quest_log_battle.h"
#include "constants/quest_log.h"
struct UnkStruct_3005E90
{
@@ -15,7 +16,7 @@ struct UnkStruct_3005E90
u8 unk_2;
};
extern u8 gUnknown_203ADFA;
extern u8 gQuestLogState;
extern u8 gUnknown_3005E88;
extern u16 sNumQuestLogs;
extern struct UnkStruct_3005E90 gUnknown_3005E90;
@@ -23,7 +24,7 @@ extern struct UnkStruct_203AE98 * gUnknown_3005E94;
extern const u16 gUnknown_84566A8[];
void sub_8112720(u8);
void sub_8113550(u16, const u16 *);
void SetQuestLogEvent(u16, const u16 *);
void sub_811539C(void);
void sub_8115748(u16);
u8 sub_8112CAC(void);
@@ -35,8 +36,8 @@ u8 CreateHelpMessageWindow(void);
void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
void MapNamePopupWindowIdSetDummy(void);
void sub_8111CF0(void);
void sub_811089C(void);
void sub_8113044(void);
void ResetQuestLog(void);
void ResetTrainerFanClub(void);
void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId);
void sub_8112450(void);
void sub_8112364(void);
include/quest_log_8150454.h
-8
View File
@@ -1,8 +0,0 @@
#ifndef GUARD_QUEST_LOG_8150454_H
#define GUARD_QUEST_LOG_8150454_H
#include "global.h"
void sub_8150454(void);
#endif //GUARD_QUEST_LOG_8150454_H
include/quest_log_815A008.h
-9
View File
@@ -1,9 +0,0 @@
#ifndef GUARD_QUEST_LOG_815A008_H
#define GUARD_QUEST_LOG_815A008_H
#include "global.h"
void sub_815A008(struct QuestLog *);
void sub_815A1F8(struct QuestLog *, struct ObjectEventTemplate *);
#endif //GUARD_QUEST_LOG_815A008_H
include/quest_log_battle.h
+2 -2
View File
@@ -3,7 +3,7 @@
#include "global.h"
void sub_812BFDC(void);
void sub_812C224(void);
void TrySetQuestLogBattleEvent(void);
void TrySetQuestLogLinkBattleEvent(void);
#endif // GUARD_QUEST_LOG_BATTLE_H
include/quest_log_objects.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef GUARD_QUEST_LOG_OBJECTS_H
#define GUARD_QUEST_LOG_OBJECTS_H
#include "global.h"
void SetQuestLogObjectEventsData(struct QuestLog *);
void sub_815A1F8(struct QuestLog *, struct ObjectEventTemplate *);
#endif //GUARD_QUEST_LOG_OBJECTS_H
include/quest_log_player.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef GUARD_QUEST_LOG_PLAYER_H
#define GUARD_QUEST_LOG_PLAYER_H
#include "global.h"
void sub_8150454(void);
#endif //GUARD_QUEST_LOG_PLAYER_H
include/text.h
+15
View File
@@ -95,6 +95,21 @@
#define TEXT_DYNAMIC_COLOR_5 0xE // Usually blue-green
#define TEXT_DYNAMIC_COLOR_6 0xF // Usually cerulean
#define PLACEHOLDER_ID_UNKNOWN 0x0
#define PLACEHOLDER_ID_PLAYER 0x1
#define PLACEHOLDER_ID_STRING_VAR_1 0x2
#define PLACEHOLDER_ID_STRING_VAR_2 0x3
#define PLACEHOLDER_ID_STRING_VAR_3 0x4
#define PLACEHOLDER_ID_KUN 0x5
#define PLACEHOLDER_ID_RIVAL 0x6
#define PLACEHOLDER_ID_VERSION 0x7
#define PLACEHOLDER_ID_MAGMA 0x8
#define PLACEHOLDER_ID_AQUA 0x9
#define PLACEHOLDER_ID_MAXIE 0xA
#define PLACEHOLDER_ID_ARCHIE 0xB
#define PLACEHOLDER_ID_GROUDON 0xC
#define PLACEHOLDER_ID_KYOGRE 0xD
// battle placeholders are located in battle_message.h
#define EXT_CTRL_CODE_COLOR 0x1
#define EXT_CTRL_CODE_HIGHLIGHT 0x2
ld_script.txt
+3 -3
View File
@@ -277,10 +277,10 @@ SECTIONS {
src/wireless_communication_status_screen.o(.text);
src/braille_text.o(.text);
src/text_window.o(.text);
src/quest_log_8150454.o(.text);
src/quest_log_player.o(.text);
asm/dodrio_berry_picking.o(.text);
src/battle_controller_pokedude.o(.text);
src/quest_log_815A008.o(.text);
src/quest_log_objects.o(.text);
src/dodrio_berry_picking_2.o(.text);
asm/dodrio_berry_picking_2.o(.text);
src/teachy_tv.o(.text);
@@ -559,7 +559,7 @@ SECTIONS {
src/wireless_communication_status_screen.o(.rodata);
src/braille_text.o(.rodata);
src/text_window_graphics.o(.rodata);
src/quest_log_8150454.o(.rodata);
src/quest_log_player.o(.rodata);
data/berry_powder.o(.rodata);
src/dodrio_berry_picking.o(.rodata);
src/battle_controller_pokedude.o(.rodata);
src/battle_main.c
+2 -2
View File
@@ -1826,7 +1826,7 @@ static void sub_8011BB0(void)
if (!gPaletteFade.active)
{
SetMainCallback2(gMain.savedCallback);
sub_812C224();
TrySetQuestLogLinkBattleEvent();
FreeMonSpritesGfx();
FreeBattleSpritesData();
FreeBattleResources();
@@ -3782,7 +3782,7 @@ static void HandleEndTurn_FinishBattle(void)
}
}
}
sub_812BFDC();
TrySetQuestLogBattleEvent();
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
sub_810CB90();
BeginFastPaletteFade(3);
src/battle_message.c
+1 -1
View File
@@ -2027,7 +2027,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_RIVAL
|| gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_RIVAL_2
|| gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2)
toCpy = GetExpandedPlaceholder(6);
toCpy = GetExpandedPlaceholder(PLACEHOLDER_ID_RIVAL);
else
toCpy = gTrainers[gTrainerBattleOpponent_A].trainerName;
}
src/battle_setup.c
+2 -2
View File
@@ -997,8 +997,8 @@ void PlayTrainerEncounterMusic(void)
{
u16 music;
if (gUnknown_203ADFA != 2
&& gUnknown_203ADFA != 3
if (gQuestLogState != 2
&& gQuestLogState != 3
&& sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC
&& sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC)
{
src/data/party_menu.h
-17
View File
@@ -1094,23 +1094,6 @@ enum
MENU_FIELD_MOVES,
};
enum
{
FIELD_MOVE_FLASH,
FIELD_MOVE_CUT,
FIELD_MOVE_FLY,
FIELD_MOVE_STRENGTH,
FIELD_MOVE_SURF,
FIELD_MOVE_ROCK_SMASH,
FIELD_MOVE_WATERFALL,
FIELD_MOVE_TELEPORT,
FIELD_MOVE_DIG,
FIELD_MOVE_MILK_DRINK,
FIELD_MOVE_SOFT_BOILED,
FIELD_MOVE_SWEET_SCENT,
FIELD_MOVE_END,
};
static struct
{
const u8 *text;
src/data/trainers.h
+2
View File
@@ -1,3 +1,5 @@
// TODO: Use NELEMS/ARRAY_COUNT in .partySize, name trainer parties
const struct Trainer gTrainers[] = {
[TRAINER_NONE] = {
.partyFlags = 0,
src/field_specials.c
+6 -6
View File
@@ -1766,9 +1766,9 @@ u8 Special_GetMartClerkObjectId(void)
return 1;
}
void sub_80CC524(void)
void SetUsedPkmnCenterQuestLogEvent(void)
{
sub_8113550(11, NULL);
SetQuestLogEvent(QL_EVENT_USED_PKMN_CENTER, NULL);
}
static const struct {
@@ -1868,7 +1868,7 @@ void sub_80CC59C(void)
sp0.unk1 = r5;
else
sp0.unk1 = r5 + 1;
sub_8113550(35, (void *)&sp0);
SetQuestLogEvent(QL_EVENT_DEPARTED, (void *)&sp0);
FlagClear(FLAG_0x808);
return;
}
@@ -1882,7 +1882,7 @@ void sub_80CC59C(void)
sp0.unk1 = r5;
else
sp0.unk1 = r5 + 1;
sub_8113550(35, (void *)&sp0);
SetQuestLogEvent(QL_EVENT_DEPARTED, (void *)&sp0);
FlagClear(FLAG_0x808);
return;
}
@@ -1903,7 +1903,7 @@ void sub_80CC59C(void)
if (x != 67 || y != 15)
sp0.unk1++;
}
sub_8113550(35, (void *)&sp0);
SetQuestLogEvent(QL_EVENT_DEPARTED, (void *)&sp0);
FlagClear(FLAG_0x808);
if (r5 == 35)
{
@@ -2447,7 +2447,7 @@ void Special_BrailleCursorToggle(void)
// 8005 = y
// 8006 = action (0 = create, 1 = delete)
u16 x;
if (gUnknown_203ADFA != 2)
if (gQuestLogState != 2)
{
x = gSpecialVar_0x8004 + 27;
if (gSpecialVar_0x8006 == 0)

Some files were not shown because too many files have changed in this diff Show More