Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-10-25 09:22:50 +08:00
136 changed files with 3963 additions and 6605 deletions
+1 -1
View File
@@ -785,7 +785,7 @@ gUnknown_83E0248:: @ 83E0248
.4byte gUnknown_841807D, NULL
.4byte gUnknown_841808E, NULL
.4byte gUnknown_841809C, NULL
.4byte gUnknown_8417929, NULL
.4byte gOtherText_Quit, NULL
gUnknown_83E0268:: @ 83E0268
.4byte gUnknown_8417DFE, NULL
+4 -83
View File
@@ -1,3 +1,7 @@
#include "constants/species.h"
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@@ -22,89 +26,6 @@ gUnknown_83F5864:: @ 83F5864
gUnknown_83F5A44:: @ 83F5A44
.incbin "baserom.gba", 0x3F5A44, 0xB4
gUnknown_83F5AF8:: @ 83F5AF8
.incbin "baserom.gba", 0x3F5AF8, 0x22
gUnknown_83F5B1A:: @ 83F5B1A
.incbin "baserom.gba", 0x3F5B1A, 0x16
gUnknown_83F5B30:: @ 83F5B30
.incbin "baserom.gba", 0x3F5B30, 0xC
gUnknown_83F5B3C:: @ 83F5B3C
.incbin "baserom.gba", 0x3F5B3C, 0x8
gUnknown_83F5B44:: @ 83F5B44
.incbin "baserom.gba", 0x3F5B44, 0x50
gUnknown_83F5B94:: @ 83F5B94
.incbin "baserom.gba", 0x3F5B94, 0x12
gUnknown_83F5BA6:: @ 83F5BA6
.incbin "baserom.gba", 0x3F5BA6, 0x12
gUnknown_83F5BB8:: @ 83F5BB8
.incbin "baserom.gba", 0x3F5BB8, 0x9
gUnknown_83F5BC1:: @ 83F5BC1
.incbin "baserom.gba", 0x3F5BC1, 0xB
gUnknown_83F5BCC:: @ 83F5BCC
.incbin "baserom.gba", 0x3F5BCC, 0x150
gUnknown_83F5D1C:: @ 83F5D1C
.incbin "baserom.gba", 0x3F5D1C, 0x10
sStarterMon:: @ 83F5D2C
.incbin "baserom.gba", 0x3F5D2C, 0x6
gUnknown_83F5D32:: @ 83F5D32
.incbin "baserom.gba", 0x3F5D32, 0x26
gUnknown_83F5D58:: @ 83F5D58
.incbin "baserom.gba", 0x3F5D58, 0x198
.align 2
gUnknown_83F5EF0:: @ 83F5EF0
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c"
.align 2
gUnknown_83F5F24:: @ 83F5F24
.asciz "0"
gUnknown_83F5F26:: @ 83F5F26
.incbin "baserom.gba", 0x3F5F26, 0x2A
gUnknown_83F5F50:: @ 83F5F50
.incbin "baserom.gba", 0x3F5F50, 0x160
gUnknown_83F60B0:: @ 83F60B0
.incbin "baserom.gba", 0x3F60B0, 0x20
gUnknown_83F60D0:: @ 83F60D0
.incbin "baserom.gba", 0x3F60D0, 0x100
gUnknown_83F61D0:: @ 83F61D0
.incbin "baserom.gba", 0x3F61D0, 0x20
gUnknown_83F61F0:: @ 83F61F0
.incbin "baserom.gba", 0x3F61F0, 0xB
gUnknown_83F61FB:: @ 83F61FB
.incbin "baserom.gba", 0x3F61FB, 0x8
gUnknown_83F6203:: @ 83F6203
.incbin "baserom.gba", 0x3F6203, 0x3
gUnknown_83F6206:: @ 83F6206
.incbin "baserom.gba", 0x3F6206, 0x160
gUnknown_83F6366:: @ 83F6366
.incbin "baserom.gba", 0x3F6366, 0x16
gUnknown_83F637C:: @ 83F637C
.incbin "baserom.gba", 0x3F637C, 0xC
.section .rodata.83F6C90
gUnknown_83F6C90:: @ 83F6C90
.incbin "baserom.gba", 0x3F6C90, 0x20
+1 -1
View File
@@ -342,7 +342,7 @@ gUnknown_84827B4:: @ 84827B4
.include "data/text/move_descriptions.inc"
.align 2, 0
gUnknown_84886E8:: @ 84886E8
gMoveDescriptionPointers:: @ 84886E8
.4byte gMoveDescription_Pound
.4byte gMoveDescription_KarateChop
.4byte gMoveDescription_DoubleSlap
+272 -271
View File
File diff suppressed because it is too large Load Diff
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 82 106
82 82 106
82 82 106
82 82 106
41 115 205
82 82 106
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 82 106
82 82 106
82 82 106
41 115 205
131 238 255
0 41 156
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 82 106
82 82 106
41 115 205
131 238 255
82 172 230
0 65 189
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 82 106
41 115 205
131 238 255
82 172 230
41 115 205
41 115 205
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
41 115 205
131 238 255
82 172 230
41 115 205
0 65 189
82 172 230
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
131 238 255
82 172 230
41 115 205
0 65 189
0 41 156
131 238 255
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 172 230
41 115 205
0 65 189
0 41 156
82 82 106
90 180 238
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
41 115 205
0 65 189
0 41 156
82 82 106
82 82 106
41 115 205
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
0 65 189
0 41 156
82 82 106
82 82 106
82 82 106
0 65 189
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
0 41 156
82 82 106
82 82 106
82 82 106
82 82 106
0 41 156
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
131 238 255
255 213 131
230 164 98
197 115 74
164 82 65
172 172 98
148 148 74
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 82 106
82 82 106
82 82 106
82 82 106
82 172 230
41 115 205
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 82 106
82 82 106
82 172 230
41 115 205
131 238 255
82 172 230
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 172 230
41 115 205
131 238 255
82 172 230
82 172 230
41 115 205
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
131 238 255
82 172 230
82 172 230
41 115 205
41 115 205
0 65 189
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
82 172 230
41 115 205
41 115 205
0 65 189
0 65 189
82 82 106
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
41 115 205
0 65 189
0 65 189
82 82 106
82 82 106
82 82 106
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
255 74 0
255 213 131
230 164 98
197 115 74
164 82 65
255 255 180
189 189 115
0 65 189
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 106
123 123 123
131 238 255
255 213 131
230 164 98
197 115 74
164 82 65
172 172 98
148 148 74
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
82 82 106
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 156 197
32 32 32
82 82 82
139 139 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 156 197
41 32 32
82 82 82
139 139 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
49 32 32
90 82 82
148 148 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
65 32 32
115 82 82
156 148 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
74 32 32
123 82 82
164 156 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
98 32 32
139 82 82
172 156 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
98 32 32
148 82 82
180 164 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
106 32 32
156 82 82
189 164 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
123 32 32
172 82 82
197 172 148
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
131 32 32
180 82 82
205 172 148
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 156 197
205 32 32
255 82 82
255 205 156
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+4 -4
View File
@@ -3884,16 +3884,16 @@
"blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin"
},
{
"id": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
"name": "SevenIsland_SeavaultCanyon_TanobyKey_Layout",
"id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
"name": "SevenIsland_SevaultCanyon_TanobyKey_Layout",
"width": 15,
"height": 16,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4A94",
"secondary_tileset": "gTileset_82D4E0C",
"border_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin",
"blockdata_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin"
"border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin",
"blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin"
},
{
"id": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
+2 -2
View File
@@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203
.byte 0
BirthIsland_Exterior_MapScript3_165213:: @ 8165213
special sub_80CD008
special Special_SetDeoxysTriangleObjectPal
end
BirthIsland_Exterior_MapScript1_165217:: @ 8165217
@@ -50,7 +50,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
special sub_80CCDFC
special Special_DeoxysSound
waitstate
switch VAR_RESULT
case 0, EventScript_1652BA
@@ -34,7 +34,7 @@ EventScript_16C418:: @ 816C418
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_80CA618
special Special_ShowDiploma
waitstate
release
end
@@ -7,11 +7,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
waitmessage
setvar VAR_0x8004, 3
specialvar VAR_RESULT, sub_80CB328
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, EventScript_16C1B7
case 1, EventScript_16C1C3
@@ -109,15 +109,15 @@ EventScript_16C2E6:: @ 816C2E6
end
EventScript_16C30E:: @ 816C30E
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_16C313:: @ 816C313
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special sub_80CB498
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
+1 -1
View File
@@ -273,7 +273,7 @@ EventScript_16C96C:: @ 816C96C
setfieldeffectarg 2, 14
dofieldeffect 64
waitfieldeffect 64
specialvar VAR_RESULT, sub_80CAABC
specialvar VAR_RESULT, Special_GetRandomSlotMachine
playslotmachine VAR_RESULT
releaseall
end
+2 -2
View File
@@ -8,7 +8,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0
message Text_191967
waitmessage
setvar VAR_0x8004, 0
special sub_80CB7C4
special Special_ListMenu
waitstate
switch VAR_RESULT
case 0, EventScript_16A8FB
@@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0
EventScript_16A87D:: @ 816A87D
message Text_191967
waitmessage
special sub_80CBC5C
special Special_ReturnToListMenu
waitstate
switch VAR_RESULT
case 0, EventScript_16A8FB
+1 -1
View File
@@ -40,7 +40,7 @@ EventScript_16AEC8:: @ 816AEC8
message Text_1932F4
waitmessage
setvar VAR_0x8004, 5
special sub_80CB7C4
special Special_ListMenu
waitstate
switch VAR_RESULT
case 0, EventScript_16AF6C
@@ -48,7 +48,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
faceplayer
setvar VAR_0x8008, 7
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_8053A9C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
checkflag FLAG_DID_TANGENY_TRADE
goto_if TRUE, EventScript_16E3D4
@@ -61,14 +61,14 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_16E3BC
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_8053D2C
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare_var_to_var VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16E3C6
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_8053D68
special sub_8054440
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
msgbox gUnknown_81A5B4A
setflag FLAG_DID_TANGENY_TRADE
@@ -10,16 +10,16 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
faceplayer
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_172043
compare_var_to_value VAR_STORAGE_UNKNOWN, 65535
compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
goto_if eq, EventScript_171F0B
compare_var_to_value VAR_STORAGE_UNKNOWN, 0
compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
goto_if ne, EventScript_171F19
msgbox gUnknown_81A42A0
goto EventScript_171EFE
end
EventScript_171EFE:: @ 8171EFE
special sub_80CB0A8
special Special_SampleResortGorgeousMonAndReward
msgbox gUnknown_81A4315
release
end
@@ -30,15 +30,15 @@ EventScript_171F0B:: @ 8171F0B
end
EventScript_171F19:: @ 8171F19
copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN
specialvar VAR_RESULT, sub_80CC48C
copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_171F34
goto EventScript_171EFE
end
EventScript_171F34:: @ 8171F34
special sub_80CB0A8
special Special_SampleResortGorgeousMonAndReward
msgbox gUnknown_81A43F7
addobject 2
applymovement 2, Movement_172060
@@ -62,11 +62,11 @@ EventScript_171F34:: @ 8171F34
call_if eq, EventScript_17201A
moveobjectoffscreen 2
msgbox gUnknown_81A458E
giveitem VAR_0x403B
giveitem VAR_RESORT_GORGEOUS_REWARD
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_172025
setflag FLAG_TEMP_2
setvar VAR_STORAGE_UNKNOWN, 0
setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
release
end
@@ -104,7 +104,7 @@ EventScript_172025:: @ 8172025
textcolor 1
msgbox gUnknown_81A461B
setflag FLAG_TEMP_2
setvar VAR_STORAGE_UNKNOWN, 0
setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
release
end
@@ -13,7 +13,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG
goto_if TRUE, EventScript_16892C
msgbox gUnknown_818A80D
specialvar VAR_RESULT, sub_80CA76C
specialvar VAR_RESULT, Special_GetLeadMonFriendship
compare_var_to_value VAR_RESULT, 6
goto_if eq, EventScript_1688AC
msgbox gUnknown_818A88F
@@ -49,12 +49,12 @@ EventScript_1688BA:: @ 81688BA
EventScript_1688E3:: @ 81688E3
getspeciesname 1, SPECIES_TOGEPI
setvar VAR_0x8004, SPECIES_TOGEPI
specialvar VAR_RESULT, sub_80CD0F4
specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_168895
getspeciesname 1, SPECIES_TOGETIC
setvar VAR_0x8004, SPECIES_TOGETIC
specialvar VAR_RESULT, sub_80CD0F4
specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_168895
msgbox gUnknown_818A9C0
+1 -1
View File
@@ -133,7 +133,7 @@ EventScript_167E19:: @ 8167E19
special GetDaycareMonNicknames
msgbox gUnknown_81BF789
special SetDaycareCompatibilityString
special sub_80CA68C
special Special_ShowStringVar4AsFieldMessage
waitmessage
waitbuttonpress
release
@@ -40,7 +40,7 @@ EventScript_171993:: @ 8171993
msgbox gUnknown_81BF860
waitmoncry
special StoreSelectedPokemonInDaycare
incrementgamestat 47
incrementgamestat GAME_STAT_USED_DAYCARE
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_171A01
+7 -7
View File
@@ -72,7 +72,7 @@ FuchsiaCity_EventScript_166E07:: @ 8166E07
FuchsiaCity_EventScript_166E1F:: @ 8166E1F
lockall
setvar VAR_0x8004, SPECIES_CHANSEY
special sub_80CBDCC
special Special_SetSeenMon
drawmonpic SPECIES_CHANSEY, 10, 3
msgbox gUnknown_81807A9
erasemonpic
@@ -82,7 +82,7 @@ FuchsiaCity_EventScript_166E1F:: @ 8166E1F
FuchsiaCity_EventScript_166E38:: @ 8166E38
lockall
setvar VAR_0x8004, SPECIES_VOLTORB
special sub_80CBDCC
special Special_SetSeenMon
drawmonpic SPECIES_VOLTORB, 10, 3
msgbox gUnknown_81807D9
erasemonpic
@@ -92,7 +92,7 @@ FuchsiaCity_EventScript_166E38:: @ 8166E38
FuchsiaCity_EventScript_166E51:: @ 8166E51
lockall
setvar VAR_0x8004, SPECIES_KANGASKHAN
special sub_80CBDCC
special Special_SetSeenMon
drawmonpic SPECIES_KANGASKHAN, 10, 3
msgbox gUnknown_8180806
erasemonpic
@@ -102,7 +102,7 @@ FuchsiaCity_EventScript_166E51:: @ 8166E51
FuchsiaCity_EventScript_166E6A:: @ 8166E6A
lockall
setvar VAR_0x8004, SPECIES_SLOWPOKE
special sub_80CBDCC
special Special_SetSeenMon
drawmonpic SPECIES_SLOWPOKE, 10, 3
msgbox gUnknown_8180859
erasemonpic
@@ -112,7 +112,7 @@ FuchsiaCity_EventScript_166E6A:: @ 8166E6A
FuchsiaCity_EventScript_166E83:: @ 8166E83
lockall
setvar VAR_0x8004, SPECIES_LAPRAS
special sub_80CBDCC
special Special_SetSeenMon
drawmonpic SPECIES_LAPRAS, 10, 3
msgbox gUnknown_8180887
erasemonpic
@@ -124,7 +124,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C
checkflag FLAG_GOT_DOME_FOSSIL
goto_if TRUE, EventScript_166EBE
setvar VAR_0x8004, SPECIES_KABUTO
special sub_80CBDCC
special Special_SetSeenMon
drawmonpic SPECIES_KABUTO, 10, 3
msgbox gUnknown_81808FA
erasemonpic
@@ -133,7 +133,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C
EventScript_166EBE:: @ 8166EBE
setvar VAR_0x8004, SPECIES_OMANYTE
special sub_80CBDCC
special Special_SetSeenMon
drawmonpic SPECIES_OMANYTE, 10, 3
msgbox gUnknown_81808AE
erasemonpic
+3 -3
View File
@@ -16,7 +16,7 @@ EventScript_16D8B0:: @ 816D8B0
waitstate
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_16D941
special sub_80BFC14
special IsSelectedMonEgg
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16D937
special ScrSpecial_CountPokemonMoves
@@ -24,7 +24,7 @@ EventScript_16D8B0:: @ 816D8B0
goto_if eq, EventScript_16D92A
msgbox gUnknown_8199445
fadescreen 1
special Special_ChooseMoveToDelete
special SelectMove
fadescreen 0
compare_var_to_value VAR_0x8005, 4
goto_if eq, EventScript_16D8B0
@@ -36,7 +36,7 @@ EventScript_16D8B0:: @ 816D8B0
end
EventScript_16D919:: @ 816D919
special Special_DeleteSelectedMove
special DeleteMonMove
playfanfare MUS_ME_WASURE
waitfanfare
msgbox gUnknown_81994B1
@@ -157,7 +157,7 @@ EventScript_16D462:: @ 816D462
countpokemon
compare_var_to_value VAR_RESULT, 6
goto_if ne, EventScript_1A77A9
specialvar VAR_RESULT, sub_80CABD0
specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_1A77A9
msgbox gUnknown_81BFEAC
+3 -3
View File
@@ -27,14 +27,14 @@ EventScript_16B2AA:: @ 816B2AA
end
EventScript_16B2B4:: @ 816B2B4
specialvar VAR_RESULT, sub_80CAD54
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare_var_to_value VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_16B307
special TV_CopyNicknameToStringVar1AndEnsureTerminated
special TV_CheckMonOTIDEqualsPlayerID
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16B311
specialvar VAR_RESULT, sub_80CAD7C
specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16B311
@@ -58,7 +58,7 @@ EventScript_16B311:: @ 816B311
EventScript_16B31B:: @ 816B31B
msgbox gUnknown_8193B36
call EventScript_1A74EB
specialvar VAR_RESULT, sub_80CBFA0
specialvar VAR_RESULT, NameRaterWasNicknameChanged
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16B345
+7 -7
View File
@@ -7,31 +7,31 @@ MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92C5
getbraillestringwidth gUnknown_81A92C5
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92D0
getbraillestringwidth gUnknown_81A92D0
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92DC
getbraillestringwidth gUnknown_81A92DC
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92E6
getbraillestringwidth gUnknown_81A92E6
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92F2
getbraillestringwidth gUnknown_81A92F2
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92FE
getbraillestringwidth gUnknown_81A92FE
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A930A
getbraillestringwidth gUnknown_81A930A
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
braillemessage gUnknown_81A9316
waitbuttonpress
releaseall
+2 -2
View File
@@ -46,14 +46,14 @@ NavelRock_Base_EventScript_165134:: @ 8165134
setvar VAR_0x8005, 3
setvar VAR_0x8006, 4
setvar VAR_0x8007, 2
special sub_80CAC28
special Special_ShakeScreen
delay 30
playse SE_T_AME_E
setvar VAR_0x8004, 0
setvar VAR_0x8005, 3
setvar VAR_0x8006, 4
setvar VAR_0x8007, 2
special sub_80CAC28
special Special_ShakeScreen
delay 30
delay 50
waitse
+2 -2
View File
@@ -45,7 +45,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
special SpawnCameraObject
setvar VAR_0x8004, 3
setvar VAR_0x8005, 35
special sub_80CD1B4
special Special_LoopWingFlapSound
applymovement 1, Movement_1650E0
applymovement 127, Movement_1650CD
waitmovement 0
@@ -59,7 +59,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
delay 60
setvar VAR_0x8004, 3
setvar VAR_0x8005, 35
special sub_80CD1B4
special Special_LoopWingFlapSound
applymovement 127, Movement_1650D1
applymovement 1, Movement_1650D7
waitmovement 0
+2 -2
View File
@@ -61,7 +61,7 @@ EventScript_168DB9:: @ 8168DB9
faceplayer
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_168E3C
specialvar VAR_RESULT, sub_80CAD54
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare_var_to_value VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_168E32
msgbox gUnknown_818D8CC
@@ -88,7 +88,7 @@ EventScript_168E3C:: @ 8168E3C
EventScript_168E46:: @ 8168E46
msgbox gUnknown_818D9A5
specialvar VAR_RESULT, sub_80CA76C
specialvar VAR_RESULT, Special_GetLeadMonFriendship
switch VAR_RESULT
case 0, EventScript_168EA6
case 1, EventScript_168EB0
@@ -38,10 +38,10 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
setvar VAR_0x8004, 32
special Special_SetSomeVariable
setvar VAR_0x8004, 1
special sub_80CA86C
special Special_AnimatePcTurnOn
playse SE_PC_ON
msgbox gUnknown_81A5420
special sub_80EB6AC
special BedroomPC
waitstate
special sub_812B35C
releaseall
@@ -50,7 +50,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
setvar VAR_0x8004, 1
playse SE_PC_OFF
special sub_80CA9A8
special Special_AnimatePcTurnOff
special sub_812B35C
releaseall
end
+5 -5
View File
@@ -9,11 +9,11 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
waitmessage
setvar VAR_0x8004, 2
specialvar VAR_RESULT, sub_80CB328
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, EventScript_161530
case 1, EventScript_16153C
@@ -87,15 +87,15 @@ EventScript_161608:: @ 8161608
end
EventScript_161609:: @ 8161609
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_16160E:: @ 816160E
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special sub_80CB498
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
+4 -4
View File
@@ -36,17 +36,17 @@ EventScript_16FF7F:: @ 816FF7F
goto_if eq, EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, sub_80CC48C
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_16FFF5
special sub_80A096C
special GetMagikarpSizeRecordInfo
msgbox gUnknown_819F2DB
special Special_ChooseMonFromParty
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare_var_to_value VAR_RESULT, 6
goto_if ge, EventScript_16FFFF
special sub_80A0984
special CompareMagikarpSize
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_170001
compare_var_to_value VAR_RESULT, 2
@@ -110,7 +110,7 @@ Route12_FishingHouse_EventScript_170067:: @ 8170067
end
EventScript_17007B:: @ 817007B
special sub_80A096C
special GetMagikarpSizeRecordInfo
msgbox gUnknown_819F4CF
releaseall
end
@@ -9,7 +9,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_ARTICUNO
special sub_80CBDCC
special Special_SetSeenMon
releaseall
end
+1 -1
View File
@@ -27,7 +27,7 @@ Route16_MapScript3_168113:: @ 8168113
.2byte 0
EventScript_16811D:: @ 816811D
special sub_80CA630
special Special_ForcePlayerOntoBike
end
Route16_EventScript_168121:: @ 8168121
+1 -1
View File
@@ -17,7 +17,7 @@ Route18_MapScript2_168211:: @ 8168211
.2byte 0
EventScript_16821B:: @ 816821B
special sub_80CA630
special Special_ForcePlayerOntoBike
end
Route18_EventScript_16821F:: @ 816821F
+4 -4
View File
@@ -263,7 +263,7 @@ EventScript_17082B:: @ 817082B
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_EEVEE
special sub_80CBDCC
special Special_SetSeenMon
goto EventScript_1707D8
end
@@ -272,7 +272,7 @@ EventScript_170840:: @ 8170840
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_FLAREON
special sub_80CBDCC
special Special_SetSeenMon
goto EventScript_1707D8
end
@@ -281,7 +281,7 @@ EventScript_170855:: @ 8170855
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_JOLTEON
special sub_80CBDCC
special Special_SetSeenMon
goto EventScript_1707D8
end
@@ -290,7 +290,7 @@ EventScript_17086A:: @ 817086A
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_VAPOREON
special sub_80CBDCC
special Special_SetSeenMon
goto EventScript_1707D8
end
+1 -1
View File
@@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97
message Text_173CE3
waitmessage
setvar VAR_0x8004, SPECIES_SNORLAX
special sub_80CBDCC
special Special_SetSeenMon
drawmonpic SPECIES_SNORLAX, 10, 3
waitbuttonpress
erasemonpic
@@ -78,37 +78,37 @@ SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144
end
EventScript_16F15B:: @ 816F15B
special sub_81132CC
special UpdateMovedSaffronFanClubMembers
setvar VAR_0x8004, 0
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F207
setvar VAR_0x8004, 1
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F213
setvar VAR_0x8004, 2
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F21F
setvar VAR_0x8004, 3
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F22B
setvar VAR_0x8004, 4
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F237
setvar VAR_0x8004, 5
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F243
setvar VAR_0x8004, 6
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F24F
setvar VAR_0x8004, 7
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F25B
end
@@ -165,13 +165,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
lock
faceplayer
setvar VAR_0x8004, 0
special sub_81133A4
special BufferStreakTrainerText
compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F2EE
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F2C0
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F2E4
msgbox gUnknown_819C420
@@ -179,7 +179,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
end
EventScript_16F2C0:: @ 816F2C0
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F2DA
msgbox gUnknown_819C390
@@ -205,13 +205,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
lock
faceplayer
setvar VAR_0x8004, 3
special sub_81133A4
special BufferStreakTrainerText
compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F365
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F337
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F35B
msgbox gUnknown_819CBD3
@@ -219,7 +219,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
end
EventScript_16F337:: @ 816F337
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F351
msgbox gUnknown_819CB32
@@ -245,13 +245,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
lock
faceplayer
setvar VAR_0x8004, 1
special sub_81133A4
special BufferStreakTrainerText
compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F3DC
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F3AE
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F3D2
msgbox gUnknown_819C6BA
@@ -259,7 +259,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
end
EventScript_16F3AE:: @ 816F3AE
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F3C8
msgbox gUnknown_819C5A9
@@ -285,13 +285,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
lock
faceplayer
setvar VAR_0x8004, 2
special sub_81133A4
special BufferStreakTrainerText
compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F453
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F425
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F449
msgbox gUnknown_819C986
@@ -299,7 +299,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
end
EventScript_16F425:: @ 816F425
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F43F
msgbox gUnknown_819C81E
@@ -325,11 +325,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
lock
faceplayer
setvar VAR_0x8004, 5
special sub_81133A4
specialvar VAR_RESULT, sub_8113364
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F491
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F4B5
msgbox gUnknown_819D01F
@@ -337,7 +337,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
end
EventScript_16F491:: @ 816F491
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F4AB
msgbox gUnknown_819CEDF
@@ -358,11 +358,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
lock
faceplayer
setvar VAR_0x8004, 4
special sub_81133A4
specialvar VAR_RESULT, sub_8113364
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F4F3
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F517
msgbox gUnknown_819CDDA
@@ -370,7 +370,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
end
EventScript_16F4F3:: @ 816F4F3
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F50D
msgbox gUnknown_819CCF3
@@ -391,11 +391,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
lock
faceplayer
setvar VAR_0x8004, 6
special sub_81133A4
specialvar VAR_RESULT, sub_8113364
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F555
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F579
msgbox gUnknown_819D1AE
@@ -403,7 +403,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
end
EventScript_16F555:: @ 816F555
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F56F
msgbox gUnknown_819D0E3
@@ -424,11 +424,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
lock
faceplayer
setvar VAR_0x8004, 7
special sub_81133A4
specialvar VAR_RESULT, sub_8113364
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F5B7
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F5DB
msgbox gUnknown_819D3D2
@@ -436,7 +436,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
end
EventScript_16F5B7:: @ 816F5B7
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F5D1
msgbox gUnknown_819D2B4
+1 -1
View File
@@ -70,7 +70,7 @@ SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7
EventScript_1630F1:: @ 81630F1
turnobject 255, 2
special sub_80CBD80
special Special_ForcePlayerToStartSurfing
end
SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9
@@ -90,7 +90,7 @@ EventScript_17097D:: @ 817097D
EventScript_170987:: @ 8170987
special SavePlayerParty
special sub_80CAAAC
special Special_BufferEReaderTrainerName5
msgbox gUnknown_81A0598, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_170A11
@@ -105,7 +105,7 @@ EventScript_170987:: @ 8170987
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_170A11
special SavePlayerParty
special sub_80A03D8
special ReducePlayerPartyToThree
msgbox gUnknown_81A07C4
closemessage
compare_var_to_value VAR_FACING, 2
@@ -4,7 +4,7 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E
.byte 0
SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89
special sub_80E5E70
special SetEReaderTrainerGfxId
end
SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D
@@ -15,12 +15,12 @@ EventScript_170A97:: @ 8170A97
lockall
applymovement 255, Movement_170B22
waitmovement 0
special sub_80E7538
special PrintEReaderTrainerGreeting
msgbox gStringVar4
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
special sub_80E6900
special StartSpecialBattle
waitstate
compare_var_to_value VAR_RESULT, 3
call_if eq, EventScript_170AFE
@@ -46,14 +46,14 @@ EventScript_170AFE:: @ 8170AFE
EventScript_170B0C:: @ 8170B0C
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
special sub_80CA68C
special Special_ShowStringVar4AsFieldMessage
waitmessage
waitbuttonpress
return
EventScript_170B17:: @ 8170B17
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
special sub_80CA68C
special Special_ShowStringVar4AsFieldMessage
waitmessage
waitbuttonpress
return
+1 -1
View File
@@ -290,7 +290,7 @@
"x": 7,
"y": 17,
"elevation": 5,
"dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
"dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
"dest_warp_id": 0
},
{
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
"name": "SevenIsland_SeavaultCanyon_TanobyKey",
"layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
"id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
"name": "SevenIsland_SevaultCanyon_TanobyKey",
"layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
"music": "MUS_NANAISEKI",
"region_map_section": "MAPSEC_TANOBY_KEY",
"requires_flash": false,
@@ -122,7 +122,7 @@
"elevation": 3,
"var": "VAR_0x4001",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39"
},
{
"type": "trigger",
@@ -131,7 +131,7 @@
"elevation": 3,
"var": "VAR_0x4007",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B"
},
{
"type": "trigger",
@@ -140,7 +140,7 @@
"elevation": 3,
"var": "VAR_0x4006",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8"
},
{
"type": "trigger",
@@ -149,7 +149,7 @@
"elevation": 3,
"var": "VAR_0x4005",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5"
},
{
"type": "trigger",
@@ -158,7 +158,7 @@
"elevation": 3,
"var": "VAR_0x4004",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2"
},
{
"type": "trigger",
@@ -167,7 +167,7 @@
"elevation": 3,
"var": "VAR_0x4003",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F"
},
{
"type": "trigger",
@@ -176,7 +176,7 @@
"elevation": 3,
"var": "VAR_0x4002",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C"
}
],
"bg_events": []
@@ -1,9 +1,9 @@
SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2
SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
map_script 3, SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2
.byte 0
SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY
SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY
checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
call_if TRUE, EventScript_164E07
setvar VAR_0x4001, 0
@@ -26,7 +26,7 @@ EventScript_164E07:: @ 8164E07
setobjectxyperm 7, 9, 8
return
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
lockall
compare_var_to_value VAR_0x4001, 100
goto_if eq, EventScript_164F8A
@@ -37,7 +37,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
lockall
compare_var_to_value VAR_0x4002, 100
goto_if eq, EventScript_164F8A
@@ -48,7 +48,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
lockall
compare_var_to_value VAR_0x4003, 100
goto_if eq, EventScript_164F8A
@@ -59,7 +59,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
lockall
compare_var_to_value VAR_0x4004, 100
goto_if eq, EventScript_164F8A
@@ -70,7 +70,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
lockall
compare_var_to_value VAR_0x4005, 100
goto_if eq, EventScript_164F8A
@@ -81,7 +81,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
lockall
compare_var_to_value VAR_0x4006, 100
goto_if eq, EventScript_164F8A
@@ -92,7 +92,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
lockall
compare_var_to_value VAR_0x4007, 100
goto_if eq, EventScript_164F8A
@@ -110,7 +110,7 @@ EventScript_164F2E:: @ 8164F2E
setvar VAR_0x8005, 1
setvar VAR_0x8006, 8
setvar VAR_0x8007, 3
special sub_80CAC28
special Special_ShakeScreen
delay 60
return
@@ -119,13 +119,13 @@ EventScript_164F51:: @ 8164F51
setvar VAR_0x8005, 2
setvar VAR_0x8006, 10
setvar VAR_0x8007, 3
special sub_80CAC28
special Special_ShakeScreen
delay 60
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
setvar VAR_0x8006, 12
setvar VAR_0x8007, 2
special sub_80CAC28
special Special_ShakeScreen
delay 60
playse SE_FU_ZUZUZU
waitse
@@ -9,11 +9,11 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
waitmessage
setvar VAR_0x8004, 6
specialvar VAR_RESULT, sub_80CB328
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, EventScript_164B46
case 1, EventScript_164B52
@@ -44,7 +44,7 @@ EventScript_164B90:: @ 8164B90
goto_if eq, EventScript_164BD3
call EventScript_164BD8
setvar VAR_ELEVATOR_FLOOR, 3
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
delay 25
applymovement 255, Movement_164BE5
waitmovement 0
@@ -58,15 +58,15 @@ EventScript_164BCD:: @ 8164BCD
end
EventScript_164BD3:: @ 8164BD3
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_164BD8:: @ 8164BD8
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special sub_80CB498
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
+6 -6
View File
@@ -7,12 +7,12 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
waitmessage
setvar VAR_0x8004, 1
specialvar VAR_RESULT, sub_80CB328
special sub_80CB7C4
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
special Special_ListMenu
waitstate
switch VAR_RESULT
case 0, EventScript_1621BF
@@ -163,15 +163,15 @@ EventScript_1621E6:: @ 81621E6
end
EventScript_1621E7:: @ 81621E7
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_1621EC:: @ 81621EC
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special sub_80CB498
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
@@ -28,7 +28,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
setvar VAR_0x8005, 0
setvar VAR_0x8006, 12
setvar VAR_0x8007, 3
special sub_80CAC28
special Special_ShakeScreen
delay 60
compare_var_to_value VAR_FACING, 2
call_if eq, EventScript_164325
@@ -241,63 +241,63 @@ SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9321
getbraillestringwidth gUnknown_81A9321
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A932D
getbraillestringwidth gUnknown_81A932D
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9338
getbraillestringwidth gUnknown_81A9338
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A933F
getbraillestringwidth gUnknown_81A933F
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A934A
getbraillestringwidth gUnknown_81A934A
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9356
getbraillestringwidth gUnknown_81A9356
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9362
getbraillestringwidth gUnknown_81A9362
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9368
getbraillestringwidth gUnknown_81A9368
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9374
getbraillestringwidth gUnknown_81A9374
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A937C
getbraillestringwidth gUnknown_81A937C
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9387
getbraillestringwidth gUnknown_81A9387
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9393
getbraillestringwidth gUnknown_81A9393
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A939F
getbraillestringwidth gUnknown_81A939F
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A93AB
getbraillestringwidth gUnknown_81A93AB
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A93B4
getbraillestringwidth gUnknown_81A93B4
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
braillemessage gUnknown_81A93C0
waitbuttonpress
releaseall
@@ -9,17 +9,17 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
goto_if eq, EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, sub_80CC48C
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1720E5
special sub_80A0918
special GetHeracrossSizeRecordInfo
msgbox gUnknown_81A4A3F
special Special_ChooseMonFromParty
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare_var_to_value VAR_RESULT, 6
goto_if ge, EventScript_1720EF
special sub_80A0930
special CompareHeracrossSize
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_1720F1
compare_var_to_value VAR_RESULT, 2
@@ -83,7 +83,7 @@ SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157
end
EventScript_17216B:: @ 817216B
special sub_80A0918
special GetHeracrossSizeRecordInfo
msgbox gUnknown_81A4C6E
releaseall
end
@@ -32,7 +32,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
giveitem ITEM_IAPAPA_BERRY
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_163D19
special sub_80CA6DC
special Special_BufferBigGuyOrBigGirlString
msgbox gUnknown_817AF3B
closemessage
setflag FLAG_RESCUED_LOSTELLE
+1 -1
View File
@@ -4,7 +4,7 @@ ThreeIsland_House1_MapScripts:: @ 8171819
ThreeIsland_House1_EventScript_17181A:: @ 817181A
lock
faceplayer
special sub_80CA6DC
special Special_BufferBigGuyOrBigGirlString
msgbox gUnknown_81A2F3E
release
end
+3 -3
View File
@@ -53,11 +53,11 @@ EventScript_1716A5:: @ 81716A5
EventScript_1716BE:: @ 81716BE
msgbox gUnknown_81A2CC3
special sub_80BF93C
special SelectMoveTutorMon
waitstate
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_17179E
special sub_80BFC14
special IsSelectedMonEgg
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_171790
compare_var_to_value VAR_0x8005, 0
@@ -67,7 +67,7 @@ EventScript_1716BE:: @ 81716BE
EventScript_1716F4:: @ 81716F4
msgbox gUnknown_81A2CE1
special sub_80E4634
special DisplayMoveTutorMenu
waitstate
compare_var_to_value VAR_0x8004, 0
goto_if eq, EventScript_1716BE
@@ -37,7 +37,7 @@ EventScript_171435:: @ 8171435
textcolor 0
msgbox gUnknown_81A28B2
textcolor 1
special sub_80CA6DC
special Special_BufferBigGuyOrBigGirlString
msgbox gUnknown_81A2931
closemessage
applymovement 3, Movement_1A75ED
+1 -1
View File
@@ -212,7 +212,7 @@
"SevenIsland_TanobyRuins_RixyChamber",
"SevenIsland_TanobyRuins_ViapoisChamber",
"ThreeIsland_DunsparceTunnel",
"SevenIsland_SeavaultCanyon_TanobyKey",
"SevenIsland_SevaultCanyon_TanobyKey",
"NavelRock_1F",
"NavelRock_Summit",
"NavelRock_Base",
+92 -93
View File
@@ -7,11 +7,10 @@
.set __special__, 0
.align 2
gSpecials:: @ 815FD60
def_special sp000_heal_pokemon
def_special SetCableClubWarp
def_special sub_807E654
def_special DoCableClubWarp
def_special sub_807E704
def_special sub_8081744
def_special sub_8081770
@@ -66,10 +65,10 @@ gSpecials:: @ 815FD60
def_special GetTrainerFlag
def_special ScrSpecial_EndTrainerApproach
def_special SetUpTrainerEncounterMusic
def_special sub_810CD4C
def_special sub_810CEB4
def_special ShouldTryRematchBattle
def_special ScrSpecial_GetTrainerEyeRematchFlag
def_special ScrSpecial_StartTrainerEyeRematch
def_special sub_808C6A8
def_special ShowPokemonStorageSystem
def_special CheckForAlivePartyMons
def_special nullsub_75
def_special nullsub_75
@@ -78,7 +77,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CBEBC
def_special Special_HasLeadMonBeenRenamed
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -128,16 +127,16 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80A0918
def_special sub_80A0930
def_special sub_80A096C
def_special sub_80A0984
def_special sub_80CBFA0
def_special GetHeracrossSizeRecordInfo
def_special CompareHeracrossSize
def_special GetMagikarpSizeRecordInfo
def_special CompareMagikarpSize
def_special NameRaterWasNicknameChanged
def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
def_special TV_CheckMonOTIDEqualsPlayerID
def_special nullsub_75
def_special nullsub_75
def_special sub_80BDB1C
def_special BufferRandomHobbyOrLifestyleString
def_special nullsub_75
def_special RegisteredItemHandleBikeSwap
def_special CalculatePlayerPartyCount
@@ -150,15 +149,15 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA68C
def_special Special_ShowStringVar4AsFieldMessage
def_special DrawWholeMapView
def_special sub_80CA69C
def_special Special_GetPlayerXY
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA6BC
def_special sub_80CA6DC
def_special sub_80CA714
def_special Special_GetPlayerTrainerIdOnesDigit
def_special Special_BufferBigGuyOrBigGirlString
def_special Special_BufferSonOrDaughterString
def_special Special_SetHiddenItemFlag
def_special nullsub_75
def_special nullsub_75
@@ -172,11 +171,11 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_8113364
def_special sub_8113288
def_special sub_81133A4
def_special ShouldMoveSaffronFanClubMember
def_special GetNumMovedSaffronFanClubMembers
def_special BufferStreakTrainerText
def_special sub_8113064
def_special sub_81132CC
def_special UpdateMovedSaffronFanClubMembers
def_special sub_8113510
def_special sub_81130A8
def_special sub_8113530
@@ -204,12 +203,12 @@ gSpecials:: @ 815FD60
def_special TakePokemonFromDaycare
def_special ScriptHatchMon
def_special EggHatch
def_special sub_8046EAC
def_special DaycareMonReceivedMail
def_special Special_BattleRecords
def_special IsEnoughForCostInVar0x8005
def_special SubtractMoneyFromVar0x8005
def_special ExecuteWhiteOut
def_special sub_80CA3C4
def_special sp0C8_whiteout_maybe
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -222,49 +221,49 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special Special_GetPokedexCount
def_special sub_80CA524
def_special sub_80CA86C
def_special sub_80CA9A8
def_special Special_GetProfOaksRatingMessage
def_special Special_AnimatePcTurnOn
def_special Special_AnimatePcTurnOff
def_special Special_GetElevatorFloor
def_special nullsub_75
def_special nullsub_75
def_special sub_80BF93C
def_special Special_ChooseMoveToDelete
def_special Special_DeleteSelectedMove
def_special SelectMoveTutorMon
def_special SelectMove
def_special DeleteMonMove
def_special ScrSpecial_GetPokemonNicknameAndMoveName
def_special ScrSpecial_CountPokemonMoves
def_special sub_80E4634
def_special DisplayMoveTutorMenu
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA664
def_special Special_GetPlayerAvatarBike
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA76C
def_special Special_GetLeadMonFriendship
def_special sub_80E5970
def_special sub_80E5C28
def_special sub_80E6648
def_special sub_80E67FC
def_special sub_80E7538
def_special sub_80E6900
def_special sub_80E6A0C
def_special sub_80E6C8C
def_special sub_80E6E14
def_special sub_80E6FB8
def_special sub_80E7058
def_special sub_80E71D0
def_special sub_80E724C
def_special sub_80E72B8
def_special sub_80A0380
def_special ChooseNextBattleTowerTrainer
def_special CheckPartyBattleTowerBanlist
def_special PrintBattleTowerTrainerGreeting
def_special PrintEReaderTrainerGreeting
def_special StartSpecialBattle
def_special SetBattleTowerProperty
def_special BattleTowerUtil
def_special SetBattleTowerParty
def_special SaveBattleTowerProgress
def_special BattleTower_SoftReset
def_special DetermineBattleTowerPrize
def_special GiveBattleTowerPrize
def_special AwardBattleTowerRibbons
def_special ChooseBattleTowerPlayerParty
def_special ValidateEReaderTrainer
def_special nullsub_75
def_special sub_80A03D8
def_special sub_80EB6AC
def_special sub_80EB6FC
def_special sub_80CA7EC
def_special sub_8053A9C
def_special sub_8053D68
def_special sub_8054440
def_special sub_8053D2C
def_special ReducePlayerPartyToThree
def_special BedroomPC
def_special PlayerPC
def_special Special_TownMap
def_special GetInGameTradeSpeciesInfo
def_special CreateInGameTradePokemon
def_special DoInGameTradeScene
def_special GetTradeSpecies
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -273,7 +272,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special ScrSpecial_CreatePCMenu
def_special HallOfFamePCBeginFade
def_special sub_80CA618
def_special Special_ShowDiploma
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -282,7 +281,7 @@ gSpecials:: @ 815FD60
def_special nullsub_61
def_special DoSoftReset
def_special Special_HallOfFame
def_special sub_80CB498
def_special Special_AnimateElevator
def_special nullsub_75
def_special SpawnCameraObject
def_special RemoveCameraObject
@@ -294,32 +293,32 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAAAC
def_special sub_80CAABC
def_special Special_BufferEReaderTrainerName5
def_special Special_GetRandomSlotMachine
def_special GetPlayerFacingDirection
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special LeadMonHasEffortRibbon
def_special GivLeadMonEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special ScrSpecial_AreLeadMonEVsMaxedOut
def_special sub_8069740
def_special sub_8069768
def_special InitRoamer
def_special nullsub_75
def_special sub_80CA804
def_special Special_PlayerHasGrassPokemonInParty
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAB78
def_special Special_IsStarterFirstStageInParty
def_special nullsub_75
def_special sub_80CABD0
def_special Special_IsThereRoomInAnyBoxForMorePokemon
def_special nullsub_75
def_special sub_80CB580
def_special Special_DrawElevatorCurrentFloorWindow
def_special nullsub_75
def_special sub_80CAC08
def_special Special_CheckPartyPokerus
def_special sub_806E99C
def_special sub_80CAC28
def_special Special_ShakeScreen
def_special Special_StartGroudonKyogreBattle
def_special Special_StartLegendaryBattle
def_special Special_StartRegiBattle
@@ -331,13 +330,13 @@ gSpecials:: @ 815FD60
def_special DoFallWarp
def_special nullsub_75
def_special nullsub_75
def_special sub_80E5E70
def_special SetEReaderTrainerGfxId
def_special ScrSpecial_StartSouthernIslandBattle
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAD54
def_special sub_80BFC14
def_special Special_GetSpeciesOfPartySlot_x8004
def_special IsSelectedMonEgg
def_special nullsub_75
def_special nullsub_75
def_special LoadPlayerBag
@@ -345,31 +344,31 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special HasAllKantoMons
def_special sub_80CAD7C
def_special Special_BufferMonOTNameAndCompareToPlayerName
def_special nullsub_75
def_special sub_80E759C
def_special Dummy_TryEnableBravoTrainerBattleTower
def_special GetNameOfEnigmaBerryInPlayerParty
def_special nullsub_75
def_special sub_810B82C
def_special ScrSpecial_StartMarowakBattle
def_special sub_80CA630
def_special sub_80CB7C4
def_special sub_80CBC5C
def_special Special_ForcePlayerOntoBike
def_special Special_ListMenu
def_special Special_ReturnToListMenu
def_special sub_80CADC4
def_special Special_SetVermilionTrashCans
def_special sub_805D1A8
def_special sub_80CB0A8
def_special Special_SampleResortGorgeousMonAndReward
def_special Special_CheckAddCoins
def_special GetDaycarePokemonCount
def_special sub_80CB63C
def_special sub_80CBD80
def_special Special_CloseElevatorCurrentFloorWindow
def_special Special_ForcePlayerToStartSurfing
def_special ScrSpecial_GetStarter
def_special sub_80CBDCC
def_special Special_SetSeenMon
def_special sub_810C444
def_special sub_80CC7B4
def_special ChangeBoxPokemonNickname
def_special sub_80CC2BC
def_special sub_80CC3CC
def_special Special_UpdateTrainerCardPhotoIcons
def_special Special_StickerLadyGetBragFlags
def_special sub_80CC524
def_special IsWirelessAdapterConnected
def_special sub_8115A24
@@ -389,7 +388,7 @@ gSpecials:: @ 815FD60
def_special GetNumLevelsGainedForRoute5DaycareMon
def_special TakePokemonFromRoute5Daycare
def_special ScrSpecial_SeaGallopFerry
def_special sub_80CC48C
def_special Special_PlayerPartyContainsSpecies
def_special Special_SetSomeVariable
def_special HelpSystem_BackupSomeVariable
def_special HelpSystem_RestoreSomeVariable
@@ -398,7 +397,7 @@ gSpecials:: @ 815FD60
def_special sub_811999C
def_special sp182_move_string
def_special sub_811390C
def_special sub_80CC4D4
def_special Special_GetMartClerkObjectId
def_special Special_BattleCardAction
def_special sub_8110AB4
def_special sub_8112364
@@ -415,7 +414,7 @@ gSpecials:: @ 815FD60
def_special IsNationalPokedexEnabled
def_special sub_815D9E8
def_special sub_814B504
def_special sub_80CC8CC
def_special Special_ItemIsTM_GetMoveName
def_special Special_DaisyMassageServices
def_special HelpSystem_Disable
def_special HelpSystem_Enable
@@ -426,31 +425,31 @@ gSpecials:: @ 815FD60
def_special sub_815EEB0
def_special sub_815EF5C
def_special sub_815F070
def_special sub_80CC974
def_special Special_PokemonLeagueLightingEffect
def_special sub_814EA7C
def_special sub_80CCB94
def_special sub_80CCCF8
def_special Special_CapeBrinkGetMoveToTeachLeadPokemon
def_special Special_HasLearnedAllMovesFromCapeBrinkTutor
def_special Special_Credits
def_special sub_8153810
def_special sub_809D764
def_special sub_809D8C0
def_special sub_8147500
def_special GetPlayerFacingDirection
def_special sub_80CCDFC
def_special sub_80CD008
def_special Special_DeoxysSound
def_special Special_SetDeoxysTriangleObjectPal
def_special sub_8147594
def_special sub_80CD034
def_special Special_BadEggInParty
def_special sub_815D834
def_special HasAllMons
def_special sub_80CD074
def_special sub_80CD098
def_special Special_PlayerIsNotInTrainerTowerLobby
def_special Special_BrailleCursorToggle
def_special sub_811B15C
def_special sub_80CD0F4
def_special Special_PlayerPartyContainsSpeciesWithPlayerID
def_special sub_809C4A8
def_special sub_81537C0
def_special sub_809C5FC
def_special sub_80CB328
def_special Special_InitElevatorFloorSelectMenuPos
def_special Special_ComputeLoreleiDollCollection
def_special sub_80CD1B4
def_special Special_LoopWingFlapSound
def_special CreateObedientEnemyMon
gSpecialsEnd::
+1 -1
View File
@@ -1394,7 +1394,7 @@ gUnknown_8417920:: @ 0x8417920
gUnknown_8417926:: @ 0x8417926
.string "OK$"
gUnknown_8417929:: @ 0x8417929
gOtherText_Quit:: @ 0x8417929
.string "QUIT$"
gUnknown_841792E:: @ 0x841792E