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

Remaining story flags referenced in event scripts

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 09:58:14 -04:00
parent 3ab70c735e
commit a1bddb8f8c
40 changed files with 410 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_specials.s
+5 -3
View File
@@ -5616,8 +5616,10 @@ _080CD14C:
bx r1
thumb_func_end sub_80CD0F4
thumb_func_start sub_80CD154
sub_80CD154: @ 80CD154
@ Determines which of Lorelei's doll collection to show
@ based on how many times you've entered the Hall of Fame.
thumb_func_start Special_ComputeLoreleiDollCollection
Special_ComputeLoreleiDollCollection: @ 80CD154
push {r4,lr}
movs r0, 0xA
bl GetGameStat
@@ -5664,7 +5666,7 @@ _080CD1AE:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80CD154
thumb_func_end Special_ComputeLoreleiDollCollection
thumb_func_start sub_80CD1B4
sub_80CD1B4: @ 80CD1B4
asm/party_menu.s
+2 -2
View File
@@ -4345,7 +4345,7 @@ _08120BD0:
lsls r0, 1
b _08120BDE
_08120BD6:
ldr r0, _08120BE4 @ =gUnknown_8459B60
ldr r0, _08120BE4 @ =gMoveTutorMoves
lsls r1, 1
adds r1, r0
ldrh r0, [r1]
@@ -4353,7 +4353,7 @@ _08120BDE:
pop {r1}
bx r1
.align 2, 0
_08120BE4: .4byte gUnknown_8459B60
_08120BE4: .4byte gMoveTutorMoves
thumb_func_end sub_8120BA8
thumb_func_start sub_8120BE8
data/data_83FECCC.s
+17 -2
View File
@@ -1,5 +1,6 @@
#include "constants/region_map.h"
#include "constants/flags.h"
#include "constants/moves.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@@ -1089,8 +1090,22 @@ gUnknown_8459B30:: @ 8459B30
gUnknown_8459B48:: @ 8459B48
.incbin "baserom.gba", 0x459B48, 0x18
gUnknown_8459B60:: @ 8459B60
.incbin "baserom.gba", 0x459B60, 0x1E
gMoveTutorMoves:: @ 8459B60
.2byte MOVE_MEGA_PUNCH
.2byte MOVE_SWORDS_DANCE
.2byte MOVE_MEGA_KICK
.2byte MOVE_BODY_SLAM
.2byte MOVE_DOUBLE_EDGE
.2byte MOVE_COUNTER
.2byte MOVE_SEISMIC_TOSS
.2byte MOVE_MIMIC
.2byte MOVE_METRONOME
.2byte MOVE_SOFT_BOILED
.2byte MOVE_DREAM_EATER
.2byte MOVE_THUNDER_WAVE
.2byte MOVE_EXPLOSION
.2byte MOVE_ROCK_SLIDE
.2byte MOVE_SUBSTITUTE
gUnknown_8459B7E:: @ 8459B7E
.incbin "baserom.gba", 0x459B7E, 0x33A
data/event_scripts.s
+57 -57
View File
@@ -1559,9 +1559,9 @@ EventScript_1A653B:: @ 81A653B
return
EventScript_1A6541:: @ 81A6541
clearflag FLAG_0x2F5
clearflag FLAG_0x2F6
clearflag FLAG_0x2F7
clearflag FLAG_LUGIA_FLEW_AWAY
clearflag FLAG_HO_OH_FLEW_AWAY
clearflag FLAG_DEOXYS_FLEW_AWAY
return
gUnknown_81A654B:: @ 81A654B
@@ -2008,9 +2008,9 @@ EventScript_1A6A7A:: @ 81A6A7A
msgbox Text_1A5C03, 5
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1A6AB2
setflag FLAG_0x2FF
setflag FLAG_OAKS_RATING_IS_VIA_PC
call EventScript_1A73E0
clearflag FLAG_0x2FF
clearflag FLAG_OAKS_RATING_IS_VIA_PC
goto EventScript_1A6AB2
end
@@ -2300,9 +2300,9 @@ EventScript_1A737B:: @ 81A737B
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
checkflag FLAG_0x2F4
checkflag FLAG_OAK_SAW_DEX_COMPLETION
call_if TRUE, EventScript_1A73A4
checkflag FLAG_0x2F4
checkflag FLAG_OAK_SAW_DEX_COMPLETION
call_if FALSE, EventScript_1A73AD
call EventScript_1A73E0
return
@@ -2347,7 +2347,7 @@ EventScript_1A73E0:: @ 81A73E0
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
msgbox Text_1A6CA3
checkflag FLAG_0x2FF
checkflag FLAG_OAKS_RATING_IS_VIA_PC
call_if FALSE, EventScript_1A746D
call EventScript_1A73B6
compare_var_to_value VAR_0x800A, 0
@@ -2376,7 +2376,7 @@ EventScript_1A7470:: @ 81A7470
end
EventScript_1A747E:: @ 81A747E
setflag FLAG_0x2F4
setflag FLAG_OAK_SAW_DEX_COMPLETION
msgbox Text_1A722F
goto EventScript_1A748F
end
@@ -9317,7 +9317,7 @@ EventScript_1BBBE6:: @ 81BBBE6
end
EventScript_1BBBE7:: @ 81BBBE7
checkflag FLAG_0x2BB
checkflag FLAG_GOT_POWDER_JAR
goto_if FALSE, EventScript_1BBC32
multichoice 0, 0, 47, 0
switch VAR_RESULT
@@ -13460,7 +13460,7 @@ Text_1C476A:: @ 81C476A
VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE
lock
faceplayer
checkflag FLAG_0x2C0
checkflag FLAG_TUTOR_DOUBLE_EDGE
goto_if TRUE, EventScript_1C480C
msgbox Text_1749F9, 5
compare_var_to_value VAR_RESULT, 0
@@ -13469,11 +13469,11 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4802
msgbox Text_174AE2
setvar VAR_0x8005, 4
setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4802
setflag FLAG_0x2C0
setflag FLAG_TUTOR_DOUBLE_EDGE
goto EventScript_1C480C
end
@@ -13490,7 +13490,7 @@ EventScript_1C480C:: @ 81C480C
EventScript_1C4816:: @ 81C4816
lock
faceplayer
checkflag FLAG_0x2C1
checkflag FLAG_TUTOR_THUNDER_WAVE
goto_if TRUE, EventScript_1C4874
msgbox Text_175711, 5
compare_var_to_value VAR_RESULT, 0
@@ -13499,11 +13499,11 @@ EventScript_1C4816:: @ 81C4816
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C486A
msgbox Text_1757C1
setvar VAR_0x8005, 11
setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C486A
setflag FLAG_0x2C1
setflag FLAG_TUTOR_THUNDER_WAVE
goto EventScript_1C4874
end
@@ -13520,7 +13520,7 @@ EventScript_1C4874:: @ 81C4874
RockTunnel_B1F_EventScript_1C487E:: @ 81C487E
lock
faceplayer
checkflag FLAG_0x2C2
checkflag FLAG_TUTOR_ROCK_SLIDE
goto_if TRUE, EventScript_1C48DC
msgbox Text_1799E0, 5
compare_var_to_value VAR_RESULT, 0
@@ -13529,11 +13529,11 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C48D2
msgbox Text_179AE1
setvar VAR_0x8005, 13
setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C48D2
setflag FLAG_0x2C2
setflag FLAG_TUTOR_ROCK_SLIDE
goto EventScript_1C48DC
end
@@ -13550,7 +13550,7 @@ EventScript_1C48DC:: @ 81C48DC
MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6
lock
faceplayer
checkflag FLAG_0x2C3
checkflag FLAG_TUTOR_EXPLOSION
goto_if TRUE, EventScript_1C4944
msgbox Text_17A642, 5
compare_var_to_value VAR_RESULT, 0
@@ -13559,11 +13559,11 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C493A
msgbox Text_17A717
setvar VAR_0x8005, 12
setvar VAR_0x8005, MOVETUTOR_EXPLOSION
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C493A
setflag FLAG_0x2C3
setflag FLAG_TUTOR_EXPLOSION
goto EventScript_1C4944
end
@@ -13580,7 +13580,7 @@ EventScript_1C4944:: @ 81C4944
Route4_EventScript_1C494E:: @ 81C494E
lock
faceplayer
checkflag FLAG_0x2C4
checkflag FLAG_TUTOR_META_PUNCH
goto_if TRUE, EventScript_1C49AC
msgbox Text_1839D5, 5
compare_var_to_value VAR_RESULT, 0
@@ -13589,11 +13589,11 @@ Route4_EventScript_1C494E:: @ 81C494E
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C49A2
msgbox Text_183ABF
setvar VAR_0x8005, 0
setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C49A2
setflag FLAG_0x2C4
setflag FLAG_TUTOR_META_PUNCH
goto EventScript_1C49AC
end
@@ -13610,7 +13610,7 @@ EventScript_1C49AC:: @ 81C49AC
Route4_EventScript_1C49B6:: @ 81C49B6
lock
faceplayer
checkflag FLAG_0x2C5
checkflag FLAG_TUTOR_MEGA_KICK
goto_if TRUE, EventScript_1C4A14
msgbox Text_183B74, 5
compare_var_to_value VAR_RESULT, 0
@@ -13619,11 +13619,11 @@ Route4_EventScript_1C49B6:: @ 81C49B6
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4A0A
msgbox Text_183C68
setvar VAR_0x8005, 2
setvar VAR_0x8005, MOVETUTOR_MEGA_KICK
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4A0A
setflag FLAG_0x2C5
setflag FLAG_TUTOR_MEGA_KICK
goto EventScript_1C4A14
end
@@ -13640,7 +13640,7 @@ EventScript_1C4A14:: @ 81C4A14
EventScript_1C4A1E:: @ 81C4A1E
lock
faceplayer
checkflag FLAG_0x2C6
checkflag FLAG_TUTOR_DREAM_EATER
goto_if TRUE, EventScript_1C4A7C
msgbox Text_17E316, 5
compare_var_to_value VAR_RESULT, 0
@@ -13649,11 +13649,11 @@ EventScript_1C4A1E:: @ 81C4A1E
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4A72
msgbox Text_17E3F1
setvar VAR_0x8005, 10
setvar VAR_0x8005, MOVETUTOR_DREAM_EATER
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4A72
setflag FLAG_0x2C6
setflag FLAG_TUTOR_DREAM_EATER
goto EventScript_1C4A7C
end
@@ -13670,7 +13670,7 @@ EventScript_1C4A7C:: @ 81C4A7C
EventScript_1C4A86:: @ 81C4A86
lock
faceplayer
checkflag FLAG_0x2C7
checkflag FLAG_TUTOR_SOFT_BOILED
goto_if TRUE, EventScript_1C4AE4
msgbox Text_180388, 5
compare_var_to_value VAR_RESULT, 0
@@ -13679,11 +13679,11 @@ EventScript_1C4A86:: @ 81C4A86
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4ADA
msgbox Text_180484
setvar VAR_0x8005, 9
setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4ADA
setflag FLAG_0x2C7
setflag FLAG_TUTOR_SOFT_BOILED
goto EventScript_1C4AE4
end
@@ -13700,7 +13700,7 @@ EventScript_1C4AE4:: @ 81C4AE4
FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE
lock
faceplayer
checkflag FLAG_0x2C8
checkflag FLAG_TUTOR_SUBSTITUTE
goto_if TRUE, EventScript_1C4B4C
msgbox Text_180948, 5
compare_var_to_value VAR_RESULT, 0
@@ -13709,11 +13709,11 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4B42
msgbox Text_180A57
setvar VAR_0x8005, 14
setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4B42
setflag FLAG_0x2C8
setflag FLAG_TUTOR_SUBSTITUTE
goto EventScript_1C4B4C
end
@@ -13730,7 +13730,7 @@ EventScript_1C4B4C:: @ 81C4B4C
SevenIsland_EventScript_1C4B56:: @ 81C4B56
lock
faceplayer
checkflag FLAG_0x2C9
checkflag FLAG_TUTOR_SWORDS_DANCE
goto_if TRUE, EventScript_1C4BB4
msgbox Text_182F01, 5
compare_var_to_value VAR_RESULT, 0
@@ -13739,11 +13739,11 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4BAA
msgbox Text_182FD9
setvar VAR_0x8005, 1
setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4BAA
setflag FLAG_0x2C9
setflag FLAG_TUTOR_SWORDS_DANCE
goto EventScript_1C4BB4
end
@@ -13760,7 +13760,7 @@ EventScript_1C4BB4:: @ 81C4BB4
PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE
lock
faceplayer
checkflag FLAG_0x2CA
checkflag FLAG_TUTOR_SEISMIC_TOSS
goto_if TRUE, EventScript_1C4C1C
msgbox Text_1909A3, 5
compare_var_to_value VAR_RESULT, 0
@@ -13769,11 +13769,11 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4C12
msgbox Text_190AD5
setvar VAR_0x8005, 6
setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4C12
setflag FLAG_0x2CA
setflag FLAG_TUTOR_SEISMIC_TOSS
goto EventScript_1C4C1C
end
@@ -13790,7 +13790,7 @@ EventScript_1C4C1C:: @ 81C4C1C
EventScript_1C4C26:: @ 81C4C26
lock
faceplayer
checkflag FLAG_0x2CB
checkflag FLAG_TUTOR_COUNTER
goto_if TRUE, EventScript_1C4C84
msgbox Text_195928, 5
compare_var_to_value VAR_RESULT, 0
@@ -13799,11 +13799,11 @@ EventScript_1C4C26:: @ 81C4C26
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4C7A
msgbox Text_195A08
setvar VAR_0x8005, 5
setvar VAR_0x8005, MOVETUTOR_COUNTER
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4C7A
setflag FLAG_0x2CB
setflag FLAG_TUTOR_COUNTER
goto EventScript_1C4C84
end
@@ -13820,7 +13820,7 @@ EventScript_1C4C84:: @ 81C4C84
EventScript_1C4C8E:: @ 81C4C8E
lock
faceplayer
checkflag FLAG_0x2CC
checkflag FLAG_TUTOR_METRONOME
goto_if TRUE, EventScript_1C4CEC
msgbox Text_19A137, 5
compare_var_to_value VAR_RESULT, 0
@@ -13829,11 +13829,11 @@ EventScript_1C4C8E:: @ 81C4C8E
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4CE2
msgbox Text_19A1EA
setvar VAR_0x8005, 8
setvar VAR_0x8005, MOVETUTOR_METRONOME
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4CE2
setflag FLAG_0x2CC
setflag FLAG_TUTOR_METRONOME
goto EventScript_1C4CEC
end
@@ -13848,7 +13848,7 @@ EventScript_1C4CEC:: @ 81C4CEC
end
EventScript_1C4CF6:: @ 81C4CF6
checkflag FLAG_0x2CD
checkflag FLAG_TUTOR_MIMIC
goto_if TRUE, EventScript_1C4D59
msgbox Text_19AD85, 5
compare_var_to_value VAR_RESULT, 0
@@ -13857,14 +13857,14 @@ EventScript_1C4CF6:: @ 81C4CF6
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4D4F
msgbox Text_19ADEE
setvar VAR_0x8005, 7
setvar VAR_0x8005, MOVETUTOR_MIMIC
call EventScript_1C4F30
lock
faceplayer
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4D4F
removeitem ITEM_POKE_DOLL, 1
setflag FLAG_0x2CD
setflag FLAG_TUTOR_MIMIC
goto EventScript_1C4D59
end
@@ -13893,7 +13893,7 @@ EventScript_1C4D7B:: @ 81C4D7B
FourIsland_House1_EventScript_1C4D84:: @ 81C4D84
lock
faceplayer
checkflag FLAG_0x2CE
checkflag FLAG_TUTOR_BODY_SLAM
goto_if TRUE, EventScript_1C4DE2
msgbox Text_1A3505, 5
compare_var_to_value VAR_RESULT, 0
@@ -13902,11 +13902,11 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4DD8
msgbox Text_1A35DA
setvar VAR_0x8005, 3
setvar VAR_0x8005, MOVETUTOR_BODY_SLAM
call EventScript_1C4F30
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4DD8
setflag FLAG_0x2CE
setflag FLAG_TUTOR_BODY_SLAM
goto EventScript_1C4DE2
end
@@ -13927,7 +13927,7 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
special sub_8112364
lock
faceplayer
checkflag FLAG_0x2E1
checkflag FLAG_LEARNED_MOVE_AT_CAPE_BRINK
goto_if TRUE, EventScript_1C4EA1
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_1C4E97
@@ -13983,7 +13983,7 @@ EventScript_1C4EAB:: @ 81C4EAB
EventScript_1C4ECD:: @ 81C4ECD
msgbox Text_1A48F3
setflag FLAG_0x2E1
setflag FLAG_LEARNED_MOVE_AT_CAPE_BRINK
release
end
data/layouts/layouts.json
+1 -1
View File
@@ -3620,7 +3620,7 @@
"blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin"
},
{
"id": "LAYOUT_UNUSED_LAYOUT_83453C0",
"id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2",
"name": "UnusedLayout_83453C0_Layout",
"width": 30,
"height": 7,
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -25,7 +25,7 @@ EventScript_16523C:: @ 816523C
return
EventScript_165243:: @ 8165243
checkflag FLAG_0x2F7
checkflag FLAG_DEOXYS_FLEW_AWAY
goto_if TRUE, EventScript_1A77A9
clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
clearflag FLAG_0x848
@@ -107,7 +107,7 @@ EventScript_1652C0:: @ 81652C0
end
EventScript_16533A:: @ 816533A
setflag FLAG_0x2F7
setflag FLAG_DEOXYS_FLEW_AWAY
setvar VAR_0x8004, SPECIES_DEOXYS
goto EventScript_1A9236
end
data/maps/CeladonCity_Condominiums_1F/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320
CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
lock
faceplayer
checkflag FLAG_0x2F8
checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
goto_if TRUE, EventScript_16C36A
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_16C374
@@ -26,7 +26,7 @@ EventScript_16C36A:: @ 816C36A
EventScript_16C374:: @ 816C374
famechecker FAMECHECKER_DAISY, 4
setflag FLAG_0x2F8
setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
msgbox gUnknown_8196188
release
end
data/maps/CeruleanCave_B1F/scripts.inc
+3 -3
View File
@@ -16,7 +16,7 @@ EventScript_1624D3:: @ 81624D3
return
CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7
checkflag FLAG_0x2BC
checkflag FLAG_FOUGHT_MEWTWO
call_if FALSE, EventScript_1624F1
end
@@ -51,12 +51,12 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
goto_if eq, EventScript_162561
compare_var_to_value VAR_RESULT, 5
goto_if eq, EventScript_162561
setflag FLAG_0x2BC
setflag FLAG_FOUGHT_MEWTWO
release
end
EventScript_162558:: @ 8162558
setflag FLAG_0x2BC
setflag FLAG_FOUGHT_MEWTWO
goto EventScript_1A922D
EventScript_162560:: @ 8162560
data/maps/CeruleanCity_House5/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F
CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
lock
faceplayer
checkflag FLAG_0x2BB
checkflag FLAG_GOT_POWDER_JAR
goto_if TRUE, EventScript_16AEB7
msgbox gUnknown_8192F67, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -12,7 +12,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
checkflag FLAG_0x847
goto_if FALSE, EventScript_16AEA3
msgbox gUnknown_8193003
setflag FLAG_0x2BB
setflag FLAG_GOT_POWDER_JAR
giveitem ITEM_POWDER_JAR
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
data/maps/FiveIsland_Meadow/scripts.inc
+4 -4
View File
@@ -3,22 +3,22 @@ FiveIsland_Meadow_MapScripts:: @ 8168932
.byte 0
FiveIsland_Meadow_MapScript1_168938:: @ 8168938
checkflag FLAG_0x2D6
checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE
call_if TRUE, EventScript_168983
end
FiveIsland_Meadow_EventScript_168942:: @ 8168942
lockall
checkflag FLAG_0x2D6
checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE
goto_if TRUE, EventScript_168979
checkflag FLAG_0x2D8
checkflag FLAG_LEARNED_YES_NAH_CHANSEY
goto_if TRUE, EventScript_16895F
msgbox gUnknown_818AB8E
releaseall
end
EventScript_16895F:: @ 816895F
setflag FLAG_0x2D6
setflag FLAG_UNLOCKED_ROCKET_WAREHOUSE
message Text_18ABF4
waitmessage
delay 60
data/maps/FiveIsland_MemorialPillar/scripts.inc
+3 -3
View File
@@ -5,7 +5,7 @@ FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3
lock
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168A18
checkflag FLAG_0x2D7
checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168A22
msgbox gUnknown_818B02E
closemessage
@@ -41,7 +41,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
lockall
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168B0B
checkflag FLAG_0x2D7
checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168B0B
msgbox gUnknown_818B095
checkitem ITEM_LEMONADE, 1
@@ -83,7 +83,7 @@ EventScript_168AE8:: @ 8168AE8
return
EventScript_168AFE:: @ 8168AFE
setflag FLAG_0x2D7
setflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
msgbox gUnknown_818B23E
releaseall
end
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+3 -3
View File
@@ -19,7 +19,7 @@ EventScript_163F47:: @ 8163F47
FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A
lockall
checkflag FLAG_0x2D5
checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE
goto_if TRUE, EventScript_163F6E
msgbox gUnknown_817B4E3
releaseall
@@ -56,7 +56,7 @@ EventScript_163FB7:: @ 8163FB7
EventScript_163FCD:: @ 8163FCD
msgbox gUnknown_817BC6C
setflag FLAG_0x2DC
setflag FLAG_RECOVERED_SAPPHIRE
giveitem ITEM_SAPPHIRE
release
end
@@ -90,7 +90,7 @@ EventScript_16402F:: @ 816402F
setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS
fadescreen 0
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
setflag FLAG_0x2D5
setflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE
release
end
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+6 -6
View File
@@ -8,9 +8,9 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
special sub_8112364
lock
faceplayer
checkflag FLAG_0x2DA
checkflag FLAG_GOT_TOGEPI_EGG
goto_if TRUE, EventScript_1688E3
checkflag FLAG_0x2DB
checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG
goto_if TRUE, EventScript_16892C
msgbox gUnknown_818A80D
specialvar VAR_RESULT, sub_80CA76C
@@ -35,7 +35,7 @@ EventScript_1688BA:: @ 81688BA
countpokemon
compare_var_to_value VAR_RESULT, 6
goto_if eq, EventScript_16891F
setflag FLAG_0x2DA
setflag FLAG_GOT_TOGEPI_EGG
giveegg SPECIES_TOGEPI
textcolor 3
playfanfare MUS_FANFA1
@@ -48,12 +48,12 @@ EventScript_1688BA:: @ 81688BA
EventScript_1688E3:: @ 81688E3
getspeciesname 1, SPECIES_TOGEPI
setvar VAR_0x8004, 175
setvar VAR_0x8004, SPECIES_TOGEPI
specialvar VAR_RESULT, sub_80CD0F4
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_168895
getspeciesname 1, SPECIES_TOGETIC
setvar VAR_0x8004, 176
setvar VAR_0x8004, SPECIES_TOGETIC
specialvar VAR_RESULT, sub_80CD0F4
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_168895
@@ -62,7 +62,7 @@ EventScript_1688E3:: @ 81688E3
end
EventScript_16891F:: @ 816891F
setflag FLAG_0x2DB
setflag FLAG_NO_ROOM_FOR_TOGEPI_EGG
msgbox gUnknown_818A940
release
end
data/maps/FourIsland_LoreleisHouse/scripts.inc
+4 -4
View File
@@ -3,22 +3,22 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E
.byte 0
FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54
special sub_80CD154
special Special_ComputeLoreleiDollCollection
end
FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58
lock
faceplayer
checkflag FLAG_0x2D4
checkflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE
goto_if TRUE, EventScript_171C83
checkflag FLAG_0x2D5
checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE
goto_if TRUE, EventScript_171C76
msgbox gUnknown_81A3826
release
end
EventScript_171C76:: @ 8171C76
setflag FLAG_0x2D4
setflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE
msgbox gUnknown_81A390C
release
end
data/maps/MtEmber_RubyPath_B3F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49
MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49
lock
faceplayer
setflag FLAG_0x2DD
setflag FLAG_GOT_RUBY
removeobject 1
additem ITEM_RUBY, 1
giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5
data/maps/MtEmber_Summit/scripts.inc
+3 -3
View File
@@ -16,7 +16,7 @@ EventScript_163B11:: @ 8163B11
return
MtEmber_Summit_MapScript1_163B25:: @ 8163B25
checkflag FLAG_0x2BD
checkflag FLAG_FOUGHT_MOLTRES
call_if FALSE, EventScript_163B2F
end
@@ -51,12 +51,12 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
goto_if eq, EventScript_163B9F
compare_var_to_value VAR_RESULT, 5
goto_if eq, EventScript_163B9F
setflag FLAG_0x2BD
setflag FLAG_FOUGHT_MOLTRES
release
end
EventScript_163B96:: @ 8163B96
setflag FLAG_0x2BD
setflag FLAG_FOUGHT_MOLTRES
goto EventScript_1A922D
end
data/maps/NavelRock_Base/scripts.inc
+2 -2
View File
@@ -15,7 +15,7 @@ EventScript_165105:: @ 8165105
return
EventScript_165109:: @ 8165109
checkflag FLAG_0x2F5
checkflag FLAG_LUGIA_FLEW_AWAY
goto_if TRUE, EventScript_1A77A9
clearflag FLAG_HIDE_LUGIA
return
@@ -80,7 +80,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
end
EventScript_1651D9:: @ 81651D9
setflag FLAG_0x2F5
setflag FLAG_LUGIA_FLEW_AWAY
setvar VAR_0x8004, SPECIES_LUGIA
goto EventScript_1A9236
end
data/maps/NavelRock_Summit/scripts.inc
+2 -2
View File
@@ -17,7 +17,7 @@ EventScript_164FBD:: @ 8164FBD
EventScript_164FC6:: @ 8164FC6
setvar VAR_0x4001, 1
checkflag FLAG_0x2F6
checkflag FLAG_HO_OH_FLEW_AWAY
goto_if TRUE, EventScript_1A77A9
setvar VAR_0x4001, 0
clearflag FLAG_HIDE_HO_OH
@@ -85,7 +85,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
end
EventScript_1650B4:: @ 81650B4
setflag FLAG_0x2F6
setflag FLAG_HO_OH_FLEW_AWAY
setvar VAR_0x8004, SPECIES_HO_OH
goto EventScript_1A9236
end
data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+2 -2
View File
@@ -28,11 +28,11 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380
OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399
lock
faceplayer
checkflag FLAG_0x2EF
checkflag FLAG_GOT_HM06
goto_if TRUE, EventScript_1653C5
msgbox gUnknown_817D622
giveitem ITEM_HM06
setflag FLAG_0x2EF
setflag FLAG_GOT_HM06
msgbox gUnknown_817D6F3
release
end
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -212,11 +212,11 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
goto_if eq, EventScript_170F35
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
goto_if eq, EventScript_170F9B
checkflag FLAG_0x2DC
checkflag FLAG_RECOVERED_SAPPHIRE
goto_if TRUE, EventScript_170FA5
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if eq, EventScript_17103A
checkflag FLAG_0x2DD
checkflag FLAG_GOT_RUBY
goto_if TRUE, EventScript_171044
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if eq, EventScript_1710F2
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E
.byte 0
PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E
setflag FLAG_0x2CF
setflag FLAG_VISITED_OAKS_LAB
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
call_if eq, EventScript_168FC6
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
@@ -846,7 +846,7 @@ EventScript_1698D6:: @ 81698D6
EventScript_169903:: @ 8169903
call EventScript_1A737B
checkflag FLAG_0x2F4
checkflag FLAG_OAK_SAW_DEX_COMPLETION
goto_if TRUE, EventScript_169913
release
end
data/maps/PowerPlant/map.json
+2 -2
View File
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_16388D",
"flag": "FLAG_HIDE_POWER_PLANT_VOLTORB_2"
"flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_16382F",
"flag": "FLAG_HIDE_POWER_PLANT_VOLTORB_1"
"flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_1"
}
],
"warp_events": [
data/maps/PowerPlant/scripts.inc
+11 -11
View File
@@ -17,11 +17,11 @@ EventScript_163779:: @ 8163779
PowerPlant_MapScript2_16378D:: @ 816378D
setworldmapflag FLAG_WORLD_MAP_POWER_PLANT
checkflag FLAG_0x2BF
checkflag FLAG_FOUGHT_ZAPDOS
call_if FALSE, EventScript_1637AC
checkflag FLAG_0x2D0
checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
call_if FALSE, EventScript_1637B0
checkflag FLAG_0x2D1
checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
call_if FALSE, EventScript_1637B4
end
@@ -30,11 +30,11 @@ EventScript_1637AC:: @ 81637AC
return
EventScript_1637B0:: @ 81637B0
clearflag FLAG_HIDE_POWER_PLANT_VOLTORB_1
clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_1
return
EventScript_1637B4:: @ 81637B4
clearflag FLAG_HIDE_POWER_PLANT_VOLTORB_2
clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_2
return
PowerPlant_EventScript_1637B8:: @ 81637B8
@@ -64,12 +64,12 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
goto_if eq, EventScript_163824
compare_var_to_value VAR_RESULT, 5
goto_if eq, EventScript_163824
setflag FLAG_0x2BF
setflag FLAG_FOUGHT_ZAPDOS
release
end
EventScript_16381B:: @ 816381B
setflag FLAG_0x2BF
setflag FLAG_FOUGHT_ZAPDOS
goto EventScript_1A922D
end
@@ -100,12 +100,12 @@ PowerPlant_EventScript_16382F:: @ 816382F
goto_if eq, EventScript_163884
compare_var_to_value VAR_RESULT, 5
goto_if eq, EventScript_163884
setflag FLAG_0x2D0
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
release
end
EventScript_163884:: @ 8163884
setflag FLAG_0x2D0
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
goto EventScript_1A922D
end
@@ -131,11 +131,11 @@ PowerPlant_EventScript_16388D:: @ 816388D
goto_if eq, EventScript_1638E2
compare_var_to_value VAR_RESULT, 5
goto_if eq, EventScript_1638E2
setflag FLAG_0x2D1
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
release
end
EventScript_1638E2:: @ 81638E2
setflag FLAG_0x2D1
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
goto EventScript_1A922D
end
data/maps/Route10_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -31,7 +31,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
lock
faceplayer
call EventScript_16FCF1
checkflag FLAG_0x2FA
checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
goto_if TRUE, EventScript_16FCE7
msgbox gUnknown_819E5FB, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -48,7 +48,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
goto_if eq, EventScript_1A7AC7
additem ITEM_EVERSTONE, 1
giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE
setflag FLAG_0x2FA
setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
msgbox gUnknown_819E7AF
release
end
data/maps/Route16_NorthEntrance_2F/scripts.inc
+2 -2
View File
@@ -21,7 +21,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
lock
faceplayer
call EventScript_17036F
checkflag FLAG_0x2FD
checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
goto_if TRUE, EventScript_170365
msgbox gUnknown_819FB0E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -38,7 +38,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
goto_if eq, EventScript_1A7AC7
additem ITEM_AMULET_COIN, 1
giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN
setflag FLAG_0x2FD
setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
msgbox gUnknown_819FC93
release
end
data/maps/Route20/scripts.inc
+2 -2
View File
@@ -3,9 +3,9 @@ Route20_MapScripts:: @ 816823B
.byte 0
Route20_MapScript1_168241:: @ 8168241
checkflag FLAG_0x2D2
checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
call_if FALSE, EventScript_168254
checkflag FLAG_0x2D3
checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
call_if FALSE, EventScript_16826D
end
data/maps/SeafoamIslands_B3F/scripts.inc
+3 -3
View File
@@ -4,9 +4,9 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F
.byte 0
SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A
checkflag FLAG_0x2D2
checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
call_if FALSE, EventScript_162F6D
checkflag FLAG_0x2D2
checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
call_if TRUE, EventScript_162F94
end
@@ -21,7 +21,7 @@ EventScript_162F6D:: @ 8162F6D
return
EventScript_162F90:: @ 8162F90
setflag FLAG_0x2D2
setflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
return
EventScript_162F94:: @ 8162F94
data/maps/SeafoamIslands_B4F/scripts.inc
+6 -6
View File
@@ -19,11 +19,11 @@ EventScript_163052:: @ 8163052
return
SeafoamIslands_B4F_MapScript1_163066:: @ 8163066
checkflag FLAG_0x2BE
checkflag FLAG_FOUGHT_ARTICUNO
call_if FALSE, EventScript_1630AD
checkflag FLAG_0x2D3
checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
call_if FALSE, EventScript_163082
checkflag FLAG_0x2D3
checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
call_if TRUE, EventScript_1630A9
end
@@ -38,7 +38,7 @@ EventScript_163082:: @ 8163082
return
EventScript_1630A5:: @ 81630A5
setflag FLAG_0x2D3
setflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
return
EventScript_1630A9:: @ 81630A9
@@ -189,12 +189,12 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
goto_if eq, EventScript_163218
compare_var_to_value VAR_RESULT, 5
goto_if eq, EventScript_163218
setflag FLAG_0x2BE
setflag FLAG_FOUGHT_ARTICUNO
release
end
EventScript_16320F:: @ 816320F
setflag FLAG_0x2BE
setflag FLAG_FOUGHT_ARTICUNO
goto EventScript_1A922D
EventScript_163217:: @ 8163217
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+1 -1
View File
@@ -71,7 +71,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
playse SE_KAIDAN
delay 35
removeobject 2
setflag FLAG_0x2D8
setflag FLAG_LEARNED_YES_NAH_CHANSEY
release
end
data/maps/SixIsland_RuinValley/scripts.inc
+2 -2
View File
@@ -3,7 +3,7 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53
.byte 0
SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59
checkflag FLAG_0x2E3
checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE
call_if TRUE, EventScript_168B63
end
@@ -24,7 +24,7 @@ SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D
SixIsland_RuinValley_EventScript_168B94:: @ 8168B94
lockall
checkflag FLAG_0x2E3
checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE
goto_if TRUE, EventScript_168BC1
msgbox gUnknown_818BDC0, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
data/maps/SixIsland_WaterPath_House1/scripts.inc
+4 -4
View File
@@ -46,21 +46,21 @@ EventScript_1720F1:: @ 81720F1
end
EventScript_1720FB:: @ 81720FB
checkflag FLAG_0x2D9
checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1
goto_if FALSE, EventScript_172121
msgbox gUnknown_81A4B7A
release
end
EventScript_17210E:: @ 817210E
checkflag FLAG_0x2D9
checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1
goto_if FALSE, EventScript_172121
msgbox gUnknown_81A4B39
release
end
EventScript_172121:: @ 8172121
setflag FLAG_0x2D9
setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1
msgbox gUnknown_81A4A88
giveitem ITEM_NEST_BALL
compare_var_to_value VAR_RESULT, 0
@@ -76,7 +76,7 @@ EventScript_17214D:: @ 817214D
SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157
lockall
checkflag FLAG_0x2D9
checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1
goto_if TRUE, EventScript_17216B
msgbox gUnknown_81A4CB9
releaseall
data/maps/ThreeIsland/scripts.inc
+2 -2
View File
@@ -28,7 +28,7 @@ ThreeIsland_EventScript_1677D8:: @ 81677D8
ThreeIsland_EventScript_1677E5:: @ 81677E5
lock
checkflag FLAG_0x2FC
checkflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER
goto_if TRUE, EventScript_167806
compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4
goto_if eq, EventScript_16781A
@@ -53,7 +53,7 @@ EventScript_16781A:: @ 816781A
goto_if eq, EventScript_167865
giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE
additem ITEM_FULL_RESTORE, 1
setflag FLAG_0x2FC
setflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER
msgbox gUnknown_81827F1
release
end
data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
+3 -3
View File
@@ -13,7 +13,7 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C
end
EventScript_164D50:: @ 8164D50
setmaplayoutindex LAYOUT_UNUSED_LAYOUT_83453C0
setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2
return
EventScript_164D54:: @ 8164D54
@@ -24,7 +24,7 @@ EventScript_164D54:: @ 8164D54
ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60
lock
faceplayer
checkflag FLAG_0x2E2
checkflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL
goto_if TRUE, EventScript_164DC2
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare_var_to_value VAR_RESULT, 1
@@ -41,7 +41,7 @@ EventScript_164D90:: @ 8164D90
giveitem ITEM_NUGGET
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_164DB8
setflag FLAG_0x2E2
setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL
goto EventScript_164DC2
end
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+5 -5
View File
@@ -6,7 +6,7 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
.byte 0
TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5
checkflag FLAG_0x2FB
checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER
call_if TRUE, EventScript_1713EF
end
@@ -143,7 +143,7 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F
faceplayer
compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
goto_if eq, EventScript_1BC0CE
checkflag FLAG_0x2FB
checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER
goto_if TRUE, EventScript_1715F5
compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
goto_if eq, EventScript_17158A
@@ -152,7 +152,7 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F
end
EventScript_17158A:: @ 817158A
checkflag FLAG_0x2FE
checkflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE
goto_if TRUE, EventScript_1715C4
msgbox gUnknown_81A296A
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
@@ -172,7 +172,7 @@ EventScript_1715C4:: @ 81715C4
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1715FF
additem ITEM_MOON_STONE, 1
setflag FLAG_0x2FB
setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER
giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE
release
end
@@ -183,7 +183,7 @@ EventScript_1715F5:: @ 81715F5
end
EventScript_1715FF:: @ 81715FF
setflag FLAG_0x2FE
setflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE
msgbox gUnknown_81A2ACA
release
end
data/maps/VermilionCity/scripts.inc
+8 -8
View File
@@ -22,7 +22,7 @@ Movement_166903:: @ 8166903
VermilionCity_MapScript1_166906:: @ 8166906
setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY
checkflag FLAG_0x2F9
checkflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION
call_if TRUE, EventScript_166913
end
@@ -106,7 +106,7 @@ EventScript_1669FD:: @ 81669FD
call EventScript_166977
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_166AB1
checkflag FLAG_0x2F0
checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN
call_if FALSE, EventScript_166A53
message Text_17FCC1
waitmessage
@@ -119,12 +119,12 @@ EventScript_1669FD:: @ 81669FD
end
EventScript_166A53:: @ 8166A53
setflag FLAG_0x2F0
setflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN
msgbox gUnknown_817FC00
return
EventScript_166A5F:: @ 8166A5F
checkflag FLAG_0x2F1
checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN
call_if FALSE, EventScript_166AA5
message Text_17FCC1
waitmessage
@@ -137,14 +137,14 @@ EventScript_166A5F:: @ 8166A5F
end
EventScript_166AA5:: @ 8166AA5
setflag FLAG_0x2F1
setflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN
msgbox gUnknown_817FC5F
return
EventScript_166AB1:: @ 8166AB1
checkflag FLAG_0x2F0
checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN
call_if FALSE, EventScript_166A53
checkflag FLAG_0x2F1
checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN
call_if FALSE, EventScript_166AA5
message Text_17FCC1
waitmessage
@@ -243,7 +243,7 @@ VermilionCity_EventScript_166C17:: @ 8166C17
VermilionCity_EventScript_166C20:: @ 8166C20
lock
faceplayer
setflag FLAG_0x2F9
setflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION
msgbox gUnknown_817FDD2
release
end
data/specials.inc
+1 -1
View File
@@ -450,7 +450,7 @@ gSpecials:: @ 815FD60
def_special sub_81537C0
def_special sub_809C5FC
def_special sub_80CB328
def_special sub_80CD154
def_special Special_ComputeLoreleiDollCollection
def_special sub_80CD1B4
def_special CreateObedientEnemyMon
gSpecialsEnd::
include/constants/flags.h
+212 -212
View File
@@ -138,8 +138,8 @@
#define FLAG_HIDE_ARTICUNO 0x082
#define FLAG_HIDE_TOWER_ROCKET_2 0x083
#define FLAG_HIDE_TOWER_ROCKET_3 0x084
#define FLAG_HIDE_POWER_PLANT_VOLTORB_1 0x085
#define FLAG_HIDE_POWER_PLANT_VOLTORB_2 0x086
#define FLAG_HIDE_POWER_PLANT_ELECTRODE_1 0x085
#define FLAG_HIDE_POWER_PLANT_ELECTRODE_2 0x086
#define FLAG_HIDE_SS_ANNE 0x087
#define FLAG_HIDE_FIVE_ISLAND_ROCKETS 0x088
#define FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS 0x089
@@ -573,214 +573,214 @@
#define FLAG_0x22F 0x22F
// Story flags
#define FLAG_GOT_POTION_ON_ROUTE_1 0x230
#define FLAG_GOT_TM34_FROM_SURGE 0x231
#define FLAG_GOT_FOSSIL_FROM_MT_MOON 0x232
#define FLAG_HELPED_BILL_IN_SEA_COTTAGE 0x233
#define FLAG_GOT_SS_TICKET 0x234
#define FLAG_GOT_SS_TICKET_DUP 0x235
#define FLAG_GOT_TM42_AT_MEMORIAL_PILLAR 0x236
#define FLAG_GOT_HM01 0x237
#define FLAG_GOT_HM02 0x238
#define FLAG_GOT_HM03 0x239
#define FLAG_GOT_HM04 0x23A
#define FLAG_GOT_HM05 0x23B
#define FLAG_RESCUED_MR_FUJI 0x23C
#define FLAG_GOT_POKE_FLUTE 0x23D
#define FLAG_0x23E 0x23E
#define FLAG_GOT_TM28_FROM_ROCKET 0x23F
#define FLAG_GOT_OLD_ROD 0x240
#define FLAG_GOT_BIKE_VOUCHER 0x241
#define FLAG_0x242 0x242
#define FLAG_GOT_COIN_CASE 0x243
#define FLAG_GOT_GOOD_ROD 0x244
#define FLAG_GOT_TM29_FROM_MR_PSYCHIC 0x245
#define FLAG_GOT_LAPRAS_FROM_SILPH 0x246
#define FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL 0x247
#define FLAG_DID_MIMIEN_TRADE 0x248
#define FLAG_BOUGHT_MAGIKARP 0x249
#define FLAG_DID_ZYNX_TRADE 0x24A
#define FLAG_DID_MS_NIDO_TRADE 0x24B
#define FLAG_0x24C 0x24C
#define FLAG_DID_CH_DING_TRADE 0x24D
#define FLAG_GOT_TM38_FROM_BLAINE 0x24E
#define FLAG_OAK_SKIP_22_RIVAL_CHECK 0x24F
#define FLAG_GOT_MASTER_BALL_FROM_SILPH 0x250
#define FLAG_DID_NINA_TRADE 0x251
#define FLAG_GOT_ITEMFINDER 0x252
#define FLAG_WOKE_UP_ROUTE_12_SNORLAX 0x253
#define FLAG_GOT_TM39_FROM_BROCK 0x254
#define FLAG_GOT_SUPER_ROD 0x255
#define FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE 0x256
#define FLAG_DID_MARC_TRADE 0x257
#define FLAG_BEAT_RIVAL_IN_OAKS_LAB 0x258
#define FLAG_GOT_TM06_FROM_KOGA 0x259
#define FLAG_0x25A 0x25A
#define FLAG_GOT_TM27 0x25B
#define FLAG_0x25C 0x25C
#define FLAG_0x25D 0x25D
#define FLAG_GOT_OLD_AMBER 0x25E
#define FLAG_0x25F 0x25F
#define FLAG_0x260 0x260
#define FLAG_0x261 0x261
#define FLAG_0x262 0x262
#define FLAG_GOT_EEVEE 0x263
#define FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES 0x264
#define FLAG_CINNABAR_GYM_QUIZ_1 0x265
#define FLAG_PENDING_DAYCARE_EGG 0x266
#define FLAG_CINNABAR_GYM_QUIZ_2 0x267
#define FLAG_CINNABAR_GYM_QUIZ_3 0x268
#define FLAG_CINNABAR_GYM_QUIZ_4 0x269
#define FLAG_CINNABAR_GYM_QUIZ_5 0x26A
#define FLAG_CINNABAR_GYM_QUIZ_6 0x26B
#define FLAG_POKEMON_MANSION_SWITCH_STATE 0x26C
#define FLAG_OPENED_ROCKET_HIDEOUT 0x26D
#define FLAG_GOT_10_COINS_FROM_GAMBLER 0x26E
#define FLAG_GOT_20_COINS_FROM_GAMBLER 0x26F
#define FLAG_GOT_20_COINS_FROM_GAMBLER_2 0x270
#define FLAG_GOT_BICYCLE 0x271
#define FLAG_GOT_DOME_FOSSIL 0x272
#define FLAG_GOT_HELIX_FOSSIL 0x273
#define FLAG_DID_ESPHERE_TRADE 0x274
#define FLAG_DID_TANGENY_TRADE 0x275
#define FLAG_DID_SEELOR_TRADE 0x276
#define FLAG_0x277 0x277
#define FLAG_GOT_HITMON_FROM_DOJO 0x278
#define FLAG_0x279 0x279
#define FLAG_SILPH_2F_DOOR_1 0x27A
#define FLAG_SILPH_2F_DOOR_2 0x27B
#define FLAG_SILPH_3F_DOOR_1 0x27C
#define FLAG_SILPH_3F_DOOR_2 0x27D
#define FLAG_SILPH_4F_DOOR_1 0x27E
#define FLAG_SILPH_4F_DOOR_2 0x27F
#define FLAG_SILPH_5F_DOOR_1 0x280
#define FLAG_SILPH_5F_DOOR_2 0x281
#define FLAG_SILPH_5F_DOOR_3 0x282
#define FLAG_SILPH_6F_DOOR 0x283
#define FLAG_SILPH_7F_DOOR_1 0x284
#define FLAG_SILPH_7F_DOOR_2 0x285
#define FLAG_SILPH_7F_DOOR_3 0x286
#define FLAG_SILPH_8F_DOOR 0x287
#define FLAG_SILPH_9F_DOOR_1 0x288
#define FLAG_SILPH_9F_DOOR_2 0x289
#define FLAG_SILPH_9F_DOOR_3 0x28A
#define FLAG_SILPH_9F_DOOR_4 0x28B
#define FLAG_SILPH_10F_DOOR 0x28C
#define FLAG_SILPH_11F_DOOR 0x28D
#define FLAG_0x28E 0x28E
#define FLAG_0x28F 0x28F
#define FLAG_MET_STICKER_LADY 0x290
#define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291
#define FLAG_GOT_VS_SEEKER 0x292
#define FLAG_GOT_TM19_FROM_ERIKA 0x293
#define FLAG_GOT_TM33_FROM_THIRSTY_GIRL 0x294
#define FLAG_GOT_TM20_FROM_THIRSTY_GIRL 0x295
#define FLAG_GOT_TM16_FROM_THIRSTY_GIRL 0x296
#define FLAG_GOT_TM03_FROM_MISTY 0x297
#define FLAG_GOT_TM26_FROM_GIOVANNI 0x298
#define FLAG_0x299 0x299
#define FLAG_GOT_TM04_FROM_SABRINA 0x29A
#define FLAG_GOT_FAME_CHECKER 0x29B
#define FLAG_GOT_RECORD_SETTING_MAGIKARP 0x29C
#define FLAG_TWO_ISLAND_SHOP_INTRODUCED 0x29D
#define FLAG_TWO_ISLAND_SHOP_EXPANDED_1 0x29E
#define FLAG_TWO_ISLAND_SHOP_EXPANDED_2 0x29F
#define FLAG_TWO_ISLAND_SHOP_EXPANDED_3 0x2A0
#define FLAG_SEVII_DETOUR_FINISHED 0x2A1
#define FLAG_VISITED_TWO_ISLAND 0x2A2
#define FLAG_RESCUED_LOSTELLE 0x2A3
#define FLAG_0x2A4 0x2A4
#define FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT 0x2A5
#define FLAG_GOT_TEA 0x2A6
#define FLAG_GOT_AURORA_TICKET 0x2A7
#define FLAG_GOT_MYSTIC_TICKET 0x2A8
#define FLAG_0x2A9 0x2A9
#define FLAG_0x2AA 0x2AA
#define FLAG_0x2AB 0x2AB
#define FLAG_0x2AC 0x2AC
#define FLAG_0x2AD 0x2AD
#define FLAG_0x2AE 0x2AE
#define FLAG_0x2AF 0x2AF
#define FLAG_0x2B0 0x2B0
#define FLAG_0x2B1 0x2B1
#define FLAG_0x2B2 0x2B2
#define FLAG_0x2B3 0x2B3
#define FLAG_0x2B4 0x2B4
#define FLAG_0x2B5 0x2B5
#define FLAG_0x2B6 0x2B6
#define FLAG_0x2B7 0x2B7
#define FLAG_0x2B8 0x2B8
#define FLAG_0x2B9 0x2B9
#define FLAG_0x2BA 0x2BA
#define FLAG_0x2BB 0x2BB
#define FLAG_0x2BC 0x2BC
#define FLAG_0x2BD 0x2BD
#define FLAG_0x2BE 0x2BE
#define FLAG_0x2BF 0x2BF
#define FLAG_0x2C0 0x2C0
#define FLAG_0x2C1 0x2C1
#define FLAG_0x2C2 0x2C2
#define FLAG_0x2C3 0x2C3
#define FLAG_0x2C4 0x2C4
#define FLAG_0x2C5 0x2C5
#define FLAG_0x2C6 0x2C6
#define FLAG_0x2C7 0x2C7
#define FLAG_0x2C8 0x2C8
#define FLAG_0x2C9 0x2C9
#define FLAG_0x2CA 0x2CA
#define FLAG_0x2CB 0x2CB
#define FLAG_0x2CC 0x2CC
#define FLAG_0x2CD 0x2CD
#define FLAG_0x2CE 0x2CE
#define FLAG_0x2CF 0x2CF
#define FLAG_0x2D0 0x2D0
#define FLAG_0x2D1 0x2D1
#define FLAG_0x2D2 0x2D2
#define FLAG_0x2D3 0x2D3
#define FLAG_0x2D4 0x2D4
#define FLAG_0x2D5 0x2D5
#define FLAG_0x2D6 0x2D6
#define FLAG_0x2D7 0x2D7
#define FLAG_0x2D8 0x2D8
#define FLAG_0x2D9 0x2D9
#define FLAG_0x2DA 0x2DA
#define FLAG_0x2DB 0x2DB
#define FLAG_0x2DC 0x2DC
#define FLAG_0x2DD 0x2DD
#define FLAG_0x2DE 0x2DE
#define FLAG_0x2DF 0x2DF
#define FLAG_0x2E0 0x2E0
#define FLAG_0x2E1 0x2E1
#define FLAG_0x2E2 0x2E2
#define FLAG_0x2E3 0x2E3
#define FLAG_FOUGHT_DEOXYS 0x2E4
#define FLAG_0x2E5 0x2E5
#define FLAG_0x2E6 0x2E6
#define FLAG_0x2E7 0x2E7
#define FLAG_0x2E8 0x2E8
#define FLAG_0x2E9 0x2E9
#define FLAG_0x2EA 0x2EA
#define FLAG_0x2EB 0x2EB
#define FLAG_REVIVED_DOME 0x2EC
#define FLAG_REVIVED_HELIX 0x2ED
#define FLAG_REVIVED_AMBER 0x2EE
#define FLAG_0x2EF 0x2EF
#define FLAG_0x2F0 0x2F0
#define FLAG_0x2F1 0x2F1
#define FLAG_FOUGHT_LUGIA 0x2F2
#define FLAG_FOUGHT_HO_OH 0x2F3
#define FLAG_0x2F4 0x2F4
#define FLAG_0x2F5 0x2F5
#define FLAG_0x2F6 0x2F6
#define FLAG_0x2F7 0x2F7
#define FLAG_0x2F8 0x2F8
#define FLAG_0x2F9 0x2F9
#define FLAG_0x2FA 0x2FA
#define FLAG_0x2FB 0x2FB
#define FLAG_0x2FC 0x2FC
#define FLAG_0x2FD 0x2FD
#define FLAG_0x2FE 0x2FE
#define FLAG_0x2FF 0x2FF
#define FLAG_GOT_POTION_ON_ROUTE_1 0x230
#define FLAG_GOT_TM34_FROM_SURGE 0x231
#define FLAG_GOT_FOSSIL_FROM_MT_MOON 0x232
#define FLAG_HELPED_BILL_IN_SEA_COTTAGE 0x233
#define FLAG_GOT_SS_TICKET 0x234
#define FLAG_GOT_SS_TICKET_DUP 0x235
#define FLAG_GOT_TM42_AT_MEMORIAL_PILLAR 0x236
#define FLAG_GOT_HM01 0x237
#define FLAG_GOT_HM02 0x238
#define FLAG_GOT_HM03 0x239
#define FLAG_GOT_HM04 0x23A
#define FLAG_GOT_HM05 0x23B
#define FLAG_RESCUED_MR_FUJI 0x23C
#define FLAG_GOT_POKE_FLUTE 0x23D
#define FLAG_0x23E 0x23E
#define FLAG_GOT_TM28_FROM_ROCKET 0x23F
#define FLAG_GOT_OLD_ROD 0x240
#define FLAG_GOT_BIKE_VOUCHER 0x241
#define FLAG_0x242 0x242
#define FLAG_GOT_COIN_CASE 0x243
#define FLAG_GOT_GOOD_ROD 0x244
#define FLAG_GOT_TM29_FROM_MR_PSYCHIC 0x245
#define FLAG_GOT_LAPRAS_FROM_SILPH 0x246
#define FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL 0x247
#define FLAG_DID_MIMIEN_TRADE 0x248
#define FLAG_BOUGHT_MAGIKARP 0x249
#define FLAG_DID_ZYNX_TRADE 0x24A
#define FLAG_DID_MS_NIDO_TRADE 0x24B
#define FLAG_0x24C 0x24C
#define FLAG_DID_CH_DING_TRADE 0x24D
#define FLAG_GOT_TM38_FROM_BLAINE 0x24E
#define FLAG_OAK_SKIP_22_RIVAL_CHECK 0x24F
#define FLAG_GOT_MASTER_BALL_FROM_SILPH 0x250
#define FLAG_DID_NINA_TRADE 0x251
#define FLAG_GOT_ITEMFINDER 0x252
#define FLAG_WOKE_UP_ROUTE_12_SNORLAX 0x253
#define FLAG_GOT_TM39_FROM_BROCK 0x254
#define FLAG_GOT_SUPER_ROD 0x255
#define FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE 0x256
#define FLAG_DID_MARC_TRADE 0x257
#define FLAG_BEAT_RIVAL_IN_OAKS_LAB 0x258
#define FLAG_GOT_TM06_FROM_KOGA 0x259
#define FLAG_0x25A 0x25A
#define FLAG_GOT_TM27 0x25B
#define FLAG_0x25C 0x25C
#define FLAG_0x25D 0x25D
#define FLAG_GOT_OLD_AMBER 0x25E
#define FLAG_0x25F 0x25F
#define FLAG_0x260 0x260
#define FLAG_0x261 0x261
#define FLAG_0x262 0x262
#define FLAG_GOT_EEVEE 0x263
#define FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES 0x264
#define FLAG_CINNABAR_GYM_QUIZ_1 0x265
#define FLAG_PENDING_DAYCARE_EGG 0x266
#define FLAG_CINNABAR_GYM_QUIZ_2 0x267
#define FLAG_CINNABAR_GYM_QUIZ_3 0x268
#define FLAG_CINNABAR_GYM_QUIZ_4 0x269
#define FLAG_CINNABAR_GYM_QUIZ_5 0x26A
#define FLAG_CINNABAR_GYM_QUIZ_6 0x26B
#define FLAG_POKEMON_MANSION_SWITCH_STATE 0x26C
#define FLAG_OPENED_ROCKET_HIDEOUT 0x26D
#define FLAG_GOT_10_COINS_FROM_GAMBLER 0x26E
#define FLAG_GOT_20_COINS_FROM_GAMBLER 0x26F
#define FLAG_GOT_20_COINS_FROM_GAMBLER_2 0x270
#define FLAG_GOT_BICYCLE 0x271
#define FLAG_GOT_DOME_FOSSIL 0x272
#define FLAG_GOT_HELIX_FOSSIL 0x273
#define FLAG_DID_ESPHERE_TRADE 0x274
#define FLAG_DID_TANGENY_TRADE 0x275
#define FLAG_DID_SEELOR_TRADE 0x276
#define FLAG_0x277 0x277
#define FLAG_GOT_HITMON_FROM_DOJO 0x278
#define FLAG_0x279 0x279
#define FLAG_SILPH_2F_DOOR_1 0x27A
#define FLAG_SILPH_2F_DOOR_2 0x27B
#define FLAG_SILPH_3F_DOOR_1 0x27C
#define FLAG_SILPH_3F_DOOR_2 0x27D
#define FLAG_SILPH_4F_DOOR_1 0x27E
#define FLAG_SILPH_4F_DOOR_2 0x27F
#define FLAG_SILPH_5F_DOOR_1 0x280
#define FLAG_SILPH_5F_DOOR_2 0x281
#define FLAG_SILPH_5F_DOOR_3 0x282
#define FLAG_SILPH_6F_DOOR 0x283
#define FLAG_SILPH_7F_DOOR_1 0x284
#define FLAG_SILPH_7F_DOOR_2 0x285
#define FLAG_SILPH_7F_DOOR_3 0x286
#define FLAG_SILPH_8F_DOOR 0x287
#define FLAG_SILPH_9F_DOOR_1 0x288
#define FLAG_SILPH_9F_DOOR_2 0x289
#define FLAG_SILPH_9F_DOOR_3 0x28A
#define FLAG_SILPH_9F_DOOR_4 0x28B
#define FLAG_SILPH_10F_DOOR 0x28C
#define FLAG_SILPH_11F_DOOR 0x28D
#define FLAG_0x28E 0x28E
#define FLAG_0x28F 0x28F
#define FLAG_MET_STICKER_LADY 0x290
#define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291
#define FLAG_GOT_VS_SEEKER 0x292
#define FLAG_GOT_TM19_FROM_ERIKA 0x293
#define FLAG_GOT_TM33_FROM_THIRSTY_GIRL 0x294
#define FLAG_GOT_TM20_FROM_THIRSTY_GIRL 0x295
#define FLAG_GOT_TM16_FROM_THIRSTY_GIRL 0x296
#define FLAG_GOT_TM03_FROM_MISTY 0x297
#define FLAG_GOT_TM26_FROM_GIOVANNI 0x298
#define FLAG_0x299 0x299
#define FLAG_GOT_TM04_FROM_SABRINA 0x29A
#define FLAG_GOT_FAME_CHECKER 0x29B
#define FLAG_GOT_RECORD_SETTING_MAGIKARP 0x29C
#define FLAG_TWO_ISLAND_SHOP_INTRODUCED 0x29D
#define FLAG_TWO_ISLAND_SHOP_EXPANDED_1 0x29E
#define FLAG_TWO_ISLAND_SHOP_EXPANDED_2 0x29F
#define FLAG_TWO_ISLAND_SHOP_EXPANDED_3 0x2A0
#define FLAG_SEVII_DETOUR_FINISHED 0x2A1
#define FLAG_VISITED_TWO_ISLAND 0x2A2
#define FLAG_RESCUED_LOSTELLE 0x2A3
#define FLAG_0x2A4 0x2A4
#define FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT 0x2A5
#define FLAG_GOT_TEA 0x2A6
#define FLAG_GOT_AURORA_TICKET 0x2A7
#define FLAG_GOT_MYSTIC_TICKET 0x2A8
#define FLAG_0x2A9 0x2A9
#define FLAG_0x2AA 0x2AA
#define FLAG_0x2AB 0x2AB
#define FLAG_0x2AC 0x2AC
#define FLAG_0x2AD 0x2AD
#define FLAG_0x2AE 0x2AE
#define FLAG_0x2AF 0x2AF
#define FLAG_0x2B0 0x2B0
#define FLAG_0x2B1 0x2B1
#define FLAG_0x2B2 0x2B2
#define FLAG_0x2B3 0x2B3
#define FLAG_0x2B4 0x2B4
#define FLAG_0x2B5 0x2B5
#define FLAG_0x2B6 0x2B6
#define FLAG_0x2B7 0x2B7
#define FLAG_0x2B8 0x2B8
#define FLAG_0x2B9 0x2B9
#define FLAG_0x2BA 0x2BA
#define FLAG_GOT_POWDER_JAR 0x2BB
#define FLAG_FOUGHT_MEWTWO 0x2BC
#define FLAG_FOUGHT_MOLTRES 0x2BD
#define FLAG_FOUGHT_ARTICUNO 0x2BE
#define FLAG_FOUGHT_ZAPDOS 0x2BF
#define FLAG_TUTOR_DOUBLE_EDGE 0x2C0
#define FLAG_TUTOR_THUNDER_WAVE 0x2C1
#define FLAG_TUTOR_ROCK_SLIDE 0x2C2
#define FLAG_TUTOR_EXPLOSION 0x2C3
#define FLAG_TUTOR_META_PUNCH 0x2C4
#define FLAG_TUTOR_MEGA_KICK 0x2C5
#define FLAG_TUTOR_DREAM_EATER 0x2C6
#define FLAG_TUTOR_SOFT_BOILED 0x2C7
#define FLAG_TUTOR_SUBSTITUTE 0x2C8
#define FLAG_TUTOR_SWORDS_DANCE 0x2C9
#define FLAG_TUTOR_SEISMIC_TOSS 0x2CA
#define FLAG_TUTOR_COUNTER 0x2CB
#define FLAG_TUTOR_METRONOME 0x2CC
#define FLAG_TUTOR_MIMIC 0x2CD
#define FLAG_TUTOR_BODY_SLAM 0x2CE
#define FLAG_VISITED_OAKS_LAB 0x2CF
#define FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 0x2D0
#define FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 0x2D1
#define FLAG_STOPPED_SEAFOAM_B3F_CURRENT 0x2D2
#define FLAG_STOPPED_SEAFOAM_B4F_CURRENT 0x2D3
#define FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE 0x2D4
#define FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE 0x2D5
#define FLAG_UNLOCKED_ROCKET_WAREHOUSE 0x2D6
#define FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR 0x2D7
#define FLAG_LEARNED_YES_NAH_CHANSEY 0x2D8
#define FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 0x2D9
#define FLAG_GOT_TOGEPI_EGG 0x2DA
#define FLAG_NO_ROOM_FOR_TOGEPI_EGG 0x2DB
#define FLAG_RECOVERED_SAPPHIRE 0x2DC
#define FLAG_GOT_RUBY 0x2DD
#define FLAG_0x2DE 0x2DE
#define FLAG_0x2DF 0x2DF
#define FLAG_0x2E0 0x2E0
#define FLAG_LEARNED_MOVE_AT_CAPE_BRINK 0x2E1
#define FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL 0x2E2
#define FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE 0x2E3
#define FLAG_FOUGHT_DEOXYS 0x2E4
#define FLAG_0x2E5 0x2E5
#define FLAG_0x2E6 0x2E6
#define FLAG_0x2E7 0x2E7
#define FLAG_0x2E8 0x2E8
#define FLAG_0x2E9 0x2E9
#define FLAG_0x2EA 0x2EA
#define FLAG_0x2EB 0x2EB
#define FLAG_REVIVED_DOME 0x2EC
#define FLAG_REVIVED_HELIX 0x2ED
#define FLAG_REVIVED_AMBER 0x2EE
#define FLAG_GOT_HM06 0x2EF
#define FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN 0x2F0
#define FLAG_SHOWED_AURORATICKET_TO_CAPTAIN 0x2F1
#define FLAG_FOUGHT_LUGIA 0x2F2
#define FLAG_FOUGHT_HO_OH 0x2F3
#define FLAG_OAK_SAW_DEX_COMPLETION 0x2F4
#define FLAG_LUGIA_FLEW_AWAY 0x2F5
#define FLAG_HO_OH_FLEW_AWAY 0x2F6
#define FLAG_DEOXYS_FLEW_AWAY 0x2F7
#define FLAG_TALKED_TO_TEA_LADY_AFTER_HOF 0x2F8
#define FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION 0x2F9
#define FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE 0x2FA
#define FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER 0x2FB
#define FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER 0x2FC
#define FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE 0x2FD
#define FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE 0x2FE
#define FLAG_OAKS_RATING_IS_VIA_PC 0x2FF
// Unused?
#define FLAG_0x300 0x300
@@ -1222,7 +1222,7 @@
#define FLAG_0x4AE 0x4AE
#define FLAG_0x4AF 0x4AF
// Boss clear flags
// Boss clear flags, 1200
#define FLAG_DEFEATED_BROCK 0x4B0
#define FLAG_DEFEATED_MISTY 0x4B1
#define FLAG_DEFEATED_LT_SURGE 0x4B2
@@ -1308,7 +1308,7 @@
#define FLAG_TRAINER_FLAG_START 0x500
#define TRAINERS_FLAG_NO 0x2E7
#define TRAINERS_FLAG_NO 0x2E7 // 743
#define TRAINER_FLAGS_WORDS 0x300
#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + TRAINER_FLAGS_WORDS) // 0x800
include/constants/layouts.h
+1 -1
View File
@@ -301,7 +301,7 @@
#define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316
#define LAYOUT_SIX_ISLAND_PATTERN_BUSH 317
#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318
#define LAYOUT_UNUSED_LAYOUT_83453C0 319
#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 319
#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320
#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1 321
#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2 322
include/constants/moves.h
+16
View File
@@ -361,4 +361,20 @@
#define MOVES_COUNT 355
#define MOVETUTOR_MEGA_PUNCH 0
#define MOVETUTOR_SWORDS_DANCE 1
#define MOVETUTOR_MEGA_KICK 2
#define MOVETUTOR_BODY_SLAM 3
#define MOVETUTOR_DOUBLE_EDGE 4
#define MOVETUTOR_COUNTER 5
#define MOVETUTOR_SEISMIC_TOSS 6
#define MOVETUTOR_MIMIC 7
#define MOVETUTOR_METRONOME 8
#define MOVETUTOR_SOFT_BOILED 9
#define MOVETUTOR_DREAM_EATER 10
#define MOVETUTOR_THUNDER_WAVE 11
#define MOVETUTOR_EXPLOSION 12
#define MOVETUTOR_ROCK_SLIDE 13
#define MOVETUTOR_SUBSTITUTE 14
#endif // GUARD_CONSTANTS_MOVES_H
src/help_system_812B1E0.c
+2 -2
View File
@@ -1150,7 +1150,7 @@ static bool8 sub_812B780(u8 id)
case 43:
return TRUE;
case 4:
return FlagGet(FLAG_0x2CF);
return FlagGet(FLAG_VISITED_OAKS_LAB);
case 6:
case 10:
case 16:
@@ -1351,7 +1351,7 @@ static bool8 sub_812BB10(void)
return TRUE;
if (FlagGet(FLAG_GOT_HM05) == TRUE)
return TRUE;
if (FlagGet(FLAG_0x2EF) == TRUE)
if (FlagGet(FLAG_GOT_HM06) == TRUE)
return TRUE;
if (FlagGet(FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07) == TRUE)
return TRUE;