diff options
Diffstat (limited to 'maps')
163 files changed, 2028 insertions, 820 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 73bb27e3c..dc30fa5be 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -9,7 +9,7 @@ AzaleaGym_MapScriptHeader: ; 0x18ec1c BugsyScript_0x18ec1e: ; 0x18ec1e faceplayer loadfont - checkbit1 $04be + checkbit1 EVENT_BEAT_BUGSY iftrue UnknownScript_0x18ec48 2writetext UnknownText_0x18ed0b closetext @@ -18,7 +18,7 @@ BugsyScript_0x18ec1e: ; 0x18ec1e loadtrainer BUGSY, 1 startbattle returnafterbattle - setbit1 $04be + setbit1 EVENT_BEAT_BUGSY loadfont 2writetext UnknownText_0x18ee14 playsound $009c @@ -27,17 +27,17 @@ BugsyScript_0x18ec1e: ; 0x18ec1e checkcode $7 2call UnknownScript_0x18ec73 UnknownScript_0x18ec48: ; 0x18ec48 - checkbit1 $0009 + checkbit1 EVENT_GOT_TM49_FURY_CUTTER iftrue UnknownScript_0x18ec6d - setbit1 $0464 - setbit1 $053c - setbit1 $053d - setbit1 $053e + setbit1 EVENT_BEAT_TWINS_AMY_AND_MAY + setbit1 EVENT_BEAT_BUG_CATCHER_BENNY + setbit1 EVENT_BEAT_BUG_CATCHER_AL + setbit1 EVENT_BEAT_BUG_CATCHER_JOSH 2writetext UnknownText_0x18ee2b keeptextopen verbosegiveitem TM_49, 1 iffalse UnknownScript_0x18ec71 - setbit1 $0009 + setbit1 EVENT_GOT_TM49_FURY_CUTTER 2writetext UnknownText_0x18eefa closetext loadmovesprites @@ -213,7 +213,7 @@ Bug_catcherJoshScript: ; 0x18ecde AzaleaGymGuyScript: ; 0x18ece6 faceplayer - checkbit1 $04be + checkbit1 EVENT_BEAT_BUGSY iftrue .AzaleaGymGuyWinScript loadfont 2writetext AzaleaGymGuyText diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 04eda0034..96c7ce25c 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -59,9 +59,9 @@ UnknownScript_0x198049: ; 0x198049 closetext loadmovesprites setbit1 $06bf - checkbit1 $001c + checkbit1 EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x198071 - checkbit1 $001d + checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x198081 winlosstext UnknownText_0x1981e6, UnknownText_0x19835b setlasttalked $b @@ -119,7 +119,7 @@ AzaleaRocketScript_0x1980ae: ; 0x1980ae GrampsScript_0x1980b1: ; 0x1980b1 faceplayer loadfont - checkbit1 $002b + checkbit1 EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x1980bf 2writetext UnknownText_0x19841b closetext diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index a1647dcfe..af1495f73 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -11,23 +11,23 @@ GrampsScript_0x189538: ; 0x189538 loadfont checkbit1 $0000 iftrue UnknownScript_0x1896ba - checkbit1 $0324 + checkbit1 EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1896c0 - checkbit1 $031a + checkbit1 EVENT_MET_BILLS_GRANDPA iftrue UnknownScript_0x189553 2writetext UnknownText_0x1896ce keeptextopen - setbit1 $031a + setbit1 EVENT_MET_BILLS_GRANDPA UnknownScript_0x189553: ; 0x189553 - checkbit1 $031f + checkbit1 EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA iftrue UnknownScript_0x189697 - checkbit1 $031e + checkbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA iftrue UnknownScript_0x189680 - checkbit1 $031d + checkbit1 EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA iftrue UnknownScript_0x189669 - checkbit1 $031c + checkbit1 EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA iftrue UnknownScript_0x189652 - checkbit1 $031b + checkbit1 EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA iftrue UnknownScript_0x18963b 2writetext UnknownText_0x1898c0 keeptextopen @@ -39,7 +39,7 @@ UnknownScript_0x189553: ; 0x189553 iffalse UnknownScript_0x1896aa if_not_equal LICKITUNG, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 $031b + setbit1 EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA 2jump UnknownScript_0x18963b ; 0x189592 @@ -54,7 +54,7 @@ UnknownScript_0x189592: ; 0x189592 iffalse UnknownScript_0x1896aa if_not_equal ODDISH, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 $031c + setbit1 EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA 2jump UnknownScript_0x189652 ; 0x1895b3 @@ -69,7 +69,7 @@ UnknownScript_0x1895b3: ; 0x1895b3 iffalse UnknownScript_0x1896aa if_not_equal STARYU, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 $031d + setbit1 EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA 2jump UnknownScript_0x189669 ; 0x1895d4 @@ -86,7 +86,7 @@ UnknownScript_0x1895d4: ; 0x1895d4 iffalse UnknownScript_0x1896aa if_not_equal GROWLITHE, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 $031e + setbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA 2jump UnknownScript_0x189680 ; 0x1895f9 @@ -101,7 +101,7 @@ UnknownScript_0x1895f9: ; 0x1895f9 iffalse UnknownScript_0x1896aa if_not_equal VULPIX, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 $031e + setbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA 2jump UnknownScript_0x189680 ; 0x18961a @@ -116,53 +116,53 @@ UnknownScript_0x18961a: ; 0x18961a iffalse UnknownScript_0x1896aa if_not_equal PICHU, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 $031f + setbit1 EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA 2jump UnknownScript_0x189697 ; 0x18963b UnknownScript_0x18963b: ; 0x18963b - checkbit1 $0320 + checkbit1 EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x189592 2call UnknownScript_0x1896b5 verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x1896cc - setbit1 $0320 + setbit1 EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA setbit1 $0000 loadmovesprites end ; 0x189652 UnknownScript_0x189652: ; 0x189652 - checkbit1 $0321 + checkbit1 EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1895b3 2call UnknownScript_0x1896b5 verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x1896cc - setbit1 $0321 + setbit1 EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA setbit1 $0000 loadmovesprites end ; 0x189669 UnknownScript_0x189669: ; 0x189669 - checkbit1 $0322 + checkbit1 EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1895d4 2call UnknownScript_0x1896b5 verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1896cc - setbit1 $0322 + setbit1 EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA setbit1 $0000 loadmovesprites end ; 0x189680 UnknownScript_0x189680: ; 0x189680 - checkbit1 $0323 + checkbit1 EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x18961a 2call UnknownScript_0x1896b5 verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1896cc - setbit1 $0323 + setbit1 EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA setbit1 $0000 loadmovesprites end @@ -172,7 +172,7 @@ UnknownScript_0x189697: ; 0x189697 2call UnknownScript_0x1896b5 verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1896cc - setbit1 $0324 + setbit1 EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA loadmovesprites end ; 0x1896a5 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index a366aed77..6b60c56fc 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -32,9 +32,9 @@ UnknownScript_0x1a46e5: ; 0x1a46e5 SuperNerdScript_0x1a46e8: ; 0x1a46e8 faceplayer loadfont - checkbit1 $04c4 + checkbit1 EVENT_BEAT_CLAIR iftrue UnknownScript_0x1a4702 - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a46fc 2writetext UnknownText_0x1a477a closetext @@ -67,7 +67,7 @@ GrampsScript_0x1a470b: ; 0x1a470b BlackBeltScript_0x1a470e: ; 0x1a470e faceplayer loadfont - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a471c 2writetext UnknownText_0x1a494a closetext @@ -97,21 +97,21 @@ CooltrainerFScript_0x1a4728: ; 0x1a4728 YoungsterScript_0x1a472b: ; 0x1a472b faceplayer loadfont - checkbit1 $006d + checkbit1 EVENT_GOT_SPELL_TAG_FROM_SANTOS iftrue UnknownScript_0x1a4759 checkcode $b if_not_equal SATURDAY, UnknownScript_0x1a475f - checkbit1 $006c + checkbit1 EVENT_MET_SANTOS_OF_SATURDAY iftrue UnknownScript_0x1a4746 2writetext UnknownText_0x1a4a27 keeptextopen - setbit1 $006c + setbit1 EVENT_MET_SANTOS_OF_SATURDAY UnknownScript_0x1a4746: ; 0x1a4746 2writetext UnknownText_0x1a4a57 keeptextopen verbosegiveitem SPELL_TAG, 1 iffalse UnknownScript_0x1a475d - setbit1 $006d + setbit1 EVENT_GOT_SPELL_TAG_FROM_SANTOS 2writetext UnknownText_0x1a4a6b closetext loadmovesprites diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index bcda61cf6..d86dde1bd 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -31,7 +31,7 @@ ClairScript_0x194e24: ; 0x194e24 loadfont checkbit2 $0022 iftrue UnknownScript_0x194e69 - checkbit1 $04c4 + checkbit1 EVENT_BEAT_CLAIR iftrue UnknownScript_0x194e63 2writetext UnknownText_0x194efa closetext @@ -40,16 +40,16 @@ ClairScript_0x194e24: ; 0x194e24 loadtrainer CLAIR, 1 startbattle returnafterbattle - setbit1 $04c4 + setbit1 EVENT_BEAT_CLAIR loadfont 2writetext UnknownText_0x19500e closetext loadmovesprites - setbit1 $054a - setbit1 $054b - setbit1 $054c - setbit1 $055d - setbit1 $055e + setbit1 EVENT_BEAT_COOLTRAINERM_PAUL + setbit1 EVENT_BEAT_COOLTRAINERM_CODY + setbit1 EVENT_BEAT_COOLTRAINERM_MIKE + setbit1 EVENT_BEAT_COOLTRAINERF_FRAN + setbit1 EVENT_BEAT_COOLTRAINERF_LOLA clearbit1 $0736 setbit1 $074c clearbit1 $074d @@ -64,7 +64,7 @@ UnknownScript_0x194e63: ; 0x194e63 ; 0x194e69 UnknownScript_0x194e69: ; 0x194e69 - checkbit1 $000f + checkbit1 EVENT_GOT_TM24_DRAGONBREATH iftrue UnknownScript_0x194e94 2writetext UnknownText_0x195196 keeptextopen @@ -75,7 +75,7 @@ UnknownScript_0x194e69: ; 0x194e69 playsound $0001 waitbutton itemnotify - setbit1 $000f + setbit1 EVENT_GOT_TM24_DRAGONBREATH 2writetext UnknownText_0x1951d1 keeptextopen 2jump UnknownScript_0x194e94 @@ -185,7 +185,7 @@ CooltrainerfLolaScript: ; 0x194ece BlackthornGymGuyScript: ; 0x194ed6 faceplayer loadfont - checkbit1 $04c4 + checkbit1 EVENT_BEAT_CLAIR iftrue .BlackthornGymGuyWinScript 2writetext BlackthornGymGuyText closetext diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9669b1090..261799f2d 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -24,11 +24,11 @@ UnknownScript_0x180997: ; 0x180997 ; 0x180998 UnknownScript_0x180998: ; 0x180998 - checkbit1 $030d + checkbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x1809a2 changeblock $4, $e, $2a UnknownScript_0x1809a2: ; 0x1809a2 - checkbit1 $030e + checkbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN iffalse UnknownScript_0x1809ac changeblock $4, $2, $16 UnknownScript_0x1809ac: ; 0x1809ac @@ -44,7 +44,7 @@ UnknownScript_0x1809ad: ; 0x1809ad reloadmappart loadmovesprites dotrigger $1 - setbit1 $030d + setbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitbutton end ; 0x1809c5 @@ -70,7 +70,7 @@ BrunoScript_0x1809c5: ; 0x1809c5 changeblock $4, $2, $16 reloadmappart loadmovesprites - setbit1 $030e + setbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN waitbutton end ; 0x1809f3 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index b15ead9d8..7d85aa5af 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -33,7 +33,7 @@ UnknownScript_0x185bf8: ; 0x185bf8 iftrue UnknownScript_0x185c02 changeblock $a, $8, $32 UnknownScript_0x185c02: ; 0x185c02 - checkbit1 $007b + checkbit1 EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x185c0c changeblock $6, $e, $9 UnknownScript_0x185c0c: ; 0x185c0c @@ -66,9 +66,9 @@ UnknownScript_0x185c25: ; 0x185c25 2writetext UnknownText_0x185cd9 closetext loadmovesprites - checkbit1 $001c + checkbit1 EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x185c60 - checkbit1 $001d + checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x185c70 winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c setlasttalked $4 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 9788884da..54645c58f 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x18615f: ; 0x18615f ; 0x186160 UnknownScript_0x186160: ; 0x186160 - checkbit1 $007b + checkbit1 EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x18616a changeblock $6, $e, $2 UnknownScript_0x18616a: ; 0x18616a @@ -80,11 +80,11 @@ UnknownScript_0x18616b: ; 0x18616b waitbutton special $003d dotrigger $1 - setbit1 $007b + setbit1 EVENT_RELEASED_THE_BEASTS special $0069 domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1 domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 - clearbit1 $07ae + clearbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY setbit1 $07a8 clearbit1 $07a9 setbit1 $0764 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index fa44d4a09..19beea7f3 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -92,7 +92,7 @@ MapCeladonCafeSignpost0Script: ; 0x730ad ; 0x730b0 MapCeladonCafeSignpost1Script: ; 0x730b0 - checkbit1 $00f9 + checkbit1 EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE iftrue UnknownScript_0x730db giveitem LEFTOVERS, $1 iffalse UnknownScript_0x730cd @@ -103,7 +103,7 @@ MapCeladonCafeSignpost1Script: ; 0x730b0 waitbutton itemnotify loadmovesprites - setbit1 $00f9 + setbit1 EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE end ; 0x730cd diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 12d01a398..8d5927f83 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -47,7 +47,7 @@ FishingGuruScript_0x72139: ; 0x72139 FisherScript_0x72144: ; 0x72144 faceplayer loadfont - checkbit1 $00ce + checkbit1 EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON iftrue .UnknownScript_0x72169 2writetext UnknownText_0x722dc keeptextopen @@ -58,7 +58,7 @@ FisherScript_0x72144: ; 0x72144 stringtotext .coinname, $1 2call .UnknownScript_0x72172 givecoins 18 - setbit1 $00ce + setbit1 EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON .UnknownScript_0x72169 ; 0x72169 2writetext UnknownText_0x72345 closetext diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 20fffeacf..1a2abe435 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -19,23 +19,23 @@ ErikaScript_0x72a6a: ; 0x72a6a startbattle returnafterbattle setbit1 $04c8 - setbit1 $051d - setbit1 $0490 - setbit1 $04ba - setbit1 $0468 + setbit1 EVENT_BEAT_LASS_MICHELLE + setbit1 EVENT_BEAT_PICNICKER_TANYA + setbit1 EVENT_BEAT_BEAUTY_JULIA + setbit1 EVENT_BEAT_TWINS_JO_AND_ZOE loadfont 2writetext UnknownText_0x72c96 playsound $009c waitbutton setbit2 $0026 UnknownScript_0x72a9b: ; 0x72a9b - checkbit1 $00dc + checkbit1 EVENT_GOT_TM19_GIGA_DRAIN iftrue UnknownScript_0x72aae 2writetext UnknownText_0x72cb0 keeptextopen verbosegiveitem TM_19, 1 iffalse UnknownScript_0x72aae - setbit1 $00dc + setbit1 EVENT_GOT_TM19_GIGA_DRAIN UnknownScript_0x72aae: ; 0x72aae 2writetext UnknownText_0x72d8f closetext diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 359ce3d4b..012f05e51 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -28,14 +28,14 @@ UnknownScript_0x7167e: ; 0x7167e 2writetext UnknownText_0x71763 closetext loadmovesprites - setbit1 $00d6 + setbit1 EVENT_ENABLE_DIPLOMA_PRINTING end ; 0x71696 GymGuyScript_0x71696: ; 0x71696 faceplayer loadfont - checkbit1 $00d6 + checkbit1 EVENT_ENABLE_DIPLOMA_PRINTING iftrue UnknownScript_0x716a4 2writetext UnknownText_0x717b4 closetext diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 49bdbd44c..a79e9a3bb 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -9,7 +9,7 @@ CeladonMansionRoofHouse_MapScriptHeader: ; 0x71afb PharmacistScript_0x71afd: ; 0x71afd faceplayer loadfont - checkbit1 $00da + checkbit1 EVENT_GOT_TM03_CURSE iftrue UnknownScript_0x71b21 2writetext UnknownText_0x71b27 keeptextopen @@ -26,7 +26,7 @@ UnknownScript_0x71b14: ; 0x71b14 keeptextopen verbosegiveitem TM_03, 1 iffalse UnknownScript_0x71b25 - setbit1 $00da + setbit1 EVENT_GOT_TM03_CURSE UnknownScript_0x71b21: ; 0x71b21 2writetext UnknownText_0x71db3 closetext diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 86a934390..b3d4dede2 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -18,7 +18,7 @@ UnknownScript_0x184005: ; 0x184005 CooltrainerMScript_0x184009: ; 0x184009 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184017 2writetext UnknownText_0x1840bc closetext @@ -72,9 +72,9 @@ CooltrainerFScript_0x18402a: ; 0x18402a FisherScript_0x18404a: ; 0x18404a faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184058 - checkbit1 $00cb + checkbit1 EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM iftrue UnknownScript_0x18405e UnknownScript_0x184058: ; 0x184058 2writetext UnknownText_0x18424e diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 907c75f98..319944032 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -42,7 +42,7 @@ UnknownScript_0x1883de: ; 0x1883de applymovement $2, MovementData_0x1884e8 playsound $0023 disappear $2 - setbit1 $00cb + setbit1 EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM clearbit1 $076c clearbit1 $076e dotrigger $0 @@ -68,10 +68,10 @@ MistyScript_0x188432: ; 0x188432 loadtrainer MISTY, 1 startbattle returnafterbattle - setbit1 $04c6 - setbit1 $03f9 - setbit1 $03fa - setbit1 $05a8 + setbit1 EVENT_BEAT_MISTY + setbit1 EVENT_BEAT_SWIMMERF_DIANA + setbit1 EVENT_BEAT_SWIMMERF_BRIANA + setbit1 EVENT_BEAT_SWIMMERM_PARKER loadfont 2writetext UnknownText_0x188768 playsound $009c @@ -174,7 +174,7 @@ SwimmermParkerScript: ; 0x18849a CeruleanGymGuyScript: ; 0x1884a2 faceplayer loadfont - checkbit1 $04c6 + checkbit1 EVENT_BEAT_MISTY iftrue .CeruleanGymGuyWinScript 2writetext CeruleanGymGuyText closetext diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index fa98ab51d..ef8f92b2a 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -9,9 +9,9 @@ CharcoalKiln_MapScriptHeader: ; 0x18dd18 BlackBeltScript_0x18dd1a: ; 0x18dd1a faceplayer loadfont - checkbit1 $0010 + checkbit1 EVENT_GOT_HM01_CUT iftrue UnknownScript_0x18dd34 - checkbit1 $002b + checkbit1 EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18dd2e 2writetext UnknownText_0x18dd74 closetext @@ -36,9 +36,9 @@ UnknownScript_0x18dd34: ; 0x18dd34 YoungsterScript_0x18dd3a: ; 0x18dd3a faceplayer loadfont - checkbit1 $005e + checkbit1 EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN iftrue UnknownScript_0x18dd5d - checkbit1 $0010 + checkbit1 EVENT_GOT_HM01_CUT iftrue UnknownScript_0x18dd4e 2writetext UnknownText_0x18dee0 closetext @@ -51,7 +51,7 @@ UnknownScript_0x18dd4e: ; 0x18dd4e keeptextopen verbosegiveitem CHARCOAL, 1 iffalse UnknownScript_0x18dd61 - setbit1 $005e + setbit1 EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN loadmovesprites end ; 0x18dd5d diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 2e31ffec3..884ca2eae 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -87,7 +87,7 @@ UnknownScript_0x19c01f: ; 0x19c01f applymovement $2, MovementData_0x19c1cb playsound $001f disappear $2 - clearbit1 $06ff + clearbit1 EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE waitbutton end @@ -123,9 +123,9 @@ UnknownScript_0x19c0ae: ; 0x19c0ae 2writetext UnknownText_0x19c4e2 closetext loadmovesprites - checkbit1 $001c + checkbit1 EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x19c0ee - checkbit1 $001d + checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x19c104 winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 setlasttalked $3 @@ -228,13 +228,13 @@ UnknownScript_0x19c168: ; 0x19c168 FisherScript_0x19c16e: ; 0x19c16e faceplayer loadfont - checkbit1 $004d + checkbit1 EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE iftrue UnknownScript_0x19c183 2writetext UnknownText_0x19c766 keeptextopen verbosegiveitem MYSTIC_WATER, 1 iffalse UnknownScript_0x19c187 - setbit1 $004d + setbit1 EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE UnknownScript_0x19c183: ; 0x19c183 2writetext UnknownText_0x19c7c1 closetext diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 03c8f821c..441dacd51 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -8,7 +8,7 @@ CherrygroveMart_MapScriptHeader: ; 0x196808 ClerkScript_0x19680a: ; 0x19680a loadfont - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196817 pokemart $0, $0000 loadmovesprites @@ -24,7 +24,7 @@ UnknownScript_0x196817: ; 0x196817 CooltrainerMScript_0x19681d: ; 0x19681d faceplayer loadfont - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x19682b 2writetext UnknownText_0x196834 closetext diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index dd3704143..368d5a146 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -21,7 +21,7 @@ GentlemanScript_0x196973: ; 0x196973 TeacherScript_0x196976: ; 0x196976 faceplayer loadfont - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196984 2writetext UnknownText_0x1969f1 closetext diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 9662b256d..527be1bf1 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -45,7 +45,7 @@ UnknownScript_0x1a001e: ; 0x1a001e disappear $d pause 10 dotrigger $0 - clearbit1 $07af + clearbit1 EVENT_SAW_SUICUNE_ON_ROUTE_42 domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $1 checkbit1 $0333 iftrue UnknownScript_0x1a0083 @@ -81,11 +81,11 @@ UnknownScript_0x1a0083: ; 0x1a0083 PokefanFScript_0x1a0084: ; 0x1a0084 faceplayer loadfont - checkbit1 $0011 + checkbit1 EVENT_GOT_HM02_FLY iftrue UnknownScript_0x1a00ad 2writetext UnknownText_0x1a00f1 keeptextopen - checkbit1 $04c2 + checkbit1 EVENT_BEAT_CHUCK iftrue UnknownScript_0x1a009c 2writetext UnknownText_0x1a0163 closetext @@ -98,7 +98,7 @@ UnknownScript_0x1a009c: ; 0x1a009c keeptextopen verbosegiveitem HM_02, 1 iffalse UnknownScript_0x1a00b1 - setbit1 $0011 + setbit1 EVENT_GOT_HM02_FLY 2writetext UnknownText_0x1a021d keeptextopen UnknownScript_0x1a00ad: ; 0x1a00ad diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 78e86e053..5b34e53b1 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -9,7 +9,7 @@ CianwoodGym_MapScriptHeader: ; 0x9d60d ChuckScript_0x9d60f: ; 0x9d60f faceplayer loadfont - checkbit1 $04c2 + checkbit1 EVENT_BEAT_CHUCK iftrue UnknownScript_0x9d656 2writetext UnknownText_0x9d6f9 closetext @@ -33,7 +33,7 @@ ChuckScript_0x9d60f: ; 0x9d60f loadtrainer CHUCK, 1 startbattle returnafterbattle - setbit1 $04c2 + setbit1 EVENT_BEAT_CHUCK loadfont 2writetext UnknownText_0x9d835 playsound $009c @@ -42,17 +42,17 @@ ChuckScript_0x9d60f: ; 0x9d60f checkcode $7 2call UnknownScript_0x9d681 UnknownScript_0x9d656: ; 0x9d656 - checkbit1 $000a + checkbit1 EVENT_GOT_TM01_DYNAMICPUNCH iftrue UnknownScript_0x9d67b - setbit1 $04a5 - setbit1 $04a7 - setbit1 $04a8 - setbit1 $04aa + setbit1 EVENT_BEAT_BLACKBELT_YOSHI + setbit1 EVENT_BEAT_BLACKBELT_LAO + setbit1 EVENT_BEAT_BLACKBELT_NOB + setbit1 EVENT_BEAT_BLACKBELT_LUNG 2writetext UnknownText_0x9d84d keeptextopen verbosegiveitem TM_01, 1 iffalse UnknownScript_0x9d67f - setbit1 $000a + setbit1 EVENT_GOT_TM01_DYNAMICPUNCH 2writetext UnknownText_0x9d8da closetext loadmovesprites diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 674ea5931..4f8bb2a49 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -16,7 +16,7 @@ UnknownScript_0x9df9d: ; 0x9df9d PharmacistScript_0x9df9e: ; 0x9df9e faceplayer loadfont - checkbit1 $0023 + checkbit1 EVENT_GOT_SECRETPOTION_FROM_PHARMACY iftrue UnknownScript_0x9dfc4 checkbit1 $0037 iffalse UnknownScript_0x9dfc4 @@ -27,7 +27,7 @@ PharmacistScript_0x9df9e: ; 0x9df9e playsound $0091 waitbutton itemnotify - setbit1 $0023 + setbit1 EVENT_GOT_SECRETPOTION_FROM_PHARMACY 2writetext UnknownText_0x9e070 closetext loadmovesprites diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index a8f3ff202..54cd87573 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -16,7 +16,7 @@ LassScript_0x9dbd2: ; 0x9dbd2 CianwoodGymGuyScript: ; 0x9dbd5 faceplayer - checkbit1 $04c2 + checkbit1 EVENT_BEAT_CHUCK iftrue .CianwoodGymGuyWinScript loadfont 2writetext CianwoodGymGuyText diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 07b90ec65..89f2835e7 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -13,7 +13,7 @@ PokefanMScript_0x18ad13: ; 0x18ad13 PokefanFScript_0x18ad16: ; 0x18ad16 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18ad24 2writetext UnknownText_0x18ad95 closetext diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 6a63af393..eb85b9e77 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -27,9 +27,9 @@ UnknownScript_0x18aeb0: ; 0x18aeb0 CopycatScript_0x18aeb1: ; 0x18aeb1 faceplayer - checkbit1 $00d1 + checkbit1 EVENT_GOT_PASS_FROM_COPYCAT iftrue UnknownScript_0x18af6f - checkbit1 $00d0 + checkbit1 EVENT_RETURNED_LOST_ITEM_TO_COPYCAT iftrue UnknownScript_0x18af5b checkitem LOST_ITEM iftrue UnknownScript_0x18af4a @@ -47,7 +47,7 @@ UnknownScript_0x18aed4: ; 0x18aed4 variablesprite $b, $60 UnknownScript_0x18aedc: ; 0x18aedc special $005e - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18af16 loadfont checkbit2 $0063 @@ -109,7 +109,7 @@ UnknownScript_0x18af39: ; 0x18af39 2writetext UnknownText_0x18b116 closetext loadmovesprites - setbit1 $00cf + setbit1 EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM end ; 0x18af4a @@ -118,7 +118,7 @@ UnknownScript_0x18af4a: ; 0x18af4a 2writetext UnknownText_0x18b17f keeptextopen takeitem LOST_ITEM, 1 - setbit1 $00d0 + setbit1 EVENT_RETURNED_LOST_ITEM_TO_COPYCAT clearbit1 $0773 2jump UnknownScript_0x18af5c ; 0x18af5b @@ -130,7 +130,7 @@ UnknownScript_0x18af5c: ; 0x18af5c keeptextopen verbosegiveitem PASS, 1 iffalse UnknownScript_0x18afba - setbit1 $00d1 + setbit1 EVENT_GOT_PASS_FROM_COPYCAT 2writetext UnknownText_0x18b214 closetext loadmovesprites diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index d99010d75..3f4f2656b 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -156,17 +156,17 @@ GentlemanScript_0x994c6: ; 0x994c6 loadfont 2writetext UnknownText_0x9980a keeptextopen - checkbit1 $0012 + checkbit1 EVENT_GOT_HM03_SURF iftrue UnknownScript_0x99515 - checkbit1 $04df + checkbit1 EVENT_BEAT_KIMONO_GIRL_NAOKO iffalse UnknownScript_0x994f3 - checkbit1 $04e0 + checkbit1 EVENT_BEAT_KIMONO_GIRL_SAYO iffalse UnknownScript_0x994f3 - checkbit1 $04e1 + checkbit1 EVENT_BEAT_KIMONO_GIRL_ZUKI iffalse UnknownScript_0x994f3 - checkbit1 $04e2 + checkbit1 EVENT_BEAT_KIMONO_GIRL_KUNI iffalse UnknownScript_0x994f3 - checkbit1 $04e3 + checkbit1 EVENT_BEAT_KIMONO_GIRL_MIKI iffalse UnknownScript_0x994f3 2jump UnknownScript_0x99505 ; 0x994f3 @@ -191,7 +191,7 @@ UnknownScript_0x99505: ; 0x99505 2writetext UnknownText_0x9991a keeptextopen verbosegiveitem HM_03, 1 - setbit1 $0012 + setbit1 EVENT_GOT_HM03_SURF 2writetext UnknownText_0x9999b closetext loadmovesprites diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 04357d05d..cc87b799a 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -9,13 +9,13 @@ DarkCaveBlackthornEntrance_MapScriptHeader: ; 0x18c71e PharmacistScript_0x18c720: ; 0x18c720 faceplayer loadfont - checkbit1 $0072 + checkbit1 EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE iftrue UnknownScript_0x18c735 2writetext UnknownText_0x18c73f keeptextopen verbosegiveitem BLACKGLASSES, 1 iffalse UnknownScript_0x18c739 - setbit1 $0072 + setbit1 EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE UnknownScript_0x18c735: ; 0x18c735 2writetext UnknownText_0x18c80c closetext diff --git a/maps/DayCare.asm b/maps/DayCare.asm index a3799b9fe..2c05823e4 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -27,7 +27,7 @@ UnknownScript_0x62f88: ; 0x62f88 GrampsScript_0x62f8f: ; 0x62f8f faceplayer loadfont - checkbit1 $033e + checkbit1 EVENT_GOT_ODD_EGG iftrue UnknownScript_0x62fbd 2writetext UnknownText_0x630ce keeptextopen @@ -42,7 +42,7 @@ GrampsScript_0x62f8f: ; 0x62f8f 2writetext UnknownText_0x631c3 closetext loadmovesprites - setbit1 $033e + setbit1 EVENT_GOT_ODD_EGG end ; 0x62fb6 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index f2bdbc4ce..28ef72a6d 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -201,7 +201,7 @@ ElderScript_0x18d1a5: ; 0x18d1a5 iftrue UnknownScript_0x18d1ff checkbit1 $00bd iffalse UnknownScript_0x18d1c5 - checkbit1 $0319 + checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON iftrue UnknownScript_0x18d1f3 2writetext UnknownText_0x18d724 closetext diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 8319b8b02..44e852f01 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x18c89e: ; 0x18c89e ; 0x18c89f UnknownScript_0x18c89f: ; 0x18c89f - checkbit1 $0319 + checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON iftrue UnknownScript_0x18c8a8 disappear $4 return @@ -62,7 +62,7 @@ UnknownScript_0x18c8b8: ; 0x18c8b8 playsound $0001 waitbutton itemnotify - setbit1 $000f + setbit1 EVENT_GOT_TM24_DRAGONBREATH 2writetext UnknownText_0x18ca0d keeptextopen 2writetext UnknownText_0x18caf1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index ec560c2c3..62318f36e 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -34,7 +34,7 @@ LassScript_0x1a4012: ; 0x1a4012 LassScript_0x1a4015: ; 0x1a4015 faceplayer loadfont - checkbit1 $007b + checkbit1 EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x1a4023 2writetext UnknownText_0x1a421a closetext @@ -52,7 +52,7 @@ UnknownScript_0x1a4023: ; 0x1a4023 FisherScript_0x1a4029: ; 0x1a4029 faceplayer loadfont - checkbit1 $0020 + checkbit1 EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x1a4037 2writetext UnknownText_0x1a42ac closetext diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index cd3db22f0..b6e49ac57 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -22,7 +22,7 @@ UnknownScript_0x99d57: ; 0x99d57 MortyScript_0x99d58: ; 0x99d58 faceplayer loadfont - checkbit1 $04c0 + checkbit1 EVENT_BEAT_MORTY iftrue UnknownScript_0x99d8c 2writetext UnknownText_0x99e65 closetext @@ -31,7 +31,7 @@ MortyScript_0x99d58: ; 0x99d58 loadtrainer MORTY, 1 startbattle returnafterbattle - setbit1 $04c0 + setbit1 EVENT_BEAT_MORTY loadfont 2writetext UnknownText_0x9a043 playsound $009c @@ -43,17 +43,17 @@ MortyScript_0x99d58: ; 0x99d58 setbit1 $0766 setbit1 $0767 UnknownScript_0x99d8c: ; 0x99d8c - checkbit1 $000c + checkbit1 EVENT_GOT_TM30_SHADOW_BALL iftrue UnknownScript_0x99db1 - setbit1 $0415 - setbit1 $0416 - setbit1 $058b - setbit1 $058c + setbit1 EVENT_BEAT_SAGE_JEFFREY + setbit1 EVENT_BEAT_SAGE_PING + setbit1 EVENT_BEAT_MEDIUM_MARTHA + setbit1 EVENT_BEAT_MEDIUM_GRACE 2writetext UnknownText_0x9a059 keeptextopen verbosegiveitem TM_30, 1 iffalse UnknownScript_0x99db5 - setbit1 $000c + setbit1 EVENT_GOT_TM30_SHADOW_BALL 2writetext UnknownText_0x9a0ec closetext loadmovesprites @@ -218,7 +218,7 @@ MediumGraceScript: ; 0x99e31 EcruteakGymGuyScript: ; 0x99e39 faceplayer loadfont - checkbit1 $04c0 + checkbit1 EVENT_BEAT_MORTY iftrue .EcruteakGymGuyWinScript 2writetext EcruteakGymGuyText closetext diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index b67c8fa9e..0356d9dc8 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -23,11 +23,11 @@ UnknownScript_0x9800e: ; 0x9800e ; 0x9800f UnknownScript_0x9800f: ; 0x9800f - checkbit1 $0335 + checkbit1 EVENT_FOUGHT_SUICUNE iftrue UnknownScript_0x98033 - checkbit1 $0334 + checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x98033 - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x98022 return ; 0x98022 @@ -77,7 +77,7 @@ UnknownScript_0x98061: ; 0x98061 SageScript_0x98062: ; 0x98062 faceplayer loadfont - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x9807c checkbit2 $001e iftrue UnknownScript_0x98076 @@ -95,7 +95,7 @@ UnknownScript_0x98076: ; 0x98076 ; 0x9807c UnknownScript_0x9807c: ; 0x9807c - checkbit1 $0334 + checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x980a4 checkbit1 $0000 iftrue UnknownScript_0x980aa @@ -135,7 +135,7 @@ UnknownScript_0x980aa: ; 0x980aa SageScript_0x980b0: ; 0x980b0 faceplayer loadfont - checkbit1 $0078 + checkbit1 EVENT_GOT_CLEAR_BELL iftrue UnknownScript_0x980be 2writetext UnknownText_0x9840b closetext diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index b3b192323..b340e9fd4 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -9,7 +9,7 @@ EcruteakItemfinderHouse_MapScriptHeader: ; 0x9a5f9 CooltrainerMScript_0x9a5fb: ; 0x9a5fb faceplayer loadfont - checkbit1 $005a + checkbit1 EVENT_GOT_ITEMFINDER iftrue UnknownScript_0x9a614 2writetext UnknownText_0x9a63c yesorno @@ -17,7 +17,7 @@ CooltrainerMScript_0x9a5fb: ; 0x9a5fb 2writetext UnknownText_0x9a6b5 keeptextopen verbosegiveitem ITEMFINDER, 1 - setbit1 $005a + setbit1 EVENT_GOT_ITEMFINDER UnknownScript_0x9a614: ; 0x9a614 2writetext UnknownText_0x9a70e closetext diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index f94e297c5..d567846ff 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -98,21 +98,21 @@ UnknownScript_0x78ba5: ; 0x78ba5 ProfElmScript: ; 0x78be0 faceplayer loadfont - checkbit1 $0024 + checkbit1 EVENT_GOT_SS_TICKET_FROM_ELM iftrue UnknownScript_0x78bee checkbit1 $0044 iftrue ElmGiveTicketScript UnknownScript_0x78bee: ; 0x78bee - checkbit1 $007c + checkbit1 EVENT_GOT_MASTER_BALL_FROM_ELM iftrue UnknownScript_0x78bfa checkbit2 $0022 iftrue ElmGiveMasterBallScript UnknownScript_0x78bfa: ; 0x78bfa - checkbit1 $0056 + checkbit1 EVENT_GOT_EVERSTONE_FROM_ELM iftrue UnknownScript_0x78e16 - checkbit1 $0055 + checkbit1 EVENT_SHOWED_TOGEPI_TO_ELM iftrue UnknownScript_0x78e03 - checkbit1 $0077 + checkbit1 EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse UnknownScript_0x78c35 writebyte TOGEPI special $0043 @@ -137,20 +137,20 @@ UnknownScript_0x78c22: ; 0x78c22 ; 0x78c35 UnknownScript_0x78c35: ; 0x78c35 - checkbit1 $002d + checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iffalse UnknownScript_0x78c41 - checkbit1 $0054 + checkbit1 EVENT_TOGEPI_HATCHED iftrue UnknownScript_0x78c22 UnknownScript_0x78c41: ; 0x78c41 - checkbit1 $002d ; why are we checking it again? + checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again? iftrue ElmWaitingEggHatchScript checkbit2 $001b iftrue ElmAideHasEggScript - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue ElmStudyingEggScript - checkbit1 $001e + checkbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue ElmAfterTheftScript - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue ElmDescribesMrPokemonScript 2writetext UnknownText_0x79375 closetext @@ -169,7 +169,7 @@ LabTryToLeaveScript: ; 0x78c65 ; 0x78c73 CyndaquilPokeBallScript: ; 0x78c73 - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface $2, $0 refreshscreen $0 @@ -182,7 +182,7 @@ CyndaquilPokeBallScript: ; 0x78c73 yesorno iffalse DidntChooseStarterScript disappear $4 - setbit1 $001b + setbit1 EVENT_GOT_CYNDAQUIL_FROM_ELM 2writetext ChoseStarterText keeptextopen waitbutton @@ -200,7 +200,7 @@ CyndaquilPokeBallScript: ; 0x78c73 ; 0x78cb5 TotodilePokeBallScript: ; 0x78cb5 - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface $2, $0 refreshscreen $0 @@ -213,7 +213,7 @@ TotodilePokeBallScript: ; 0x78cb5 yesorno iffalse DidntChooseStarterScript disappear $5 - setbit1 $001c + setbit1 EVENT_GOT_TOTODILE_FROM_ELM 2writetext ChoseStarterText keeptextopen waitbutton @@ -229,7 +229,7 @@ TotodilePokeBallScript: ; 0x78cb5 ; 0x78cf1 ChikoritaPokeBallScript: ; 0x78cf1 - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface $2, $0 refreshscreen $0 @@ -242,7 +242,7 @@ ChikoritaPokeBallScript: ; 0x78cf1 yesorno iffalse DidntChooseStarterScript disappear $6 - setbit1 $001d + setbit1 EVENT_GOT_CHIKORITA_FROM_ELM 2writetext ChoseStarterText keeptextopen waitbutton @@ -287,7 +287,7 @@ ElmDirectionsScript: ; 0x78d33 2writetext ElmDirectionsText3 closetext loadmovesprites - setbit1 $001a + setbit1 EVENT_GOT_A_POKEMON_FROM_ELM setbit1 $06be dotrigger $5 domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1 @@ -311,7 +311,7 @@ LookAtElmPokeBallScript: ; 0x78d6d MapElmsLabSignpost0Script: ; 0x78d74 loadfont - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x78d81 2writetext UnknownText_0x79690 closetext @@ -361,7 +361,7 @@ ElmAfterTheftScript: ; 0x78da2 keeptextopen 2writetext ElmAfterTheftText5 keeptextopen - setbit1 $001f + setbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM setbit2 $0010 domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 clearbit1 $0715 @@ -399,7 +399,7 @@ ShowElmTogepiScript: ; 0x78dee closetext loadmovesprites showemote $0, $2, 15 - setbit1 $0055 + setbit1 EVENT_SHOWED_TOGEPI_TO_ELM loadfont 2writetext ShowElmTogepiText2 keeptextopen @@ -413,7 +413,7 @@ UnknownScript_0x78e03: ; 0x78e03 2writetext ElmGiveEverstoneText2 closetext loadmovesprites - setbit1 $0056 + setbit1 EVENT_GOT_EVERSTONE_FROM_ELM end ; 0x78e16 @@ -430,7 +430,7 @@ ElmGiveMasterBallScript: ; 0x78e1c keeptextopen verbosegiveitem MASTER_BALL, 1 iffalse .notdone - setbit1 $007c + setbit1 EVENT_GOT_MASTER_BALL_FROM_ELM 2writetext ElmGiveMasterBallText2 closetext .notdone @@ -442,7 +442,7 @@ ElmGiveTicketScript: ; 0x78e2f 2writetext ElmGiveTicketText1 keeptextopen verbosegiveitem S_S_TICKET, 1 - setbit1 $0024 + setbit1 EVENT_GOT_SS_TICKET_FROM_ELM 2writetext ElmGiveTicketText2 closetext loadmovesprites @@ -560,11 +560,11 @@ UnknownScript_0x78ee2: ; 0x78ee2 ElmsAideScript: ; 0x78ee6 faceplayer loadfont - checkbit1 $002d + checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x78f0c - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x78f06 - checkbit1 $001e + checkbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue UnknownScript_0x78f00 2writetext UnknownText_0x79f65 closetext @@ -617,7 +617,7 @@ MapElmsLabSignpost14Script: ; 0x78f33 loadfont checkbit2 $0043 iftrue UnknownScript_0x78f49 - checkbit1 $0043 + checkbit1 EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON iftrue UnknownScript_0x78f43 2jump UnknownScript_0x78f49 ; 0x78f43 diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm index 4e3ef010b..7eaf4f1de 100644 --- a/maps/FastShipCabins.asm +++ b/maps/FastShipCabins.asm @@ -80,7 +80,7 @@ UnknownScript_0x75f09: ; 0x75f09 GentlemanScript_0x75f1f: ; 0x75f1f faceplayer loadfont - checkbit1 $0071 + checkbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 checkbit1 $0732 iftrue UnknownScript_0x75f58 @@ -96,7 +96,7 @@ UnknownScript_0x75f37: ; 0x75f37 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f44 - setbit1 $0071 + setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f44: ; 0x75f44 loadmovesprites waitbutton @@ -116,7 +116,7 @@ UnknownScript_0x75f58: ; 0x75f58 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f65 - setbit1 $0071 + setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f65: ; 0x75f65 loadmovesprites end diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 4e3ef010b..7eaf4f1de 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -80,7 +80,7 @@ UnknownScript_0x75f09: ; 0x75f09 GentlemanScript_0x75f1f: ; 0x75f1f faceplayer loadfont - checkbit1 $0071 + checkbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 checkbit1 $0732 iftrue UnknownScript_0x75f58 @@ -96,7 +96,7 @@ UnknownScript_0x75f37: ; 0x75f37 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f44 - setbit1 $0071 + setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f44: ; 0x75f44 loadmovesprites waitbutton @@ -116,7 +116,7 @@ UnknownScript_0x75f58: ; 0x75f58 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f65 - setbit1 $0071 + setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f65: ; 0x75f65 loadmovesprites end diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 4364525fe..e7bd0f9cf 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -19,7 +19,7 @@ JanineScript_0x195db9: ; 0x195db9 loadtrainer JANINE, 1 startbattle returnafterbattle - setbit1 $04c9 + setbit1 EVENT_BEAT_JANINE setbit1 $0517 setbit1 $051a setbit1 $0482 @@ -41,13 +41,13 @@ UnknownScript_0x195e00: ; 0x195e00 faceplayer loadfont UnknownScript_0x195e02: ; 0x195e02 - checkbit1 $00dd + checkbit1 EVENT_GOT_TM06_TOXIC iftrue UnknownScript_0x195e15 2writetext UnknownText_0x196002 keeptextopen verbosegiveitem TM_06, 1 iffalse UnknownScript_0x195e15 - setbit1 $00dd + setbit1 EVENT_GOT_TM06_TOXIC UnknownScript_0x195e15: ; 0x195e15 2writetext UnknownText_0x196074 closetext @@ -206,7 +206,7 @@ UnknownScript_0x195efd: ; 0x195efd FuchsiaGymGuyScript: ; 0x195f03 faceplayer loadfont - checkbit1 $04c9 + checkbit1 EVENT_BEAT_JANINE iftrue .FuchsiaGymGuyWinScript 2writetext FuchsiaGymGuyText closetext diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index e31454948..f45d769b5 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -13,7 +13,7 @@ UnknownScript_0x5474f: ; 0x5474f ClerkScript_0x54750: ; 0x54750 faceplayer loadfont - checkbit1 $005b + checkbit1 EVENT_GOT_BICYCLE iftrue UnknownScript_0x54775 2writetext UnknownText_0x54787 yesorno @@ -27,7 +27,7 @@ ClerkScript_0x54750: ; 0x54750 waitbutton itemnotify setbit2 $0014 - setbit1 $005b + setbit1 EVENT_GOT_BICYCLE UnknownScript_0x54775: ; 0x54775 2writetext UnknownText_0x5485f closetext diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 2c938011f..955721ea0 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -9,7 +9,7 @@ GoldenrodBillsHouse_MapScriptHeader: ; 0x54be2 BillScript_0x54be4: ; 0x54be4 faceplayer loadfont - checkbit1 $004f + checkbit1 EVENT_GOT_EEVEE iftrue UnknownScript_0x54c1f 2writetext UnknownText_0x54c74 yesorno @@ -23,7 +23,7 @@ BillScript_0x54be4: ; 0x54be4 playsound $0002 waitbutton givepoke EEVEE, 20, 0, 0 - setbit1 $004f + setbit1 EVENT_GOT_EEVEE 2writetext UnknownText_0x54dc1 closetext loadmovesprites diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index d0eecc9e3..0644c1cb2 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -174,7 +174,7 @@ YoungsterScript_0x1989e6: ; 0x1989e6 CooltrainerFScript_0x1989e9: ; 0x1989e9 faceplayer loadfont - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1989f7 2writetext UnknownText_0x198ae6 closetext diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index ed991d26e..3558f5d28 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -25,15 +25,15 @@ UnknownScript_0x56099: ; 0x56099 ClerkScript_0x5609c: ; 0x5609c faceplayer loadfont - checkbit1 $005f + checkbit1 EVENT_GOT_TM02_HEADBUTT iftrue UnknownScript_0x560ad - checkbit1 $004b + checkbit1 EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x560c2 2jump UnknownScript_0x560b6 ; 0x560ad UnknownScript_0x560ad: ; 0x560ad - checkbit1 $004b + checkbit1 EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x560c8 2jump UnknownScript_0x560bc ; 0x560b6 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 51153e393..a4282f5cd 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -7,9 +7,9 @@ GoldenrodFlowerShop_MapScriptHeader: ; 0x5535b ; 0x5535d TeacherScript_0x5535d: ; 0x5535d - checkbit1 $002a + checkbit1 EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x5538f - checkbit1 $005c + checkbit1 EVENT_GOT_SQUIRTBOTTLE iftrue UnknownScript_0x55399 checkbit1 $00b9 iffalse UnknownScript_0x5539f @@ -22,7 +22,7 @@ TeacherScript_0x5535d: ; 0x5535d 2writetext UnknownText_0x554c2 keeptextopen verbosegiveitem SQUIRTBOTTLE, 1 - setbit1 $005c + setbit1 EVENT_GOT_SQUIRTBOTTLE loadmovesprites setbit1 $0769 clearbit1 $0768 @@ -53,9 +53,9 @@ UnknownScript_0x5539f: ; 0x5539f LassScript_0x553a2: ; 0x553a2 faceplayer loadfont - checkbit1 $002a + checkbit1 EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x553c5 - checkbit1 $005c + checkbit1 EVENT_GOT_SQUIRTBOTTLE iftrue UnknownScript_0x553bf 2writetext UnknownText_0x55561 closetext diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 33e6a1895..88d4a61f5 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -20,7 +20,7 @@ UnknownScript_0x5400b: ; 0x5400b WhitneyScript_0x5400c: ; 0x5400c faceplayer - checkbit1 $04bf + checkbit1 EVENT_BEAT_WHITNEY iftrue UnknownScript_0x54037 loadfont 2writetext UnknownText_0x54122 @@ -30,16 +30,16 @@ WhitneyScript_0x5400c: ; 0x5400c loadtrainer WHITNEY, 1 startbattle returnafterbattle - setbit1 $04bf - setbit1 $0028 + setbit1 EVENT_BEAT_WHITNEY + setbit1 EVENT_MADE_WHITNEY_CRY dotrigger $1 - setbit1 $04ad - setbit1 $04ae - setbit1 $0515 - setbit1 $0516 + setbit1 EVENT_BEAT_BEAUTY_VICTORIA + setbit1 EVENT_BEAT_BEAUTY_SAMANTHA + setbit1 EVENT_BEAT_LASS_CARRIE + setbit1 EVENT_BEAT_LASS_BRIDGET UnknownScript_0x54037: ; 0x54037 loadfont - checkbit1 $0028 + checkbit1 EVENT_MADE_WHITNEY_CRY iffalse UnknownScript_0x54044 2writetext UnknownText_0x541f4 closetext @@ -48,7 +48,7 @@ UnknownScript_0x54037: ; 0x54037 ; 0x54044 UnknownScript_0x54044: ; 0x54044 - checkbit1 $000b + checkbit1 EVENT_GOT_TM45_ATTRACT iftrue UnknownScript_0x54077 checkbit2 $001d iftrue UnknownScript_0x54064 @@ -66,7 +66,7 @@ UnknownScript_0x54064: ; 0x54064 keeptextopen verbosegiveitem TM_45, 1 iffalse UnknownScript_0x5407b - setbit1 $000b + setbit1 EVENT_GOT_TM45_ATTRACT 2writetext UnknownText_0x54302 closetext loadmovesprites @@ -134,7 +134,7 @@ WhitneyCriesScript: ; 0x540a0 loadmovesprites applymovement $4, BridgetWalksAwayMovement dotrigger $0 - clearbit1 $0028 + clearbit1 EVENT_MADE_WHITNEY_CRY end ; 0x540bb @@ -227,7 +227,7 @@ BeautySamanthaScript: ; 0x540ef GoldenrodGymGuyScript: ; 0x540f7 faceplayer - checkbit1 $04bf + checkbit1 EVENT_BEAT_WHITNEY iftrue .GoldenrodGymGuyWinScript loadfont 2writetext GoldenrodGymGuyText diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 1b305969f..952a7d1f4 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -16,7 +16,7 @@ UnknownScript_0x550eb: ; 0x550eb OfficerScript_0x550ec: ; 0x550ec faceplayer loadfont - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x550fa 2writetext UnknownText_0x55160 closetext diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index e871c383b..d5bf6ab80 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -18,7 +18,7 @@ UnknownScript_0x60f94: ; 0x60f94 ; 0x60f9e UnknownScript_0x60f9e: ; 0x60f9e - checkbit1 $0340 + checkbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue UnknownScript_0x60fd8 playsound $0023 moveperson $3, $0, $7 @@ -31,8 +31,8 @@ UnknownScript_0x60f9e: ; 0x60f9e 2writetext UnknownText_0x622f0 closetext verbosegiveitem GS_BALL, 1 - setbit1 $0340 - setbit1 $00be + setbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + setbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT 2writetext UnknownText_0x62359 closetext loadmovesprites @@ -52,7 +52,7 @@ UnknownScript_0x60fd9: ; 0x60fd9 ; 0x60fe3 UnknownScript_0x60fe3: ; 0x60fe3 - checkbit1 $0340 + checkbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue UnknownScript_0x6101d playsound $0023 moveperson $3, $0, $7 @@ -65,8 +65,8 @@ UnknownScript_0x60fe3: ; 0x60fe3 2writetext UnknownText_0x622f0 closetext verbosegiveitem GS_BALL, 1 - setbit1 $0340 - setbit1 $00be + setbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + setbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT 2writetext UnknownText_0x62359 closetext loadmovesprites diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index a4c955064..a0cace60f 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -42,7 +42,7 @@ UnknownScript_0x181454: ; 0x181454 clearbit1 $0738 domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 special $001b - checkbit1 $0024 + checkbit1 EVENT_GOT_SS_TICKET_FROM_ELM iftrue UnknownScript_0x181497 specialphonecall $5 UnknownScript_0x181497: ; 0x181497 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index f09402904..5d51fcf32 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -38,25 +38,25 @@ StoneTable_0x7e4c7: ; 0x7e4c7 UnknownScript_0x7e4d8: ; 0x7e4d8 disappear 2 - clearbit1 $070d + clearbit1 EVENT_BOULDER_IN_ICE_PATH_1 2jump UnknownScript_0x7e4f8 ; 0x7e4e0 UnknownScript_0x7e4e0: ; 0x7e4e0 disappear 3 - clearbit1 $070e + clearbit1 EVENT_BOULDER_IN_ICE_PATH_2 2jump UnknownScript_0x7e4f8 ; 0x7e4e8 UnknownScript_0x7e4e8: ; 0x7e4e8 disappear 4 - clearbit1 $070f + clearbit1 EVENT_BOULDER_IN_ICE_PATH_3 2jump UnknownScript_0x7e4f8 ; 0x7e4f0 UnknownScript_0x7e4f0: ; 0x7e4f0 disappear 5 - clearbit1 $0710 + clearbit1 EVENT_BOULDER_IN_ICE_PATH_4 2jump UnknownScript_0x7e4f8 ; 0x7e4f8 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 9e8baa9fa..280d1f9a2 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -11,7 +11,7 @@ IlexForest_MapScriptHeader: ; 0x6eafe ; 0x6eb03 UnknownScript_0x6eb03: ; 0x6eb03 - checkbit1 $0010 + checkbit1 EVENT_GOT_HM01_CUT iftrue UnknownScript_0x6eb34 copybytetovar FarfetchdPosition if_equal $1, UnknownScript_0x6eb35 @@ -373,12 +373,12 @@ UnknownScript_0x6eda1: ; 0x6eda1 BlackBeltScript_0x6edae: ; 0x6edae faceplayer loadfont - checkbit1 $0010 + checkbit1 EVENT_GOT_HM01_CUT iftrue UnknownScript_0x6edd8 2writetext UnknownText_0x6f099 keeptextopen verbosegiveitem HM_01, 1 - setbit1 $0010 + setbit1 EVENT_GOT_HM01_CUT 2writetext UnknownText_0x6f141 closetext loadmovesprites @@ -401,13 +401,13 @@ UnknownScript_0x6edd8: ; 0x6edd8 RockerScript_0x6edde: ; 0x6edde faceplayer loadfont - checkbit1 $005f + checkbit1 EVENT_GOT_TM02_HEADBUTT iftrue UnknownScript_0x6edf3 2writetext UnknownText_0x6f21b keeptextopen verbosegiveitem TM_02, 1 iffalse UnknownScript_0x6edf7 - setbit1 $005f + setbit1 EVENT_GOT_TM02_HEADBUTT UnknownScript_0x6edf3: ; 0x6edf3 2writetext UnknownText_0x6f26d closetext diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 1b1274b47..892d9dd16 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -25,26 +25,26 @@ UnknownScript_0x18000a: ; 0x18000a domaptrigger GROUP_LANCES_ROOM, MAP_LANCES_ROOM, $0 domaptrigger GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $0 clearbit1 $0309 - clearbit1 $030a - clearbit1 $030b - clearbit1 $030c - clearbit1 $030d - clearbit1 $030e - clearbit1 $030f - clearbit1 $0310 - clearbit1 $0311 + clearbit1 EVENT_WILLS_ROOM_EXIT_OPEN + clearbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED + clearbit1 EVENT_KOGAS_ROOM_EXIT_OPEN + clearbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + clearbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN + clearbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED + clearbit1 EVENT_KARENS_ROOM_EXIT_OPEN + clearbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED clearbit1 $0312 clearbit1 $05b8 clearbit1 $05b9 clearbit1 $05ba - clearbit1 $05bb - clearbit1 $05bc + clearbit1 EVENT_BEAT_ELITE_4_KAREN + clearbit1 EVENT_BEAT_CHAMPION_LANCE setbit1 $075f return ; 0x180053 UnknownScript_0x180053: ; 0x180053 - checkbit1 $0319 + checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON iffalse UnknownScript_0x18012b checkbit2 $005d iftrue UnknownScript_0x18012b @@ -67,7 +67,7 @@ UnknownScript_0x180053: ; 0x180053 ; 0x180094 UnknownScript_0x180094: ; 0x180094 - checkbit1 $0319 + checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON iffalse UnknownScript_0x18012b checkbit2 $005d iftrue UnknownScript_0x18012b @@ -91,9 +91,9 @@ UnknownScript_0x1800ce: ; 0x1800ce closetext loadmovesprites setbit1 $077b - checkbit1 $001c + checkbit1 EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x1800f3 - checkbit1 $001d + checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x180103 winlosstext UnknownText_0x180295, UnknownText_0x1802fd setlasttalked $5 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index d6af8bce0..cf0219ffc 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -24,11 +24,11 @@ UnknownScript_0x180bc0: ; 0x180bc0 ; 0x180bc1 UnknownScript_0x180bc1: ; 0x180bc1 - checkbit1 $030f + checkbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180bcb changeblock $4, $e, $2a UnknownScript_0x180bcb: ; 0x180bcb - checkbit1 $0310 + checkbit1 EVENT_KARENS_ROOM_EXIT_OPEN iffalse UnknownScript_0x180bd5 changeblock $4, $2, $16 UnknownScript_0x180bd5: ; 0x180bd5 @@ -44,7 +44,7 @@ UnknownScript_0x180bd6: ; 0x180bd6 reloadmappart loadmovesprites dotrigger $1 - setbit1 $030f + setbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED waitbutton end ; 0x180bee @@ -52,7 +52,7 @@ UnknownScript_0x180bd6: ; 0x180bd6 KarenScript_0x180bee: ; 0x180bee faceplayer loadfont - checkbit1 $05bb + checkbit1 EVENT_BEAT_ELITE_4_KAREN iftrue UnknownScript_0x180c1c 2writetext UnknownText_0x180c27 closetext @@ -61,7 +61,7 @@ KarenScript_0x180bee: ; 0x180bee loadtrainer KAREN, 1 startbattle returnafterbattle - setbit1 $05bb + setbit1 EVENT_BEAT_ELITE_4_KAREN loadfont 2writetext UnknownText_0x180d29 closetext @@ -70,7 +70,7 @@ KarenScript_0x180bee: ; 0x180bee changeblock $4, $2, $16 reloadmappart loadmovesprites - setbit1 $0310 + setbit1 EVENT_KARENS_ROOM_EXIT_OPEN waitbutton end ; 0x180c1c diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index e2395373e..7fba3dde1 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -24,11 +24,11 @@ UnknownScript_0x18072c: ; 0x18072c ; 0x18072d UnknownScript_0x18072d: ; 0x18072d - checkbit1 $030b + checkbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180737 changeblock $4, $e, $2a UnknownScript_0x180737: ; 0x180737 - checkbit1 $030c + checkbit1 EVENT_KOGAS_ROOM_EXIT_OPEN iffalse UnknownScript_0x180741 changeblock $4, $2, $16 UnknownScript_0x180741: ; 0x180741 @@ -44,7 +44,7 @@ UnknownScript_0x180742: ; 0x180742 reloadmappart loadmovesprites dotrigger $1 - setbit1 $030b + setbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitbutton end ; 0x18075a @@ -70,7 +70,7 @@ KogaScript_0x18075a: ; 0x18075a changeblock $4, $2, $16 reloadmappart loadmovesprites - setbit1 $030c + setbit1 EVENT_KOGAS_ROOM_EXIT_OPEN waitbutton end ; 0x180788 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 20e0dbfcc..3c6641e9e 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -131,11 +131,11 @@ MomScript_0x7a582: ; 0x7a582 loadfont checkbit1 $0076 iftrue UnknownScript_0x7a5af - checkbit1 $0040 + checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue UnknownScript_0x7a5b8 - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x7a5b5 - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7a5a9 2writetext UnknownText_0x7a8b5 closetext @@ -160,7 +160,7 @@ UnknownScript_0x7a5af: ; 0x7a5af UnknownScript_0x7a5b5: ; 0x7a5b5 setbit1 $0076 UnknownScript_0x7a5b8: ; 0x7a5b8 - setbit1 $0040 + setbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST special $0022 closetext loadmovesprites diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 6a6394238..1d4a33040 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -64,9 +64,9 @@ MapKrissHouse2FSignpost4Script: ; 0x7abd8 ; 0x7abda MapKrissHouse2FSignpost2Script: ; 0x7abda - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7ac07 - checkbit1 $0325 + checkbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE iftrue UnknownScript_0x7ac0a playmusic $001d loadfont @@ -80,7 +80,7 @@ MapKrissHouse2FSignpost2Script: ; 0x7abda 2writetext UnknownText_0x7ac84 pause 45 loadmovesprites - setbit1 $0325 + setbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE end ; 0x7ac07 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 5fdf07c71..313678348 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -19,9 +19,9 @@ MapKrissNeighborsHouseSignpost1Script: ; 0x7acf4 ; 0x7acf7 MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7ad24 - checkbit1 $0325 + checkbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE iftrue UnknownScript_0x7ad27 playmusic $001d loadfont @@ -35,7 +35,7 @@ MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 2writetext UnknownText_0x7ae9b pause 45 loadmovesprites - setbit1 $0325 + setbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE end ; 0x7ad24 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index df8ec978c..53920eede 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -11,7 +11,7 @@ KurtsHouse_MapScriptHeader: ; 0x18e14f ; 0x18e154 UnknownScript_0x18e154: ; 0x18e154 - checkbit1 $002b + checkbit1 EVENT_CLEARED_SLOWPOKE_WELL iffalse UnknownScript_0x18e177 checkbit1 $00c0 iftrue UnknownScript_0x18e177 @@ -38,7 +38,7 @@ KurtScript_0x18e178: ; 0x18e178 loadfont checkbit1 $0035 iftrue UnknownScript_0x18e1cc - checkbit1 $002b + checkbit1 EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18e1bf 2writetext UnknownText_0x18e473 closetext @@ -91,7 +91,7 @@ UnknownScript_0x18e1cc: ; 0x18e1cc iftrue UnknownScript_0x18e322 checkbit1 $025e iftrue UnknownScript_0x18e338 - checkbit1 $00be + checkbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT iftrue UnknownScript_0x18e34e UnknownScript_0x18e202: ; 0x18e202 checkbit1 $0001 @@ -317,7 +317,7 @@ UnknownScript_0x18e378: ; 0x18e378 closetext loadmovesprites setbit1 $00c0 - clearbit1 $00be + clearbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT clearbit1 $00bf special $006a pause 20 @@ -388,7 +388,7 @@ TwinScript_0x18e3ed: ; 0x18e3ed iftrue UnknownScript_0x18e420 checkbit1 $0030 iftrue UnknownScript_0x18e427 - checkbit1 $002b + checkbit1 EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18e419 checkbit1 $06fa iftrue UnknownScript_0x18e420 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 6e4e71be9..f11687473 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -42,7 +42,7 @@ UnknownScript_0x7001f: ; 0x7001f ; 0x70022 LanceScript_0x70022: ; 0x70022 - checkbit1 $0026 + checkbit1 EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue UnknownScript_0x70057 loadfont 2writetext UnknownText_0x70157 @@ -59,7 +59,7 @@ UnknownScript_0x70035: ; 0x70035 applymovement $2, MovementData_0x70155 disappear $2 clearbit1 $06d5 - setbit1 $0060 + setbit1 EVENT_DECIDED_TO_HELP_LANCE domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1 end ; 0x7004e @@ -68,7 +68,7 @@ UnknownScript_0x7004e: ; 0x7004e 2writetext UnknownText_0x70371 closetext loadmovesprites - setbit1 $0026 + setbit1 EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE end ; 0x70057 @@ -110,7 +110,7 @@ UnknownScript_0x7007a: ; 0x7007a GrampsScript_0x7008e: ; 0x7008e faceplayer loadfont - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x7009c 2writetext UnknownText_0x703f8 closetext @@ -140,7 +140,7 @@ MapLakeofRageSignpost0Script: ; 0x700a8 MapLakeofRageSignpost1Script: ; 0x700ab loadfont 2writetext UnknownText_0x70903 - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x700b8 closetext loadmovesprites @@ -273,21 +273,21 @@ CooltrainerfLoisScript: ; 0x70106 SuperNerdScript_0x7010e: ; 0x7010e faceplayer loadfont - checkbit1 $006b + checkbit1 EVENT_GOT_BLACKBELT_FROM_WESLEY iftrue UnknownScript_0x7013c checkcode $b if_not_equal WEDNESDAY, UnknownScript_0x70142 - checkbit1 $006a + checkbit1 EVENT_MET_WESLEY_OF_WEDNESDAY iftrue UnknownScript_0x70129 2writetext UnknownText_0x70784 keeptextopen - setbit1 $006a + setbit1 EVENT_MET_WESLEY_OF_WEDNESDAY UnknownScript_0x70129: ; 0x70129 2writetext UnknownText_0x707dd keeptextopen verbosegiveitem BLACKBELT, 1 iffalse UnknownScript_0x70140 - setbit1 $006b + setbit1 EVENT_GOT_BLACKBELT_FROM_WESLEY 2writetext UnknownText_0x7080b closetext loadmovesprites diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 783275c69..cc50000ec 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -9,13 +9,13 @@ LakeofRageHiddenPowerHouse_MapScriptHeader: ; 0x19a525 FisherScript_0x19a527: ; 0x19a527 faceplayer loadfont - checkbit1 $0058 + checkbit1 EVENT_GOT_TM10_HIDDEN_POWER iftrue UnknownScript_0x19a542 2writetext UnknownText_0x19a54b keeptextopen verbosegiveitem TM_10, 1 iffalse UnknownScript_0x19a546 - setbit1 $0058 + setbit1 EVENT_GOT_TM10_HIDDEN_POWER 2writetext UnknownText_0x19a5de closetext loadmovesprites diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index f044ef9dd..a89867a4d 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -13,7 +13,7 @@ FishingGuruScript_0x19a6ae: ; 0x19a6ae iftrue UnknownScript_0x19a6fe checkbit1 $0039 iftrue UnknownScript_0x19a6e0 - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19a6d7 checkbit1 $0038 iftrue UnknownScript_0x19a6d1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 4db16287d..30773e254 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -24,7 +24,7 @@ UnknownScript_0x180e3d: ; 0x180e3d ; 0x180e3e UnknownScript_0x180e3e: ; 0x180e3e - checkbit1 $0311 + checkbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180e48 changeblock $4, $16, $34 UnknownScript_0x180e48: ; 0x180e48 @@ -44,7 +44,7 @@ UnknownScript_0x180e53: ; 0x180e53 reloadmappart loadmovesprites dotrigger $1 - setbit1 $0311 + setbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED end ; 0x180e6a @@ -69,7 +69,7 @@ UnknownScript_0x180e7b: ; 0x180e7b startbattle reloadmapmusic returnafterbattle - setbit1 $05bc + setbit1 EVENT_BEAT_CHAMPION_LANCE loadfont 2writetext UnknownText_0x181132 closetext @@ -78,7 +78,7 @@ UnknownScript_0x180e7b: ; 0x180e7b changeblock $4, $0, $b reloadmappart loadmovesprites - setbit1 $0311 + setbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED musicfadeout $0038, $10 pause 30 showemote $0, $2, 15 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index d009b2f5e..8069343f2 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -23,7 +23,7 @@ GentlemanScript_0x7ee6c: ; 0x7ee6c loadfont checkbit2 $0003 iftrue .UnknownScript_0x7ee8e - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue .UnknownScript_0x7ee80 2writetext UnknownText_0x7effb closetext diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 91229efef..e1a7f591e 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -21,7 +21,7 @@ TeacherScript_0x7e6a6: ; 0x7e6a6 YoungsterScript_0x7e6a9: ; 0x7e6a9 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x7e6b7 2writetext UnknownText_0x7e779 closetext diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index ed98ad765..9356cdc84 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -9,7 +9,7 @@ MahoganyGym_MapScriptHeader: ; 0x199a9c PryceScript_0x199a9e: ; 0x199a9e faceplayer loadfont - checkbit1 $04c3 + checkbit1 EVENT_BEAT_PRYCE iftrue UnknownScript_0x199ac8 2writetext UnknownText_0x199b8d closetext @@ -18,7 +18,7 @@ PryceScript_0x199a9e: ; 0x199a9e loadtrainer PRYCE, 1 startbattle returnafterbattle - setbit1 $04c3 + setbit1 EVENT_BEAT_PRYCE loadfont 2writetext UnknownText_0x199d3b playsound $009c @@ -27,18 +27,18 @@ PryceScript_0x199a9e: ; 0x199a9e checkcode $7 2call UnknownScript_0x199af6 UnknownScript_0x199ac8: ; 0x199ac8 - checkbit1 $000e + checkbit1 EVENT_GOT_TM16_ICY_WIND iftrue UnknownScript_0x199af0 - setbit1 $0592 - setbit1 $0593 - setbit1 $040e - setbit1 $040f - setbit1 $0410 + setbit1 EVENT_BEAT_SKIER_ROXANNE + setbit1 EVENT_BEAT_SKIER_CLARISSA + setbit1 EVENT_BEAT_BOARDER_RONALD + setbit1 EVENT_BEAT_BOARDER_BRAD + setbit1 EVENT_BEAT_BOARDER_DOUGLAS 2writetext UnknownText_0x199d55 keeptextopen verbosegiveitem TM_16, 1 iffalse UnknownScript_0x199af4 - setbit1 $000e + setbit1 EVENT_GOT_TM16_ICY_WIND 2writetext UnknownText_0x199def closetext loadmovesprites @@ -215,7 +215,7 @@ BoarderDouglasScript: ; 0x199b61 MahoganyGymGuyScript: ; 0x199b69 faceplayer loadfont - checkbit1 $04c3 + checkbit1 EVENT_BEAT_PRYCE iftrue .MahoganyGymGuyWinScript 2writetext MahoganyGymGuyText closetext diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index c5ef6464a..a81b0bfa1 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -24,7 +24,7 @@ UnknownScript_0x6c357: ; 0x6c357 ; 0x6c35b UnknownScript_0x6c35b: ; 0x6c35b - checkbit1 $02e2 + checkbit1 EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART iftrue UnknownScript_0x6c362 return ; 0x6c362 @@ -37,7 +37,7 @@ UnknownScript_0x6c362: ; 0x6c362 PharmacistScript_0x6c367: ; 0x6c367 faceplayer loadfont - checkbit1 $0060 + checkbit1 EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c375 pokemart $0, $000f loadmovesprites @@ -54,7 +54,7 @@ UnknownScript_0x6c375: ; 0x6c375 BlackBeltScript_0x6c37b: ; 0x6c37b faceplayer loadfont - checkbit1 $0060 + checkbit1 EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c389 2writetext UnknownText_0x6c494 closetext @@ -99,7 +99,7 @@ UnknownScript_0x6c38f: ; 0x6c38f changeblock $6, $2, $1e reloadmappart loadmovesprites - setbit1 $02e2 + setbit1 EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART spriteface $4, $2 loadfont 2writetext UnknownText_0x6c5ba diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index a3ab060f0..89a51f4e0 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -42,7 +42,7 @@ UnknownScript_0x190013: ; 0x190013 PokefanMScript_0x19002e: ; 0x19002e faceplayer UnknownScript_0x19002f: ; 0x19002f - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x190039 2call UnknownScript_0x190040 end @@ -100,7 +100,7 @@ UnknownScript_0x190078: ; 0x190078 GrampsScript_0x19007e: ; 0x19007e faceplayer loadfont - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19008c 2writetext UnknownText_0x1901e5 closetext diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index f69abb947..6ffc2d3b8 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -9,9 +9,9 @@ ManiasHouse_MapScriptHeader: ; 0x9d276 RockerScript_0x9d278: ; 0x9d278 faceplayer loadfont - checkbit1 $0046 + checkbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM iftrue UnknownScript_0x9d2fa - checkbit1 $0045 + checkbit1 EVENT_GOT_SHUCKIE iftrue UnknownScript_0x9d2a4 2writetext UnknownText_0x9d303 yesorno @@ -25,7 +25,7 @@ RockerScript_0x9d278: ; 0x9d278 playsound $0091 waitbutton loadmovesprites - setbit1 $0045 + setbit1 EVENT_GOT_SHUCKIE end ; 0x9d2a4 @@ -64,7 +64,7 @@ UnknownScript_0x9d2bc: ; 0x9d2bc 2writetext UnknownText_0x9d4b1 closetext loadmovesprites - setbit1 $0046 + setbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end ; 0x9d2df @@ -79,7 +79,7 @@ UnknownScript_0x9d2e5: ; 0x9d2e5 2writetext UnknownText_0x9d4e3 closetext loadmovesprites - setbit1 $0046 + setbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end ; 0x9d2ee diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 44b3cf538..f3c760189 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -30,9 +30,9 @@ UnknownScript_0x7408e: ; 0x7408e 2writetext UnknownText_0x74105 closetext loadmovesprites - checkbit1 $001c + checkbit1 EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x740c3 - checkbit1 $001d + checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x740d3 winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 @@ -72,7 +72,7 @@ UnknownScript_0x740e3: ; 0x740e3 applymovement $2, MovementData_0x740fd disappear $2 dotrigger $1 - setbit1 $0319 + setbit1 EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end ; 0x740f9 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index c316904c3..02f12f2ee 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -9,7 +9,7 @@ MountMortarB1F_MapScriptHeader: ; 0x7e1f4 BlackBeltScript_0x7e1f6: ; 0x7e1f6 faceplayer loadfont - checkbit1 $0061 + checkbit1 EVENT_GOT_TYROGUE_FROM_KIYO iftrue UnknownScript_0x7e231 checkbit1 $04a9 iftrue UnknownScript_0x7e217 @@ -32,7 +32,7 @@ UnknownScript_0x7e217: ; 0x7e217 playsound $0002 waitbutton givepoke TYROGUE, 10, 0, 0 - setbit1 $0061 + setbit1 EVENT_GOT_TYROGUE_FROM_KIYO UnknownScript_0x7e231: ; 0x7e231 2writetext UnknownText_0x7e36a closetext diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 8b80af737..c3677dea2 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -36,7 +36,7 @@ UnknownScript_0x196e56: ; 0x196e56 playsound $0091 waitbutton itemnotify - setbit1 $001e + setbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON blackoutmod GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY 2writetext UnknownText_0x196feb keeptextopen @@ -56,7 +56,7 @@ GentlemanScript_0x196e97: ; 0x196e97 loadfont checkitem RED_SCALE iftrue UnknownScript_0x196eb0 - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196eaa 2writetext UnknownText_0x197134 closetext @@ -136,9 +136,9 @@ UnknownScript_0x196ec9: ; 0x196ec9 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 specialphonecall $2 clearbit1 $0702 - checkbit1 $001c + checkbit1 EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x196f49 - checkbit1 $001d + checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x196f4d setbit1 $0641 end diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 64f3fbfda..e760c3f99 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -9,13 +9,13 @@ MrPsychicsHouse_MapScriptHeader: ; 0x18a778 FishingGuruScript_0x18a77a: ; 0x18a77a faceplayer loadfont - checkbit1 $00e3 + checkbit1 EVENT_GOT_TM29_PSYCHIC iftrue UnknownScript_0x18a78f 2writetext UnknownText_0x18a798 keeptextopen verbosegiveitem TM_29, 1 iffalse UnknownScript_0x18a793 - setbit1 $00e3 + setbit1 EVENT_GOT_TM29_PSYCHIC UnknownScript_0x18a78f: ; 0x18a78f 2writetext UnknownText_0x18a7bb closetext diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 8a6c6335d..f11a8f429 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -17,13 +17,13 @@ PokefanFScript_0x5c005: ; 0x5c005 TeacherScript_0x5c008: ; 0x5c008 faceplayer loadfont - checkbit1 $0057 + checkbit1 EVENT_GOT_QUICK_CLAW iftrue UnknownScript_0x5c01d 2writetext UnknownText_0x5c265 keeptextopen verbosegiveitem QUICK_CLAW, 1 iffalse UnknownScript_0x5c021 - setbit1 $0057 + setbit1 EVENT_GOT_QUICK_CLAW UnknownScript_0x5c01d: ; 0x5c01d 2writetext UnknownText_0x5c30d closetext @@ -122,13 +122,13 @@ UnknownScript_0x5c088: ; 0x5c088 if_equal $1, UnknownScript_0x5c0b9 if_equal $0, UnknownScript_0x5c0bf UnknownScript_0x5c0a7: ; 0x5c0a7 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x5c0f3 UnknownScript_0x5c0ad: ; 0x5c0ad checkbit1 $0044 iftrue UnknownScript_0x5c0e6 UnknownScript_0x5c0b3: ; 0x5c0b3 - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5c0d9 UnknownScript_0x5c0b9: ; 0x5c0b9 checkbit2 $0047 @@ -271,11 +271,11 @@ PokefanfBeverly1Script: ; 0x5c138 iftrue UnknownScript_0x5c19b checkpoke MARILL iffalse UnknownScript_0x5c189 - checkbit1 $0261 + checkbit1 EVENT_SHOWED_BEVERLY_MARILL iftrue UnknownScript_0x5c160 2writetext UnknownText_0x5c5bd keeptextopen - setbit1 $0261 + setbit1 EVENT_SHOWED_BEVERLY_MARILL 2call UnknownScript_0x5c18f 2jump UnknownScript_0x5c163 ; 0x5c160 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 5d9afe0d2..e6e643abf 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -80,11 +80,11 @@ UnknownScript_0x1a8041: ; 0x1a8041 TeacherScript_0x1a806f: ; 0x1a806f faceplayer loadfont - checkbit1 $0040 + checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue UnknownScript_0x1a8095 - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x1a808f - checkbit1 $001a + checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x1a8089 2writetext UnknownText_0x1a80f7 closetext diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 417df164f..e5c31f9f5 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -9,12 +9,12 @@ OlivineCafe_MapScriptHeader: ; 0x9c8bf SailorScript_0x9c8c1: ; 0x9c8c1 faceplayer loadfont - checkbit1 $0013 + checkbit1 EVENT_GOT_HM04_STRENGTH iftrue UnknownScript_0x9c8d3 2writetext UnknownText_0x9c8df keeptextopen verbosegiveitem HM_04, 1 - setbit1 $0013 + setbit1 EVENT_GOT_HM04_STRENGTH UnknownScript_0x9c8d3: ; 0x9c8d3 2writetext UnknownText_0x9c965 closetext diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 181ec09b3..26d128460 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -9,7 +9,7 @@ OlivineGoodRodHouse_MapScriptHeader: ; 0x9c719 FishingGuruScript_0x9c71b: ; 0x9c71b faceplayer loadfont - checkbit1 $0018 + checkbit1 EVENT_GOT_GOOD_ROD iftrue UnknownScript_0x9c740 2writetext UnknownText_0x9c749 yesorno @@ -20,7 +20,7 @@ FishingGuruScript_0x9c71b: ; 0x9c71b 2writetext UnknownText_0x9c807 closetext loadmovesprites - setbit1 $0018 + setbit1 EVENT_GOT_GOOD_ROD end ; 0x9c73a diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index fad06da3f..df750359f 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -9,7 +9,7 @@ OlivineGym_MapScriptHeader: ; 0x9c12d JasmineScript_0x9c12f: ; 0x9c12f faceplayer loadfont - checkbit1 $04c1 + checkbit1 EVENT_BEAT_JASMINE iftrue UnknownScript_0x9c159 2writetext UnknownText_0x9c1b9 closetext @@ -18,7 +18,7 @@ JasmineScript_0x9c12f: ; 0x9c12f loadtrainer JASMINE, 1 startbattle returnafterbattle - setbit1 $04c1 + setbit1 EVENT_BEAT_JASMINE loadfont 2writetext UnknownText_0x9c33a playsound $009c @@ -27,13 +27,13 @@ JasmineScript_0x9c12f: ; 0x9c12f checkcode $7 2call UnknownScript_0x9c178 UnknownScript_0x9c159: ; 0x9c159 - checkbit1 $000d + checkbit1 EVENT_GOT_TM23_IRON_TAIL iftrue UnknownScript_0x9c172 2writetext UnknownText_0x9c354 keeptextopen verbosegiveitem TM_23, 1 iffalse UnknownScript_0x9c176 - setbit1 $000d + setbit1 EVENT_GOT_TM23_IRON_TAIL 2writetext UnknownText_0x9c3a5 closetext loadmovesprites @@ -64,9 +64,9 @@ UnknownScript_0x9c184: ; 0x9c184 OlivineGymGuyScript: ; 0x9c187 faceplayer - checkbit1 $04c1 + checkbit1 EVENT_BEAT_JASMINE iftrue .OlivineGymGuyWinScript - checkbit1 $0020 + checkbit1 EVENT_JASMINE_RETURNED_TO_GYM iffalse .OlivineGymGuyPreScript loadfont 2writetext OlivineGymGuyText diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index af121bc9d..defcbb4d6 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -90,13 +90,13 @@ UnknownScript_0x5afc7: ; 0x5afc7 if_equal $1, UnknownScript_0x5afee if_equal $0, UnknownScript_0x5aff4 UnknownScript_0x5afe2: ; 0x5afe2 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x5b01b UnknownScript_0x5afe8: ; 0x5afe8 checkbit1 $0044 iftrue UnknownScript_0x5b00e UnknownScript_0x5afee: ; 0x5afee - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5b001 UnknownScript_0x5aff4: ; 0x5aff4 loadtrainer SAILOR, HUEY1 @@ -130,7 +130,7 @@ UnknownScript_0x5b01b: ; 0x5b01b startbattle returnafterbattle clearbit2 $0066 - checkbit1 $0337 + checkbit1 EVENT_HUEY_PROTEIN iftrue UnknownScript_0x5b03f checkbit1 $0265 iftrue UnknownScript_0x5b03e @@ -151,7 +151,7 @@ UnknownScript_0x5b03f: ; 0x5b03f closetext verbosegiveitem PROTEIN, 1 iffalse UnknownScript_0x5b06f - clearbit1 $0337 + clearbit1 EVENT_HUEY_PROTEIN setbit1 $0265 2jump UnknownScript_0x5b05f ; 0x5b053 @@ -192,7 +192,7 @@ UnknownScript_0x5b06b: ; 0x5b06b ; 0x5b06f UnknownScript_0x5b06f: ; 0x5b06f - setbit1 $0337 + setbit1 EVENT_HUEY_PROTEIN jumpstd $0021 end ; 0x5b076 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index a6551b84f..6ecb4230d 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -64,7 +64,7 @@ UnknownScript_0x60bab: ; 0x60bab 2writetext UnknownText_0x60e6c closetext loadmovesprites - setbit1 $0020 + setbit1 EVENT_JASMINE_RETURNED_TO_GYM clearbit1 $06d3 checkcode $9 if_equal $0, UnknownScript_0x60c17 @@ -107,7 +107,7 @@ UnknownScript_0x60c39: ; 0x60c39 MonsterScript_0x60c3a: ; 0x60c3a faceplayer loadfont - checkbit1 $0020 + checkbit1 EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x60c51 2writetext UnknownText_0x60f03 writebyte AMPHAROS diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index c07301471..6819babd3 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -49,15 +49,15 @@ SailorScript_0x748c0: ; 0x748c0 iffalse UnknownScript_0x7490a clearbit1 $073a setbit1 $073b - clearbit1 $0557 - clearbit1 $0567 - clearbit1 $049b - clearbit1 $04b2 - clearbit1 $0445 - clearbit1 $0589 - clearbit1 $057b - clearbit1 $0459 - clearbit1 $04ac + clearbit1 EVENT_BEAT_COOLTRAINERM_SEAN + clearbit1 EVENT_BEAT_COOLTRAINERF_CAROL + clearbit1 EVENT_BEAT_GENTLEMAN_EDWARD + clearbit1 EVENT_BEAT_BEAUTY_CASSIE + clearbit1 EVENT_BEAT_PSYCHIC_RODNEY + clearbit1 EVENT_BEAT_SUPER_NERD_SHAWN + clearbit1 EVENT_BEAT_SAILOR_GARRETT + clearbit1 EVENT_BEAT_FISHER_JONAH + clearbit1 EVENT_BEAT_BLACKBELT_WAI UnknownScript_0x7490a: ; 0x7490a clearbit1 $002f appear $2 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 1db609539..5f41c2a05 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -26,12 +26,12 @@ BugCatcherScript_0x18c00c: ; 0x18c00c GrampsScript_0x18c00f: ; 0x18c00f faceplayer loadfont - checkbit1 $0079 + checkbit1 EVENT_GOT_SILVER_WING iftrue UnknownScript_0x18c023 2writetext UnknownText_0x18c0c6 keeptextopen verbosegiveitem SILVER_WING, 1 - setbit1 $0079 + setbit1 EVENT_GOT_SILVER_WING loadmovesprites end ; 0x18c023 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 608c6886c..427a77195 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -18,8 +18,8 @@ BrockScript_0x1a2864: ; 0x1a2864 loadtrainer BROCK, 1 startbattle returnafterbattle - setbit1 $04c5 - setbit1 $042b + setbit1 EVENT_BEAT_BROCK + setbit1 EVENT_BEAT_CAMPER_JERRY loadfont 2writetext UnknownText_0x1a2a3d playsound $009c @@ -70,7 +70,7 @@ CamperJerryScript: ; 0x1a28a4 PewterGymGuyScript: ; 0x1a28ac faceplayer loadfont - checkbit1 $04c5 + checkbit1 EVENT_BEAT_BROCK iftrue .PewterGymGuyWinScript 2writetext PewterGymGuyText closetext diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 63aa75f5c..6f9503fb6 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -77,7 +77,7 @@ UnknownScript_0x192895: ; 0x192895 ; 0x19289d LinkReceptionistScript_0x19289d: ; 0x19289d - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x19288d loadfont 2writetext UnknownText_0x192e3a @@ -190,7 +190,7 @@ UnknownScript_0x19294a: ; 0x19294a ; 0x192952 LinkReceptionistScript_0x192952: ; 0x192952 - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x192895 loadfont 2writetext UnknownText_0x192de0 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index ba8b2fe06..f2b4e8b62 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -9,9 +9,9 @@ PokemonFanClub_MapScriptHeader: ; 0x1917e7 GentlemanScript_0x1917e9: ; 0x1917e9 faceplayer loadfont - checkbit1 $00d4 + checkbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT iftrue UnknownScript_0x191815 - checkbit1 $00d3 + checkbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL iftrue UnknownScript_0x191802 2writetext UnknownText_0x191881 yesorno @@ -23,7 +23,7 @@ UnknownScript_0x191802: ; 0x191802 keeptextopen verbosegiveitem RARE_CANDY, 1 iffalse UnknownScript_0x19181f - setbit1 $00d4 + setbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT 2writetext UnknownText_0x191a72 closetext loadmovesprites @@ -52,9 +52,9 @@ ReceptionistScript_0x191821: ; 0x191821 FisherScript_0x191824: ; 0x191824 faceplayer loadfont - checkbit1 $00d2 + checkbit1 EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB iftrue UnknownScript_0x19185f - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x191838 2writetext UnknownText_0x191ba0 closetext @@ -64,7 +64,7 @@ FisherScript_0x191824: ; 0x191824 UnknownScript_0x191838: ; 0x191838 2writetext UnknownText_0x191bff - checkbit1 $00cf + checkbit1 EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM iftrue UnknownScript_0x191844 closetext loadmovesprites @@ -83,7 +83,7 @@ UnknownScript_0x191844: ; 0x191844 playsound $0091 waitbutton itemnotify - setbit1 $00d2 + setbit1 EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB loadmovesprites end ; 0x19185f diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 8fe259a32..9247de7a8 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -45,9 +45,9 @@ UnknownScript_0x188dc5: ; 0x188dc5 OfficerScript_0x188df5: ; 0x188df5 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e0f - checkbit1 $00ca + checkbit1 EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e09 2writetext UnknownText_0x188ee0 closetext @@ -72,7 +72,7 @@ UnknownScript_0x188e0f: ; 0x188e0f GymGuyScript_0x188e15: ; 0x188e15 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e23 2writetext UnknownText_0x188fcf closetext @@ -90,7 +90,7 @@ UnknownScript_0x188e23: ; 0x188e23 GymGuyScript_0x188e29: ; 0x188e29 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e37 2writetext UnknownText_0x189079 closetext @@ -108,7 +108,7 @@ UnknownScript_0x188e37: ; 0x188e37 OfficerScript_0x188e3d: ; 0x188e3d faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e4b 2writetext UnknownText_0x18910e closetext @@ -126,7 +126,7 @@ UnknownScript_0x188e4b: ; 0x188e4b GymGuyScript_0x188e51: ; 0x188e51 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e5f 2writetext UnknownText_0x1891c2 closetext @@ -144,18 +144,18 @@ UnknownScript_0x188e5f: ; 0x188e5f FisherScript_0x188e65: ; 0x188e65 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188eac checkitem MACHINE_PART iftrue UnknownScript_0x188e93 - checkbit1 $00ca + checkbit1 EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e8d 2writetext UnknownText_0x189264 closetext loadmovesprites - setbit1 $00ca + setbit1 EVENT_MET_MANAGER_AT_POWER_PLANT clearbit1 $076d - clearbit1 $00fb + clearbit1 EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1 dotrigger $1 end @@ -172,20 +172,20 @@ UnknownScript_0x188e93: ; 0x188e93 2writetext UnknownText_0x18936e keeptextopen takeitem MACHINE_PART, 1 - setbit1 $00c9 + setbit1 EVENT_RETURNED_MACHINE_PART clearbit1 $0772 setbit1 $0771 setbit1 $076c - setbit1 $00cd + setbit1 EVENT_RESTORED_POWER_TO_KANTO clearbit1 $0749 UnknownScript_0x188eac: ; 0x188eac - checkbit1 $00df + checkbit1 EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 2writetext UnknownText_0x1893c4 keeptextopen verbosegiveitem TM_07, 1 iffalse UnknownScript_0x188ec3 - setbit1 $00df + setbit1 EVENT_GOT_TM07_ZAP_CANNON 2writetext UnknownText_0x1893f4 closetext UnknownScript_0x188ec3: ; 0x188ec3 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 97c295dc4..cc9f529f8 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -170,7 +170,7 @@ BuenaScript_0x5d775: ; 0x5d775 loadfont checkbit2 $0013 iftrue UnknownScript_0x5d865 - checkbit1 $033d + checkbit1 EVENT_MET_BUENA iffalse UnknownScript_0x5d800 checkbit2 $0060 iftrue UnknownScript_0x5d82f @@ -231,7 +231,7 @@ UnknownScript_0x5d7be: ; 0x5d7be UnknownScript_0x5d800: ; 0x5d800 2writetext UnknownText_0x5dcf4 keeptextopen - setbit1 $033d + setbit1 EVENT_MET_BUENA verbosegiveitem BLUE_CARD, 1 UnknownScript_0x5d80a: ; 0x5d80a 2writetext UnknownText_0x5de10 @@ -239,7 +239,7 @@ UnknownScript_0x5d80a: ; 0x5d80a loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d81a - checkbit1 $033c + checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d81a: ; 0x5d81a spriteface $b, $3 @@ -263,7 +263,7 @@ UnknownScript_0x5d82f: ; 0x5d82f loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d83f - checkbit1 $033c + checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d83f: ; 0x5d83f spriteface $b, $3 @@ -303,7 +303,7 @@ UnknownScript_0x5d86b: ; 0x5d86b loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d87b - checkbit1 $029e + checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d87b: ; 0x5d87b spriteface $b, $3 @@ -316,7 +316,7 @@ UnknownScript_0x5d87f: ; 0x5d87f loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d88f - checkbit1 $029e + checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d88f: ; 0x5d88f spriteface $b, $3 @@ -329,7 +329,7 @@ UnknownScript_0x5d893: ; 0x5d893 loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d8a3 - checkbit1 $033c + checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d8a3: ; 0x5d8a3 end @@ -343,11 +343,11 @@ UnknownScript_0x5d8a4: ; 0x5d8a4 pause 15 spriteface $0, $1 pause 15 - checkbit1 $029e + checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc showemote $0, $b, 15 - setbit1 $029e - setbit1 $033c + setbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD + setbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER loadfont 2writetext UnknownText_0x5e1ee 2jump UnknownScript_0x5d8d0 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 4d6b7b71f..6037234c6 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -11,7 +11,7 @@ RadioTower3F_MapScriptHeader: ; 0x5e53e ; 0x5e543 UnknownScript_0x5e543: ; 0x5e543 - checkbit1 $0025 + checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e54a return ; 0x5e54a @@ -29,7 +29,7 @@ SuperNerdScript_0x5e553: ; 0x5e553 GymGuyScript_0x5e556: ; 0x5e556 faceplayer loadfont - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5e564 2writetext UnknownText_0x5e682 closetext @@ -47,11 +47,11 @@ UnknownScript_0x5e564: ; 0x5e564 CooltrainerFScript_0x5e56a: ; 0x5e56a faceplayer loadfont - checkbit1 $0047 + checkbit1 EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER iftrue UnknownScript_0x5e59d - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5e58a - checkbit1 $0025 + checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e584 2writetext UnknownText_0x5e754 closetext @@ -74,7 +74,7 @@ UnknownScript_0x5e58a: ; 0x5e58a 2writetext UnknownText_0x5e821 closetext loadmovesprites - setbit1 $0047 + setbit1 EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER end ; 0x5e59d @@ -206,7 +206,7 @@ MapRadioTower3FSignpost2Script: ; 0x5e5f3 loadfont 2writetext UnknownText_0x5eaa4 closetext - checkbit1 $0025 + checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e603 checkitem CARD_KEY iftrue UnknownScript_0x5e605 @@ -218,7 +218,7 @@ UnknownScript_0x5e603: ; 0x5e603 UnknownScript_0x5e605: ; 0x5e605 2writetext UnknownText_0x5eabc closetext - setbit1 $0025 + setbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound $001f changeblock $e, $2, $2a changeblock $e, $4, $1 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 85443e0f7..5300c23b2 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -13,9 +13,9 @@ FisherScript_0x5eb82: ; 0x5eb82 TeacherScript_0x5eb85: ; 0x5eb85 faceplayer loadfont - checkbit1 $0048 + checkbit1 EVENT_GOT_PINK_BOW_FROM_MARY iftrue UnknownScript_0x5ebac - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5eb99 2writetext UnknownText_0x5ec68 closetext @@ -31,7 +31,7 @@ UnknownScript_0x5eb99: ; 0x5eb99 2writetext UnknownText_0x5ecef closetext loadmovesprites - setbit1 $0048 + setbit1 EVENT_GOT_PINK_BOW_FROM_MARY end ; 0x5ebac diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 4f95cc170..4f0588598 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -54,7 +54,7 @@ UnknownScript_0x60011: ; 0x60011 GentlemanScript_0x60046: ; 0x60046 faceplayer loadfont - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x60054 2writetext UnknownText_0x60246 closetext @@ -122,7 +122,7 @@ UnknownScript_0x6006e: ; 0x6006e pause 15 special $0032 setbit1 $0571 - setbit1 $0021 + setbit1 EVENT_CLEARED_RADIO_TOWER clearbit2 $0013 setbit1 $06cc setbit1 $06cd @@ -148,7 +148,7 @@ UnknownScript_0x6006e: ; 0x6006e loadmovesprites dotrigger $2 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0 - setbit1 $0078 + setbit1 EVENT_GOT_CLEAR_BELL setbit1 $0761 2jump UnknownScript_0x600f1 ; 0x600f1 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index c52c06ffa..266fbb3c7 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -16,12 +16,12 @@ UnknownScript_0x19aea2: ; 0x19aea2 RedsMomScript_0x19aea3: ; 0x19aea3 faceplayer loadfont - checkbit1 $00cc + checkbit1 EVENT_MET_REDS_MOM iftrue UnknownScript_0x19aeb4 2writetext UnknownText_0x19aec0 closetext loadmovesprites - setbit1 $00cc + setbit1 EVENT_MET_REDS_MOM end ; 0x19aeb4 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 177781e77..c44e702b5 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -17,7 +17,7 @@ GentlemanScript_0x188bd7: ; 0x188bd7 GymGuyScript_0x188bda: ; 0x188bda faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188be8 2writetext UnknownText_0x188c26 closetext diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 063aece9a..33df4505a 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -9,7 +9,7 @@ Route12SuperRodHouse_MapScriptHeader: ; 0x7f482 FishingGuruScript_0x7f484: ; 0x7f484 faceplayer loadfont - checkbit1 $0019 + checkbit1 EVENT_GOT_SUPER_ROD iftrue UnknownScript_0x7f4a0 2writetext UnknownText_0x7f4af yesorno @@ -18,7 +18,7 @@ FishingGuruScript_0x7f484: ; 0x7f484 keeptextopen verbosegiveitem SUPER_ROD, 1 iffalse UnknownScript_0x7f4aa - setbit1 $0019 + setbit1 EVENT_GOT_SUPER_ROD UnknownScript_0x7f4a0: ; 0x7f4a0 2writetext UnknownText_0x7f57c closetext diff --git a/maps/Route25.asm b/maps/Route25.asm index 4b4b87435..9aa6a9a6e 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -280,13 +280,13 @@ CooltrainerMScript_0x19efac: ; 0x19efac loadfont checkbit1 $0558 iftrue UnknownScript_0x19efda - checkbit1 $00d8 + checkbit1 EVENT_CLEARED_NUGGET_BRIDGE iftrue UnknownScript_0x19efc7 2writetext UnknownText_0x19f43b keeptextopen verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x19efde - setbit1 $00d8 + setbit1 EVENT_CLEARED_NUGGET_BRIDGE UnknownScript_0x19efc7: ; 0x19efc7 2writetext UnknownText_0x19f49d closetext diff --git a/maps/Route26.asm b/maps/Route26.asm index d6507166c..29df4ac92 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -91,7 +91,7 @@ UnknownScript_0x1a4d79: ; 0x1a4d79 if_equal $1, UnknownScript_0x1a4d96 if_equal $0, UnknownScript_0x1a4d9c UnknownScript_0x1a4d90: ; 0x1a4d90 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a4db6 UnknownScript_0x1a4d96: ; 0x1a4d96 checkbit1 $0044 @@ -242,7 +242,7 @@ UnknownScript_0x1a4e35: ; 0x1a4e35 if_equal $1, UnknownScript_0x1a4e52 if_equal $0, UnknownScript_0x1a4e58 UnknownScript_0x1a4e4c: ; 0x1a4e4c - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a4e72 UnknownScript_0x1a4e52: ; 0x1a4e52 checkbit1 $0044 diff --git a/maps/Route27.asm b/maps/Route27.asm index a90d87176..5f5de922b 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -132,7 +132,7 @@ UnknownScript_0x1a08ff: ; 0x1a08ff if_equal $1, UnknownScript_0x1a091c if_equal $0, UnknownScript_0x1a0922 UnknownScript_0x1a0916: ; 0x1a0916 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a093c UnknownScript_0x1a091c: ; 0x1a091c checkbit1 $0044 @@ -334,7 +334,7 @@ UnknownScript_0x1a09e9: ; 0x1a09e9 if_equal $1, UnknownScript_0x1a0a06 if_equal $0, UnknownScript_0x1a0a0c UnknownScript_0x1a0a00: ; 0x1a0a00 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a0a26 UnknownScript_0x1a0a06: ; 0x1a0a06 checkbit1 $0044 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 2a2072d32..2de720eac 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -9,7 +9,7 @@ Route27SandstormHouse_MapScriptHeader: ; 0x7b392 GrannyScript_0x7b394: ; 0x7b394 faceplayer loadfont - checkbit1 $0075 + checkbit1 EVENT_GOT_TM37_SANDSTORM iftrue UnknownScript_0x7b3b7 special $0059 2writetext UnknownText_0x7b3c6 @@ -23,7 +23,7 @@ UnknownScript_0x7b3aa: ; 0x7b3aa keeptextopen verbosegiveitem TM_37, 1 iffalse UnknownScript_0x7b3bb - setbit1 $0075 + setbit1 EVENT_GOT_TM37_SANDSTORM UnknownScript_0x7b3b7: ; 0x7b3b7 2writetext UnknownText_0x7b48f closetext diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index fe897806b..3dc744a33 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -16,13 +16,13 @@ UnknownScript_0x1ae657: ; 0x1ae657 CooltrainerFScript_0x1ae658: ; 0x1ae658 faceplayer loadfont - checkbit1 $0074 + checkbit1 EVENT_GOT_TM47_STEEL_WING iftrue UnknownScript_0x1ae66f 2writetext UnknownText_0x1ae682 keeptextopen verbosegiveitem TM_47, 1 iffalse UnknownScript_0x1ae66d - setbit1 $0074 + setbit1 EVENT_GOT_TM47_STEEL_WING UnknownScript_0x1ae66d: ; 0x1ae66d loadmovesprites end diff --git a/maps/Route29.asm b/maps/Route29.asm index 14ee63449..a6f5e2e92 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -42,7 +42,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d showemote $0, $2, 15 applymovement $2, MovementData_0x1a108d spriteface $0, $2 - setbit1 $0041 + setbit1 EVENT_DUDE_TALKED_TO_YOU loadfont 2writetext UnknownText_0x1a10df yesorno @@ -59,7 +59,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d closetext loadmovesprites dotrigger $0 - setbit1 $0042 + setbit1 EVENT_LEARNED_TO_CATCH_POKEMON end ; 0x1a0fa3 @@ -68,7 +68,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 showemote $0, $2, 15 applymovement $2, MovementData_0x1a1094 spriteface $0, $2 - setbit1 $0041 + setbit1 EVENT_DUDE_TALKED_TO_YOU loadfont 2writetext UnknownText_0x1a10df yesorno @@ -85,7 +85,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 closetext loadmovesprites dotrigger $0 - setbit1 $0042 + setbit1 EVENT_LEARNED_TO_CATCH_POKEMON end ; 0x1a0fd9 @@ -112,9 +112,9 @@ CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1 loadfont checkcode $10 if_equal $0, UnknownScript_0x1a101c - checkbit1 $0042 + checkbit1 EVENT_LEARNED_TO_CATCH_POKEMON iftrue UnknownScript_0x1a101c - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x1a101c 2writetext UnknownText_0x1a11e3 yesorno @@ -126,7 +126,7 @@ CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1 2writetext UnknownText_0x1a114d closetext loadmovesprites - setbit1 $0042 + setbit1 EVENT_LEARNED_TO_CATCH_POKEMON end ; 0x1a101c @@ -180,21 +180,21 @@ UnknownScript_0x1a1043: ; 0x1a1043 TeacherScript_0x1a1049: ; 0x1a1049 faceplayer loadfont - checkbit1 $0065 + checkbit1 EVENT_GOT_PINK_BOW_FROM_TUSCANY iftrue UnknownScript_0x1a1077 checkcode $b if_not_equal TUESDAY, UnknownScript_0x1a107d - checkbit1 $0064 + checkbit1 EVENT_MET_TUSCANY_OF_TUESDAY iftrue UnknownScript_0x1a1064 2writetext UnknownText_0x1a13b2 keeptextopen - setbit1 $0064 + setbit1 EVENT_MET_TUSCANY_OF_TUESDAY UnknownScript_0x1a1064: ; 0x1a1064 2writetext UnknownText_0x1a142f keeptextopen verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x1a107b - setbit1 $0065 + setbit1 EVENT_GOT_PINK_BOW_FROM_TUSCANY 2writetext UnknownText_0x1a146f closetext loadmovesprites diff --git a/maps/Route30.asm b/maps/Route30.asm index 58eb0d93f..ddf2dffd4 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -88,7 +88,7 @@ UnknownScript_0x1a16ff: ; 0x1a16ff checkbit1 $0044 iftrue UnknownScript_0x1a174b UnknownScript_0x1a1705: ; 0x1a1705 - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a173e UnknownScript_0x1a170b: ; 0x1a170b checkbit2 $0047 @@ -137,7 +137,7 @@ UnknownScript_0x1a174b: ; 0x1a174b startbattle returnafterbattle clearbit2 $006b - checkbit1 $0338 + checkbit1 EVENT_JOEY_HP_UP iftrue UnknownScript_0x1a176f checkbit1 $0266 iftrue UnknownScript_0x1a176e @@ -158,7 +158,7 @@ UnknownScript_0x1a176f: ; 0x1a176f closetext verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x1a179f - clearbit1 $0338 + clearbit1 EVENT_JOEY_HP_UP setbit1 $0266 2jump UnknownScript_0x1a178f ; 0x1a1783 @@ -199,7 +199,7 @@ UnknownScript_0x1a179b: ; 0x1a179b ; 0x1a179f UnknownScript_0x1a179f: ; 0x1a179f - setbit1 $0338 + setbit1 EVENT_JOEY_HP_UP jumpstd $0021 end ; 0x1a17a6 @@ -270,7 +270,7 @@ Bug_catcherDonScript: ; 0x1a17ca YoungsterScript_0x1a17d2: ; 0x1a17d2 faceplayer loadfont - checkbit1 $001f + checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x1a17e0 2writetext UnknownText_0x1a1a6a closetext diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 0c9c59b5e..52437a0c9 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -9,13 +9,13 @@ Route30BerrySpeechHouse_MapScriptHeader: ; 0x196d62 PokefanMScript_0x196d64: ; 0x196d64 faceplayer loadfont - checkbit1 $0027 + checkbit1 EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE iftrue UnknownScript_0x196d79 2writetext UnknownText_0x196d82 keeptextopen verbosegiveitem BERRY, 1 iffalse UnknownScript_0x196d7d - setbit1 $0027 + setbit1 EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE UnknownScript_0x196d79: ; 0x196d79 2writetext UnknownText_0x196dec closetext diff --git a/maps/Route31.asm b/maps/Route31.asm index 34f03fc6d..0948f2464 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -11,7 +11,7 @@ Route31_MapScriptHeader: ; 0x1a5437 ; 0x1a543c UnknownScript_0x1a543c: ; 0x1a543c - checkbit1 $0040 + checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iffalse UnknownScript_0x1a5443 return ; 0x1a5443 @@ -84,7 +84,7 @@ UnknownScript_0x1a54b2: ; 0x1a54b2 checkbit1 $0044 iftrue UnknownScript_0x1a54fe UnknownScript_0x1a54b8: ; 0x1a54b8 - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a54f1 UnknownScript_0x1a54be: ; 0x1a54be checkbit2 $0049 @@ -138,13 +138,13 @@ UnknownScript_0x1a54fe: ; 0x1a54fe UnknownScript_0x1a5507: ; 0x1a5507 2call UnknownScript_0x1a5568 - checkbit1 $032b + checkbit1 EVENT_WADE_HAS_BERRY iftrue UnknownScript_0x1a5522 - checkbit1 $032c + checkbit1 EVENT_WADE_HAS_PSNCUREBERRY iftrue UnknownScript_0x1a552b - checkbit1 $032d + checkbit1 EVENT_WADE_HAS_PRZCUREBERRY iftrue UnknownScript_0x1a5534 - checkbit1 $032e + checkbit1 EVENT_WADE_HAS_BITTER_BERRY iftrue UnknownScript_0x1a553d UnknownScript_0x1a5522: ; 0x1a5522 verbosegiveitem BERRY, 1 @@ -224,9 +224,9 @@ UnknownScript_0x1a556c: ; 0x1a556c FisherScript_0x1a5570: ; 0x1a5570 faceplayer loadfont - checkbit1 $0053 + checkbit1 EVENT_GOT_TM50_NIGHTMARE iftrue UnknownScript_0x1a55af - checkbit1 $0050 + checkbit1 EVENT_GOT_KENYA iftrue UnknownScript_0x1a5584 2writetext UnknownText_0x1a56d9 closetext @@ -246,10 +246,10 @@ UnknownScript_0x1a5584: ; 0x1a5584 keeptextopen 2writetext UnknownText_0x1a57ba keeptextopen - setbit1 $0051 + setbit1 EVENT_GAVE_KENYA verbosegiveitem TM_50, 1 iffalse UnknownScript_0x1a55b3 - setbit1 $0053 + setbit1 EVENT_GOT_TM50_NIGHTMARE UnknownScript_0x1a55af: ; 0x1a55af 2writetext UnknownText_0x1a5896 closetext diff --git a/maps/Route32.asm b/maps/Route32.asm index 2651777e9..8a16abafe 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -43,11 +43,11 @@ CooltrainerMScript_0x19046f: ; 0x19046f faceplayer UnknownScript_0x190470: ; 0x190470 loadfont - checkbit1 $005d + checkbit1 EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 iftrue UnknownScript_0x1904a5 checkbit2 $001b iffalse UnknownScript_0x19049f - checkbit1 $002d + checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x19048f 2writetext UnknownText_0x1907ab closetext @@ -67,7 +67,7 @@ UnknownScript_0x19048f: ; 0x19048f keeptextopen verbosegiveitem MIRACLE_SEED, 1 iffalse UnknownScript_0x1904a9 - setbit1 $005d + setbit1 EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 2jump UnknownScript_0x1904a5 ; 0x19049f @@ -106,13 +106,13 @@ UnknownScript_0x1904ab: ; 0x1904ab FisherScript_0x1904ce: ; 0x1904ce faceplayer loadfont - checkbit1 $004e + checkbit1 EVENT_GOT_TM05_ROAR iftrue UnknownScript_0x1904e3 2writetext UnknownText_0x191133 keeptextopen verbosegiveitem TM_05, 1 iffalse UnknownScript_0x1904e7 - setbit1 $004e + setbit1 EVENT_GOT_TM05_ROAR UnknownScript_0x1904e3: ; 0x1904e3 2writetext UnknownText_0x19118c closetext @@ -266,7 +266,7 @@ UnknownScript_0x19057d: ; 0x19057d if_equal $1, UnknownScript_0x1905ae if_equal $0, UnknownScript_0x1905b4 UnknownScript_0x19059c: ; 0x19059c - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1905e8 UnknownScript_0x1905a2: ; 0x1905a2 checkbit1 $0044 @@ -453,10 +453,10 @@ UnknownScript_0x19068c: ; 0x19068c checkbit1 $0044 iftrue UnknownScript_0x1906d8 UnknownScript_0x190692: ; 0x190692 - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1906cb UnknownScript_0x190698: ; 0x190698 - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x1906be UnknownScript_0x19069e: ; 0x19069e checkbit2 $0048 @@ -630,21 +630,21 @@ Bird_keeperPeterScript: ; 0x190731 LassScript_0x190739: ; 0x190739 faceplayer loadfont - checkbit1 $0063 + checkbit1 EVENT_GOT_POISON_BARB_FROM_FRIEDA iftrue UnknownScript_0x190767 checkcode $b if_not_equal FRIDAY, UnknownScript_0x19076d - checkbit1 $0062 + checkbit1 EVENT_MET_FRIEDA_OF_FRIDAY iftrue UnknownScript_0x190754 2writetext UnknownText_0x1911c1 keeptextopen - setbit1 $0062 + setbit1 EVENT_MET_FRIEDA_OF_FRIDAY UnknownScript_0x190754: ; 0x190754 2writetext UnknownText_0x191204 keeptextopen verbosegiveitem POISON_BARB, 1 iffalse UnknownScript_0x19076b - setbit1 $0063 + setbit1 EVENT_GOT_POISON_BARB_FROM_FRIEDA 2writetext UnknownText_0x191222 closetext loadmovesprites diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 59adccc64..472b65c34 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -13,7 +13,7 @@ NurseScript_0x69b52: ; 0x69b52 FishingGuruScript_0x69b55: ; 0x69b55 faceplayer loadfont - checkbit1 $0017 + checkbit1 EVENT_GOT_OLD_ROD iftrue UnknownScript_0x69b7a 2writetext UnknownText_0x69b83 yesorno @@ -24,7 +24,7 @@ FishingGuruScript_0x69b55: ; 0x69b55 2writetext UnknownText_0x69c1b closetext loadmovesprites - setbit1 $0017 + setbit1 EVENT_GOT_OLD_ROD end ; 0x69b74 diff --git a/maps/Route33.asm b/maps/Route33.asm index cd81e5d19..fb3bd84bf 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -70,13 +70,13 @@ UnknownScript_0x1ac051: ; 0x1ac051 if_equal $1, UnknownScript_0x1ac082 if_equal $0, UnknownScript_0x1ac088 UnknownScript_0x1ac070: ; 0x1ac070 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1ac0bc UnknownScript_0x1ac076: ; 0x1ac076 checkbit1 $0044 iftrue UnknownScript_0x1ac0af UnknownScript_0x1ac07c: ; 0x1ac07c - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1ac0a2 UnknownScript_0x1ac082: ; 0x1ac082 checkbit2 $0047 diff --git a/maps/Route34.asm b/maps/Route34.asm index 4eee05525..8bdd35677 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -146,7 +146,7 @@ UnknownScript_0x780bd: ; 0x780bd if_equal $1, UnknownScript_0x780ee if_equal $0, UnknownScript_0x780f4 UnknownScript_0x780dc: ; 0x780dc - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x78128 UnknownScript_0x780e2: ; 0x780e2 checkbit1 $0044 @@ -303,13 +303,13 @@ UnknownScript_0x7819f: ; 0x7819f if_equal $1, UnknownScript_0x781d0 if_equal $0, UnknownScript_0x781d6 UnknownScript_0x781be: ; 0x781be - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x7820a UnknownScript_0x781c4: ; 0x781c4 checkbit1 $0044 iftrue UnknownScript_0x781fd UnknownScript_0x781ca: ; 0x781ca - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x781f0 UnknownScript_0x781d0: ; 0x781d0 checkbit2 $0049 @@ -560,7 +560,7 @@ TrainerCooltrainerfIrene: ; 0x782b8 CooltrainerfIreneScript: ; 0x782c4 talkaftercancel loadfont - checkbit1 $0070 + checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782d2 2writetext UnknownText_0x7877f closetext @@ -598,7 +598,7 @@ TrainerCooltrainerfJenn: ; 0x782d8 CooltrainerfJennScript: ; 0x782e4 talkaftercancel loadfont - checkbit1 $0070 + checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782f2 2writetext UnknownText_0x78836 closetext @@ -636,13 +636,13 @@ TrainerCooltrainerfKate: ; 0x782f8 CooltrainerfKateScript: ; 0x78304 talkaftercancel loadfont - checkbit1 $0070 + checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x78319 2writetext UnknownText_0x788e2 keeptextopen verbosegiveitem SOFT_SAND, 1 iffalse UnknownScript_0x7831d - setbit1 $0070 + setbit1 EVENT_GOT_SOFT_SAND_FROM_KATE UnknownScript_0x78319: ; 0x78319 2writetext UnknownText_0x7892b closetext diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 60da81b17..dc9a16e59 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -48,13 +48,13 @@ TeacherScript_0x62d63: ; 0x62d63 loadfont checkbit1 $00c0 iftrue UnknownScript_0x62d84 - checkbit1 $007a + checkbit1 EVENT_GOT_TM12_SWEET_SCENT iftrue UnknownScript_0x62d7e 2writetext UnknownText_0x62d9d keeptextopen verbosegiveitem TM_12, 1 iffalse UnknownScript_0x62d82 - setbit1 $007a + setbit1 EVENT_GOT_TM12_SWEET_SCENT UnknownScript_0x62d7e: ; 0x62d7e 2writetext UnknownText_0x62df6 closetext diff --git a/maps/Route35.asm b/maps/Route35.asm index 74f8d8741..713d2ecb5 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -292,7 +292,7 @@ UnknownScript_0x19c9bb: ; 0x19c9bb if_equal $1, UnknownScript_0x19c9ec if_equal $0, UnknownScript_0x19c9f2 UnknownScript_0x19c9da: ; 0x19c9da - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19ca26 UnknownScript_0x19c9e0: ; 0x19c9e0 checkbit1 $0044 diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index b67f859a5..0fbd6d2af 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -9,11 +9,11 @@ Route35Goldenrodgate_MapScriptHeader: ; 0x69d35 OfficerScript_0x69d37: ; 0x69d37 faceplayer loadfont - checkbit1 $0052 + checkbit1 EVENT_GOT_HP_UP_FROM_RANDY iftrue UnknownScript_0x69d92 - checkbit1 $0051 + checkbit1 EVENT_GAVE_KENYA iftrue UnknownScript_0x69d85 - checkbit1 $0050 + checkbit1 EVENT_GOT_KENYA iftrue UnknownScript_0x69d73 2writetext UnknownText_0x69ddd yesorno @@ -28,7 +28,7 @@ OfficerScript_0x69d37: ; 0x69d37 waitbutton givepoke SPEAROW, 10, 0, 1, GiftSpearowName, GiftSpearowOTName givepokeitem GiftSpearowMail - setbit1 $0050 + setbit1 EVENT_GOT_KENYA UnknownScript_0x69d73: ; 0x69d73 2writetext UnknownText_0x69ed6 closetext @@ -55,7 +55,7 @@ UnknownScript_0x69d85: ; 0x69d85 keeptextopen verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x69d96 - setbit1 $0052 + setbit1 EVENT_GOT_HP_UP_FROM_RANDY UnknownScript_0x69d92: ; 0x69d92 2writetext UnknownText_0x69fd9 closetext @@ -77,7 +77,7 @@ GiftSpearowOTName: ; 0x69dbf PokefanFScript_0x69dc6: ; 0x69dc6 faceplayer loadfont - checkbit1 $002a + checkbit1 EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x69dd4 2writetext UnknownText_0x6a00a closetext diff --git a/maps/Route36.asm b/maps/Route36.asm index a7525ea81..032135784 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -44,7 +44,7 @@ UnknownScript_0x19401b: ; 0x19401b spriteface $0, $0 pause 10 dotrigger $0 - clearbit1 $07ae + clearbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 end ; 0x19403c @@ -81,7 +81,7 @@ WateredWeirdTreeScript: ; 0x194053 loadmovesprites loadpokedata SUDOWOODO, 20 startbattle - setbit1 $002a + setbit1 EVENT_FOUGHT_SUDOWOODO if_equal $2, UnknownScript_0x19407b disappear $4 variablesprite $4, $26 @@ -137,9 +137,9 @@ UnknownScript_0x1940b3: ; 0x1940b3 FisherScript_0x1940b9: ; 0x1940b9 faceplayer loadfont - checkbit1 $004b + checkbit1 EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x1940da - checkbit1 $002a + checkbit1 EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940cd 2writetext UnknownText_0x19446f closetext @@ -152,7 +152,7 @@ UnknownScript_0x1940cd: ; 0x1940cd keeptextopen verbosegiveitem TM_08, 1 iffalse UnknownScript_0x1940de - setbit1 $004b + setbit1 EVENT_GOT_TM08_ROCK_SMASH UnknownScript_0x1940da: ; 0x1940da 2writetext UnknownText_0x19452c closetext @@ -164,7 +164,7 @@ UnknownScript_0x1940de: ; 0x1940de LassScript_0x1940e0: ; 0x1940e0 faceplayer loadfont - checkbit1 $002a + checkbit1 EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940ee 2writetext UnknownText_0x194626 closetext @@ -239,7 +239,7 @@ UnknownScript_0x194140: ; 0x194140 if_equal $1, UnknownScript_0x194171 if_equal $0, UnknownScript_0x194177 UnknownScript_0x19415f: ; 0x19415f - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1941ab UnknownScript_0x194165: ; 0x194165 checkbit1 $0044 @@ -384,21 +384,21 @@ PsychicMarkScript: ; 0x1941f9 YoungsterScript_0x194201: ; 0x194201 faceplayer loadfont - checkbit1 $0067 + checkbit1 EVENT_GOT_HARD_STONE_FROM_ARTHUR iftrue UnknownScript_0x19422f checkcode $b if_not_equal THURSDAY, UnknownScript_0x194235 - checkbit1 $0066 + checkbit1 EVENT_MET_ARTHUR_OF_THURSDAY iftrue UnknownScript_0x19421c 2writetext UnknownText_0x194800 keeptextopen - setbit1 $0066 + setbit1 EVENT_MET_ARTHUR_OF_THURSDAY UnknownScript_0x19421c: ; 0x19421c 2writetext UnknownText_0x19482d keeptextopen verbosegiveitem HARD_STONE, 1 iffalse UnknownScript_0x194233 - setbit1 $0067 + setbit1 EVENT_GOT_HARD_STONE_FROM_ARTHUR 2writetext UnknownText_0x194847 closetext loadmovesprites diff --git a/maps/Route37.asm b/maps/Route37.asm index f3ede525c..c70e38521 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -112,15 +112,15 @@ PsychicGregScript: ; 0x1a8db7 BugCatcherScript_0x1a8dbf: ; 0x1a8dbf faceplayer loadfont - checkbit1 $0069 + checkbit1 EVENT_GOT_MAGNET_FROM_SUNNY iftrue UnknownScript_0x1a8dfa checkcode $b if_not_equal SUNDAY, UnknownScript_0x1a8e00 - checkbit1 $0068 + checkbit1 EVENT_MET_SUNNY_OF_SUNDAY iftrue UnknownScript_0x1a8dda 2writetext UnknownText_0x1a8fc8 keeptextopen - setbit1 $0068 + setbit1 EVENT_MET_SUNNY_OF_SUNDAY UnknownScript_0x1a8dda: ; 0x1a8dda checkbit2 $0063 iftrue UnknownScript_0x1a8de7 @@ -135,7 +135,7 @@ UnknownScript_0x1a8de7: ; 0x1a8de7 UnknownScript_0x1a8deb: ; 0x1a8deb verbosegiveitem MAGNET, 1 iffalse UnknownScript_0x1a8dfe - setbit1 $0069 + setbit1 EVENT_GOT_MAGNET_FROM_SUNNY 2writetext UnknownText_0x1a905a closetext loadmovesprites diff --git a/maps/Route38.asm b/maps/Route38.asm index b22c26417..fd6a9ab6c 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -124,13 +124,13 @@ UnknownScript_0x1a1d82: ; 0x1a1d82 if_equal $1, UnknownScript_0x1a1db3 if_equal $0, UnknownScript_0x1a1db9 UnknownScript_0x1a1da1: ; 0x1a1da1 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a1ded UnknownScript_0x1a1da7: ; 0x1a1da7 checkbit1 $0044 iftrue UnknownScript_0x1a1de0 UnknownScript_0x1a1dad: ; 0x1a1dad - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a1dd3 UnknownScript_0x1a1db3: ; 0x1a1db3 checkbit2 $0045 @@ -295,13 +295,13 @@ UnknownScript_0x1a1e75: ; 0x1a1e75 if_equal $1, UnknownScript_0x1a1ea6 if_equal $0, UnknownScript_0x1a1eac UnknownScript_0x1a1e94: ; 0x1a1e94 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a1ee0 UnknownScript_0x1a1e9a: ; 0x1a1e9a checkbit1 $0044 iftrue UnknownScript_0x1a1ed3 UnknownScript_0x1a1ea0: ; 0x1a1ea0 - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a1ec6 UnknownScript_0x1a1ea6: ; 0x1a1ea6 checkbit2 $0049 diff --git a/maps/Route39.asm b/maps/Route39.asm index e454282af..ad255cd9b 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -45,11 +45,11 @@ PokefanmDerek1Script: ; 0x1a5b0b iftrue UnknownScript_0x1a5b6e checkpoke PIKACHU iffalse UnknownScript_0x1a5b5c - checkbit1 $028d + checkbit1 EVENT_SHOWED_DEREK_PIKACHU iftrue UnknownScript_0x1a5b33 2writetext UnknownText_0x1a5cf8 keeptextopen - setbit1 $028d + setbit1 EVENT_SHOWED_DEREK_PIKACHU 2call UnknownScript_0x1a5b62 2jump UnknownScript_0x1a5b36 ; 0x1a5b33 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index af20dd5c3..e937bcc0b 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -9,7 +9,7 @@ Route39Barn_MapScriptHeader: ; 0x9cc74 TwinScript_0x9cc76: ; 0x9cc76 faceplayer loadfont - checkbit1 $003d + checkbit1 EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cc87 2writetext UnknownText_0x9cd2e closetext @@ -29,7 +29,7 @@ UnknownScript_0x9cc87: ; 0x9cc87 TwinScript_0x9cc90: ; 0x9cc90 faceplayer loadfont - checkbit1 $003d + checkbit1 EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cca1 2writetext UnknownText_0x9cd2e closetext @@ -48,14 +48,14 @@ UnknownScript_0x9cca1: ; 0x9cca1 TaurosScript_0x9ccaa: ; 0x9ccaa loadfont - checkbit1 $003d + checkbit1 EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cd25 2writetext UnknownText_0x9cd70 writebyte MILTANK special $005f keeptextopen 2writetext UnknownText_0x9cd80 - checkbit1 $003f + checkbit1 EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO iftrue UnknownScript_0x9ccc6 closetext loadmovesprites @@ -109,7 +109,7 @@ UnknownScript_0x9cd04: ; 0x9cd04 2writetext UnknownText_0x9ce1b closetext loadmovesprites - setbit1 $003d + setbit1 EVENT_HEALED_MOOMOO end ; 0x9cd19 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 546f714c7..cef97e8da 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -9,12 +9,12 @@ Route39Farmhouse_MapScriptHeader: ; 0x9ceb2 PokefanMScript_0x9ceb4: ; 0x9ceb4 faceplayer loadfont - checkbit1 $003d + checkbit1 EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cec5 2writetext UnknownText_0x9cf38 closetext loadmovesprites - setbit1 $003f + setbit1 EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO end ; 0x9cec5 @@ -71,9 +71,9 @@ UnknownScript_0x9cf08: ; 0x9cf08 PokefanFScript_0x9cf0e: ; 0x9cf0e faceplayer loadfont - checkbit1 $003e + checkbit1 EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM iftrue UnknownScript_0x9cf2f - checkbit1 $003d + checkbit1 EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cf22 2writetext UnknownText_0x9d0f6 closetext @@ -86,7 +86,7 @@ UnknownScript_0x9cf22: ; 0x9cf22 keeptextopen verbosegiveitem TM_13, 1 iffalse UnknownScript_0x9cf33 - setbit1 $003e + setbit1 EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM UnknownScript_0x9cf2f: ; 0x9cf2f 2writetext UnknownText_0x9d1c7 closetext diff --git a/maps/Route40.asm b/maps/Route40.asm index eb5b5e82f..6b03735d1 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -164,21 +164,21 @@ StandingYoungsterScript_0x1a61d6: ; 0x1a61d6 BuenaScript_0x1a61d9: ; 0x1a61d9 faceplayer loadfont - checkbit1 $006f + checkbit1 EVENT_GOT_SHARP_BEAK_FROM_MONICA iftrue UnknownScript_0x1a6207 checkcode $b if_not_equal MONDAY, UnknownScript_0x1a620d - checkbit1 $006e + checkbit1 EVENT_MET_MONICA_OF_MONDAY iftrue UnknownScript_0x1a61f4 2writetext UnknownText_0x1a6606 keeptextopen - setbit1 $006e + setbit1 EVENT_MET_MONICA_OF_MONDAY UnknownScript_0x1a61f4: ; 0x1a61f4 2writetext UnknownText_0x1a6636 keeptextopen verbosegiveitem SHARP_BEAK, 1 iffalse UnknownScript_0x1a620b - setbit1 $006f + setbit1 EVENT_GOT_SHARP_BEAK_FROM_MONICA 2writetext UnknownText_0x1a666c closetext loadmovesprites diff --git a/maps/Route42.asm b/maps/Route42.asm index 0e48522fe..186e01268 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -26,7 +26,7 @@ UnknownScript_0x1a9218: ; 0x1a9218 disappear $a pause 10 dotrigger $0 - clearbit1 $07b0 + clearbit1 EVENT_SAW_SUICUNE_ON_ROUTE_36 domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $1 end ; 0x1a9233 @@ -90,13 +90,13 @@ UnknownScript_0x1a927f: ; 0x1a927f if_equal $1, UnknownScript_0x1a92a6 if_equal $0, UnknownScript_0x1a92ac UnknownScript_0x1a929a: ; 0x1a929a - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a92d3 UnknownScript_0x1a92a0: ; 0x1a92a0 checkbit1 $0044 iftrue UnknownScript_0x1a92c6 UnknownScript_0x1a92a6: ; 0x1a92a6 - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x1a92b9 UnknownScript_0x1a92ac: ; 0x1a92ac loadtrainer FISHER, TULLY1 diff --git a/maps/Route43.asm b/maps/Route43.asm index 6ccc95809..749bed109 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -11,7 +11,7 @@ Route43_MapScriptHeader: ; 0x19d04c ; 0x19d051 UnknownScript_0x19d051: ; 0x19d051 - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19d05c domaptrigger GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE, $0 return @@ -137,13 +137,13 @@ UnknownScript_0x19d0cf: ; 0x19d0cf if_equal $1, UnknownScript_0x19d0f6 if_equal $0, UnknownScript_0x19d0fc UnknownScript_0x19d0ea: ; 0x19d0ea - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d123 UnknownScript_0x19d0f0: ; 0x19d0f0 checkbit1 $0044 iftrue UnknownScript_0x19d116 UnknownScript_0x19d0f6: ; 0x19d0f6 - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19d109 UnknownScript_0x19d0fc: ; 0x19d0fc loadtrainer POKEMANIAC, BRENT1 @@ -305,11 +305,11 @@ PicnickerTiffany3Script: ; 0x19d17c iftrue UnknownScript_0x19d245 checkpoke CLEFAIRY iffalse UnknownScript_0x19d233 - checkbit1 $0293 + checkbit1 EVENT_SHOWED_TIFFANY_CLEFAIRY iftrue UnknownScript_0x19d1aa 2writetext UnknownText_0x19d618 keeptextopen - setbit1 $0293 + setbit1 EVENT_SHOWED_TIFFANY_CLEFAIRY 2call UnknownScript_0x19d239 2jump UnknownScript_0x19d1ad ; 0x19d1aa @@ -334,13 +334,13 @@ UnknownScript_0x19d1c1: ; 0x19d1c1 if_equal $1, UnknownScript_0x19d1e8 if_equal $0, UnknownScript_0x19d1ee UnknownScript_0x19d1dc: ; 0x19d1dc - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d215 UnknownScript_0x19d1e2: ; 0x19d1e2 checkbit1 $0044 iftrue UnknownScript_0x19d208 UnknownScript_0x19d1e8: ; 0x19d1e8 - checkbit1 $0021 + checkbit1 EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x19d1fb UnknownScript_0x19d1ee: ; 0x19d1ee loadtrainer PICNICKER, TIFFANY3 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index d70a8fdf8..f6947da9e 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -24,7 +24,7 @@ UnknownScript_0x19abc9: ; 0x19abc9 ; 0x19abca UnknownScript_0x19abca: ; 0x19abca - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19abd5 domaptrigger GROUP_ROUTE_43, MAP_ROUTE_43, $0 return @@ -124,13 +124,13 @@ RocketScript_0x19ac82: ; 0x19ac82 OfficerScript_0x19ac85: ; 0x19ac85 faceplayer loadfont - checkbit1 $0059 + checkbit1 EVENT_GOT_TM36_SLUDGE_BOMB iftrue UnknownScript_0x19ac9c 2writetext UnknownText_0x19ad9b keeptextopen verbosegiveitem TM_36, 1 iffalse UnknownScript_0x19aca0 - setbit1 $0059 + setbit1 EVENT_GOT_TM36_SLUDGE_BOMB loadmovesprites end ; 0x19ac9c diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index d7ae9dbb9..168e5a6d8 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -9,7 +9,7 @@ Route43MahoganyGate_MapScriptHeader: ; 0x19ab09 OfficerScript_0x19ab0b: ; 0x19ab0b faceplayer loadfont - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19ab19 2writetext UnknownText_0x19ab1f closetext diff --git a/maps/Route44.asm b/maps/Route44.asm index b4af61ca6..d94cccfbd 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -62,7 +62,7 @@ UnknownScript_0x19d86a: ; 0x19d86a if_equal $1, UnknownScript_0x19d887 if_equal $0, UnknownScript_0x19d88d UnknownScript_0x19d881: ; 0x19d881 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d8a7 UnknownScript_0x19d887: ; 0x19d887 checkbit1 $0044 @@ -90,7 +90,7 @@ UnknownScript_0x19d8a7: ; 0x19d8a7 startbattle returnafterbattle clearbit2 $0079 - checkbit1 $0339 + checkbit1 EVENT_VANCE_CARBOS iftrue UnknownScript_0x19d8cb checkbit1 $0267 iftrue UnknownScript_0x19d8ca @@ -111,7 +111,7 @@ UnknownScript_0x19d8cb: ; 0x19d8cb closetext verbosegiveitem CARBOS, 1 iffalse UnknownScript_0x19d903 - clearbit1 $0339 + clearbit1 EVENT_VANCE_CARBOS setbit1 $0267 2jump UnknownScript_0x19d8eb ; 0x19d8df @@ -162,7 +162,7 @@ UnknownScript_0x19d8ff: ; 0x19d8ff ; 0x19d903 UnknownScript_0x19d903: ; 0x19d903 - setbit1 $0339 + setbit1 EVENT_VANCE_CARBOS jumpstd $0021 end ; 0x19d90a @@ -259,7 +259,7 @@ UnknownScript_0x19d96e: ; 0x19d96e if_equal $1, UnknownScript_0x19d98b if_equal $0, UnknownScript_0x19d991 UnknownScript_0x19d985: ; 0x19d985 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d9ab UnknownScript_0x19d98b: ; 0x19d98b checkbit1 $0044 @@ -292,11 +292,11 @@ UnknownScript_0x19d9ab: ; 0x19d9ab UnknownScript_0x19d9b4: ; 0x19d9b4 2call UnknownScript_0x19d8fb - checkbit1 $032f + checkbit1 EVENT_WILTON_HAS_ULTRA_BALL iftrue UnknownScript_0x19d9c9 - checkbit1 $0330 + checkbit1 EVENT_WILTON_HAS_GREAT_BALL iftrue UnknownScript_0x19d9d2 - checkbit1 $0331 + checkbit1 EVENT_WILTON_HAS_POKE_BALL iftrue UnknownScript_0x19d9db UnknownScript_0x19d9c9: ; 0x19d9c9 verbosegiveitem ULTRA_BALL, 1 diff --git a/maps/Route45.asm b/maps/Route45.asm index a42c05485..f4468f997 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -134,7 +134,7 @@ UnknownScript_0x19e13b: ; 0x19e13b ; 0x19e13f UnknownScript_0x19e13f: ; 0x19e13f - setbit1 $033a + setbit1 EVENT_PARRY_IRON jumpstd $0021 end ; 0x19e146 @@ -258,7 +258,7 @@ UnknownScript_0x19e1b8: ; 0x19e1b8 if_equal $1, UnknownScript_0x19e1d5 if_equal $0, UnknownScript_0x19e1db UnknownScript_0x19e1cf: ; 0x19e1c - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19e1f5 UnknownScript_0x19e1d5: ; 0x19e1d5 checkbit1 $0044 @@ -286,7 +286,7 @@ UnknownScript_0x19e1f5: ; 0x19e1f5 startbattle returnafterbattle clearbit2 $007b - checkbit1 $033a + checkbit1 EVENT_PARRY_IRON iftrue UnknownScript_0x19e219 checkbit1 $0268 iftrue UnknownScript_0x19e218 @@ -307,7 +307,7 @@ UnknownScript_0x19e219: ; 0x19e219 closetext verbosegiveitem IRON, 1 iffalse UnknownScript_0x19e13f - clearbit1 $033a + clearbit1 EVENT_PARRY_IRON setbit1 $0268 2jump UnknownScript_0x19e127 ; 0x19e22d diff --git a/maps/Route46.asm b/maps/Route46.asm index d192a2275..2203faeba 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -91,7 +91,7 @@ UnknownScript_0x1a96da: ; 0x1a96da if_equal $1, UnknownScript_0x1a96f7 if_equal $0, UnknownScript_0x1a96fd UnknownScript_0x1a96f1: ; 0x1a96f1 - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a9717 UnknownScript_0x1a96f7: ; 0x1a96f7 checkbit1 $0044 @@ -119,7 +119,7 @@ UnknownScript_0x1a9717: ; 0x1a9717 startbattle returnafterbattle clearbit2 $007c - checkbit1 $033b + checkbit1 EVENT_ERIN_CALCIUM iftrue UnknownScript_0x1a973b checkbit1 $0269 iftrue UnknownScript_0x1a973a @@ -140,7 +140,7 @@ UnknownScript_0x1a973b: ; 0x1a973b closetext verbosegiveitem CALCIUM, 1 iffalse UnknownScript_0x1a976b - clearbit1 $033b + clearbit1 EVENT_ERIN_CALCIUM setbit1 $0269 2jump UnknownScript_0x1a975b ; 0x1a974f @@ -181,7 +181,7 @@ UnknownScript_0x1a9767: ; 0x1a9767 ; 0x1a976b UnknownScript_0x1a976b: ; 0x1a976b - setbit1 $033b + setbit1 EVENT_ERIN_CALCIUM jumpstd $002b end ; 0x1a9772 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 535fe4d6e..918c411d7 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -9,13 +9,13 @@ Route5CleanseTagSpeechHouse_MapScriptHeader: ; 0x18b632 GrannyScript_0x18b634: ; 0x18b634 faceplayer loadfont - checkbit1 $00db + checkbit1 EVENT_GOT_CLEANSE_TAG iftrue UnknownScript_0x18b649 2writetext UnknownText_0x18b655 keeptextopen verbosegiveitem CLEANSE_TAG, 1 iffalse UnknownScript_0x18b64d - setbit1 $00db + setbit1 EVENT_GOT_CLEANSE_TAG UnknownScript_0x18b649: ; 0x18b649 2writetext UnknownText_0x18b6a7 closetext diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 7ebb3b07e..380f9fbd8 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -16,7 +16,7 @@ UnknownScript_0x1926e9: ; 0x1926e9 OfficerScript_0x1926ea: ; 0x1926ea faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x1926f8 2writetext UnknownText_0x1926fe closetext diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 127cd2d32..0ded4568b 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -9,7 +9,7 @@ Route7SaffronGate_MapScriptHeader: ; 0x73516 OfficerScript_0x73518: ; 0x73518 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x73526 2writetext UnknownText_0x7352c closetext diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 514ea95e7..62739b4a9 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -15,7 +15,7 @@ RuinsofAlphAerodactylChamber_MapScriptHeader: ; 0x58da0 ; 0x58dad UnknownScript_0x58dad: ; 0x58dad - checkbit1 $0329 + checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58db4 end ; 0x58db4 @@ -30,7 +30,7 @@ UnknownScript_0x58db8: ; 0x58db8 ; 0x58db9 UnknownScript_0x58db9: ; 0x58db9 - checkbit1 $0329 + checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58dc3 changeblock $4, $0, $2e UnknownScript_0x58dc3: ; 0x58dc3 @@ -106,7 +106,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script: ; 0x58e2a ; 0x58e35 MapRuinsofAlphAerodactylChamberSignpost5Script: ; 0x58e35 - checkbit1 $0329 + checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58e46 loadfont 2writetext UnknownText_0x58e81 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index b860edc79..512f0a37c 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -16,7 +16,7 @@ RuinsofAlphHoOhChamber_MapScriptHeader: ; 0x58560 UnknownScript_0x5856d: ; 0x5856d special $008d - checkbit1 $0326 + checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58577 end ; 0x58577 @@ -31,7 +31,7 @@ UnknownScript_0x5857b: ; 0x5857b ; 0x5857c UnknownScript_0x5857c: ; 0x5857c - checkbit1 $0326 + checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58586 changeblock $4, $0, $2e UnknownScript_0x58586: ; 0x58586 @@ -107,7 +107,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script: ; 0x585ed ; 0x585f8 MapRuinsofAlphHoOhChamberSignpost5Script: ; 0x585f8 - checkbit1 $0326 + checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58609 loadfont 2writetext UnknownText_0x58644 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index eae1298a5..3ef70d6bd 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -28,7 +28,7 @@ UnknownScript_0x58f6e: ; 0x58f6e closetext loadmovesprites dotrigger $0 - setbit1 $002e + setbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS clearbit1 $078e end ; 0x58f7d diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index bfe05a7a0..b96862cc3 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -15,7 +15,7 @@ RuinsofAlphKabutoChamber_MapScriptHeader: ; 0x5871e ; 0x5872b UnknownScript_0x5872b: ; 0x5872b - checkbit1 $0327 + checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x58732 end ; 0x58732 @@ -33,7 +33,7 @@ UnknownScript_0x58736: ; 0x58736 ; 0x58737 UnknownScript_0x58737: ; 0x58737 - checkbit1 $0327 + checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x58741 changeblock $4, $0, $2e UnknownScript_0x58741: ; 0x58741 @@ -101,7 +101,7 @@ ScientistScript_0x587a8: ; 0x587a8 loadfont checkcode $e if_equal 26, UnknownScript_0x587cf - checkbit1 $0327 + checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587c9 checkbit1 $02a1 iffalse UnknownScript_0x587c0 @@ -147,7 +147,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script: ; 0x587db ; 0x587e6 MapRuinsofAlphKabutoChamberSignpost5Script: ; 0x587e6 - checkbit1 $0327 + checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587f7 loadfont 2writetext UnknownText_0x58ad9 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index f66ceed62..a904b7118 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -16,7 +16,7 @@ RuinsofAlphOmanyteChamber_MapScriptHeader: ; 0x58bdc UnknownScript_0x58be9: ; 0x58be9 special $0084 - checkbit1 $0328 + checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58bf3 end ; 0x58bf3 @@ -31,7 +31,7 @@ UnknownScript_0x58bf7: ; 0x58bf7 ; 0x58bf8 UnknownScript_0x58bf8: ; 0x58bf8 - checkbit1 $0328 + checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c02 changeblock $4, $0, $2e UnknownScript_0x58c02: ; 0x58c02 @@ -107,7 +107,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script: ; 0x58c69 ; 0x58c74 MapRuinsofAlphOmanyteChamberSignpost5Script: ; 0x58c74 - checkbit1 $0328 + checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c85 loadfont 2writetext UnknownText_0x58cc0 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 088f0dda9..4658d2d61 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -25,7 +25,7 @@ UnknownScript_0x5800e: ; 0x5800e UnknownScript_0x5800f: ; 0x5800f checkbit2 $000c iftrue UnknownScript_0x5802c - checkbit1 $002e + checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x5801e 2jump UnknownScript_0x5802c ; 0x5801e diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index b7dca96d7..0ab3ff03d 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -90,7 +90,7 @@ ScientistScript_0x591e5: ; 0x591e5 if_equal 26, UnknownScript_0x5920b checkbit2 $000c iftrue UnknownScript_0x59205 - checkbit1 $002e + checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x591ff 2writetext UnknownText_0x593ed closetext @@ -125,7 +125,7 @@ ScientistScript_0x59214: ; 0x59214 loadfont checkcode $e if_equal 26, UnknownScript_0x5922e - checkbit1 $002e + checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 2writetext UnknownText_0x5954f closetext diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index b912a31da..aac403aa0 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -9,12 +9,12 @@ SafariZoneWardensHome_MapScriptHeader: ; 0x1965c4 LassScript_0x1965c6: ; 0x1965c6 faceplayer loadfont - checkbit1 $00d9 + checkbit1 EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER iftrue UnknownScript_0x1965d7 2writetext UnknownText_0x1965e6 closetext loadmovesprites - setbit1 $00d9 + setbit1 EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER end ; 0x1965d7 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 265101997..5b045eff1 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -18,7 +18,7 @@ UnknownScript_0x199326: ; 0x199326 LassScript_0x19932a: ; 0x19932a faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199338 2writetext UnknownText_0x19938d closetext @@ -36,7 +36,7 @@ UnknownScript_0x199338: ; 0x199338 PokefanMScript_0x19933e: ; 0x19933e faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x19934c 2writetext UnknownText_0x199460 closetext @@ -62,7 +62,7 @@ CooltrainerFScript_0x199355: ; 0x199355 FisherScript_0x199358: ; 0x199358 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199366 2writetext UnknownText_0x1995fc closetext diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index f2ce9daa5..52499a2f7 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -18,11 +18,11 @@ SabrinaScript_0x189c2e: ; 0x189c2e loadtrainer SABRINA, 1 startbattle returnafterbattle - setbit1 $04ca - setbit1 $0590 - setbit1 $0591 - setbit1 $043b - setbit1 $0444 + setbit1 EVENT_BEAT_SABRINA + setbit1 EVENT_BEAT_MEDIUM_REBECCA + setbit1 EVENT_BEAT_MEDIUM_DORIS + setbit1 EVENT_BEAT_PSYCHIC_FRANKLIN + setbit1 EVENT_BEAT_PSYCHIC_JARED loadfont 2writetext UnknownText_0x189e95 playsound $009c @@ -160,7 +160,7 @@ PsychicJaredScript: ; 0x189cb3 SaffronGymGuyScript: ; 0x189cbb faceplayer loadfont - checkbit1 $04ca + checkbit1 EVENT_BEAT_SABRINA iftrue .SaffronGymGuyWinScript 2writetext SaffronGymGuyText closetext diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index f2ac5defa..41b028d5b 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x18a489: ; 0x18a489 FisherScript_0x18a48c: ; 0x18a48c faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a49a 2writetext UnknownText_0x18a5d3 closetext diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 3208e63b7..897f702d7 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -16,7 +16,7 @@ UnknownScript_0x18a81d: ; 0x18a81d OfficerScript_0x18a81e: ; 0x18a81e faceplayer loadfont - checkbit1 $00cd + checkbit1 EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x18a82c 2writetext UnknownText_0x18a8a9 closetext @@ -77,7 +77,7 @@ UnknownScript_0x18a862: ; 0x18a862 GymGuyScript_0x18a875: ; 0x18a875 faceplayer loadfont - checkbit1 $00c9 + checkbit1 EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a883 2writetext UnknownText_0x18a9ca closetext diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 618707efb..cd0405e3b 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -50,12 +50,12 @@ UnknownScript_0x1ab52b: ; 0x1ab52b SeafoamGymGuyScript: ; 0x1ab531 faceplayer loadfont - checkbit1 $00d5 + checkbit1 EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE iftrue .TalkedToSeafoamGymGuyScript 2writetext SeafoamGymGuyWinText closetext loadmovesprites - setbit1 $00d5 + setbit1 EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE end .TalkedToSeafoamGymGuyScript diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 72c5e2f88..614b3eb8d 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -13,13 +13,13 @@ ReceptionistScript_0x18abe5: ; 0x18abe5 OfficerScript_0x18abe8: ; 0x18abe8 faceplayer loadfont - checkbit1 $00de + checkbit1 EVENT_GOT_UP_GRADE iftrue UnknownScript_0x18abfd 2writetext UnknownText_0x18ac36 keeptextopen verbosegiveitem UP_GRADE, 1 iffalse UnknownScript_0x18ac01 - setbit1 $00de + setbit1 EVENT_GOT_UP_GRADE UnknownScript_0x18abfd: ; 0x18abfd 2writetext UnknownText_0x18aca8 closetext diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 0c3cda606..245bdbc29 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -81,7 +81,7 @@ GruntM1Script: ; 0x5a5f8 2writetext KurtLeaveSlowpokeWellText closetext loadmovesprites - setbit1 $002b + setbit1 EVENT_CLEARED_SLOWPOKE_WELL variablesprite $6, $4 domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 clearbit1 $06f3 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 9c6bb4bbf..45b3201fe 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -9,13 +9,13 @@ SlowpokeWellB2F_MapScriptHeader: ; 0x5ad09 GymGuyScript_0x5ad0b: ; 0x5ad0b faceplayer loadfont - checkbit1 $0073 + checkbit1 EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL iftrue UnknownScript_0x5ad22 2writetext UnknownText_0x5ad2a keeptextopen verbosegiveitem KINGS_ROCK, 1 iffalse UnknownScript_0x5ad20 - setbit1 $0073 + setbit1 EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL UnknownScript_0x5ad20: ; 0x5ad20 loadmovesprites end diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index df943fa56..0f935bb74 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -63,7 +63,7 @@ UnknownScript_0x184947: ; 0x184947 SageLiScript: ; 0x1849a6 faceplayer loadfont - checkbit1 $0014 + checkbit1 EVENT_GOT_HM05_FLASH iftrue UnknownScript_0x1849d1 2writetext SageLiSeenText closetext @@ -76,8 +76,8 @@ SageLiScript: ; 0x1849a6 2writetext UnknownText_0x184cc2 keeptextopen verbosegiveitem HM_05, 1 - setbit1 $0014 - setbit1 $0419 + setbit1 EVENT_GOT_HM05_FLASH + setbit1 EVENT_BEAT_SAGE_LI 2writetext UnknownText_0x184d13 closetext loadmovesprites diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 8039cd4d5..30b163509 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x6c65b: ; 0x6c65b ; 0x6c65e SecurityCamera1a: ; 0x6c65e - checkbit1 $02e4 + checkbit1 EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds checkbit1 $06da @@ -44,12 +44,12 @@ SecurityCamera1a: ; 0x6c65e applymovement $2, SecurityCameraMovement1 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 $02e4 + setbit1 EVENT_SECURITY_CAMERA_1 end ; 0x6c6a7 SecurityCamera1b: ; 0x6c6a7 - checkbit1 $02e4 + checkbit1 EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds checkbit1 $06da @@ -70,12 +70,12 @@ SecurityCamera1b: ; 0x6c6a7 applymovement $2, SecurityCameraMovement1 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 $02e4 + setbit1 EVENT_SECURITY_CAMERA_1 end ; 0x6c6f0 SecurityCamera2a: ; 0x6c6f0 - checkbit1 $02e5 + checkbit1 EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds checkbit1 $06da @@ -97,12 +97,12 @@ SecurityCamera2a: ; 0x6c6f0 applymovement $2, SecurityCameraMovement3 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 $02e5 + setbit1 EVENT_SECURITY_CAMERA_2 end ; 0x6c73c SecurityCamera2b: ; 0x6c73c - checkbit1 $02e5 + checkbit1 EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds checkbit1 $06da @@ -124,12 +124,12 @@ SecurityCamera2b: ; 0x6c73c applymovement $2, SecurityCameraMovement5 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 $02e5 + setbit1 EVENT_SECURITY_CAMERA_2 end ; 0x6c788 SecurityCamera3a: ; 0x6c788 - checkbit1 $02e6 + checkbit1 EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds checkbit1 $06da @@ -151,12 +151,12 @@ SecurityCamera3a: ; 0x6c788 applymovement $2, SecurityCameraMovement6 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 $02e6 + setbit1 EVENT_SECURITY_CAMERA_3 end ; 0x6c7d4 SecurityCamera3b: ; 0x6c7d4 - checkbit1 $02e6 + checkbit1 EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds checkbit1 $06da @@ -178,12 +178,12 @@ SecurityCamera3b: ; 0x6c7d4 applymovement $2, SecurityCameraMovement7 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 $02e6 + setbit1 EVENT_SECURITY_CAMERA_3 end ; 0x6c820 SecurityCamera4: ; 0x6c820 - checkbit1 $02e7 + checkbit1 EVENT_SECURITY_CAMERA_4 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds checkbit1 $06da @@ -205,12 +205,12 @@ SecurityCamera4: ; 0x6c820 applymovement $2, SecurityCameraMovement8 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 $02e7 + setbit1 EVENT_SECURITY_CAMERA_4 end ; 0x6c86c SecurityCamera5: ; 0x6c86c - checkbit1 $02e8 + checkbit1 EVENT_SECURITY_CAMERA_5 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds checkbit1 $06da @@ -232,7 +232,7 @@ SecurityCamera5: ; 0x6c86c applymovement $2, SecurityCameraMovement9 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 $02e8 + setbit1 EVENT_SECURITY_CAMERA_5 end ; 0x6c8b8 @@ -284,179 +284,179 @@ PlaySecurityCameraSounds: ; 0x6c8e3 ; 0x6c900 ExplodingTrap1: ; 0x6c900 - checkbit1 $02e9 + checkbit1 EVENT_EXPLODING_TRAP_1 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 $02e9 + setbit1 EVENT_EXPLODING_TRAP_1 end ExplodingTrap2: ; 0x6c90e - checkbit1 $02ea + checkbit1 EVENT_EXPLODING_TRAP_2 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 $02ea + setbit1 EVENT_EXPLODING_TRAP_2 end ExplodingTrap3: ; 0x6c91c - checkbit1 $02eb + checkbit1 EVENT_EXPLODING_TRAP_3 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 $02eb + setbit1 EVENT_EXPLODING_TRAP_3 end ExplodingTrap4: ; 0x6c92a - checkbit1 $02ec + checkbit1 EVENT_EXPLODING_TRAP_4 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 $02ec + setbit1 EVENT_EXPLODING_TRAP_4 end ExplodingTrap5: ; 0x6c938 - checkbit1 $02ed + checkbit1 EVENT_EXPLODING_TRAP_5 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 $02ed + setbit1 EVENT_EXPLODING_TRAP_5 end ExplodingTrap6: ; 0x6c946 - checkbit1 $02ee + checkbit1 EVENT_EXPLODING_TRAP_6 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 $02ee + setbit1 EVENT_EXPLODING_TRAP_6 end ExplodingTrap7: ; 0x6c954 - checkbit1 $02ef + checkbit1 EVENT_EXPLODING_TRAP_7 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 $02ef + setbit1 EVENT_EXPLODING_TRAP_7 end ExplodingTrap8: ; 0x6c962 - checkbit1 $02f0 + checkbit1 EVENT_EXPLODING_TRAP_8 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 $02f0 + setbit1 EVENT_EXPLODING_TRAP_8 end ExplodingTrap9: ; 0x6c970 - checkbit1 $02f1 + checkbit1 EVENT_EXPLODING_TRAP_9 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 $02f1 + setbit1 EVENT_EXPLODING_TRAP_9 end ExplodingTrap10: ; 0x6c97e - checkbit1 $02f2 + checkbit1 EVENT_EXPLODING_TRAP_10 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 $02f2 + setbit1 EVENT_EXPLODING_TRAP_10 end ExplodingTrap11: ; 0x6c98c - checkbit1 $02f3 + checkbit1 EVENT_EXPLODING_TRAP_11 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 $02f3 + setbit1 EVENT_EXPLODING_TRAP_11 end ExplodingTrap12: ; 0x6c99a - checkbit1 $02f4 + checkbit1 EVENT_EXPLODING_TRAP_12 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 $02f4 + setbit1 EVENT_EXPLODING_TRAP_12 end ExplodingTrap13: ; 0x6c9a8 - checkbit1 $02f5 + checkbit1 EVENT_EXPLODING_TRAP_13 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 $02f5 + setbit1 EVENT_EXPLODING_TRAP_13 end ExplodingTrap14: ; 0x6c9b6 - checkbit1 $02f6 + checkbit1 EVENT_EXPLODING_TRAP_14 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 $02f6 + setbit1 EVENT_EXPLODING_TRAP_14 end ExplodingTrap15: ; 0x6c9c4 - checkbit1 $02f7 + checkbit1 EVENT_EXPLODING_TRAP_15 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 $02f7 + setbit1 EVENT_EXPLODING_TRAP_15 end ExplodingTrap16: ; 0x6c9d2 - checkbit1 $02f8 + checkbit1 EVENT_EXPLODING_TRAP_16 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 $02f8 + setbit1 EVENT_EXPLODING_TRAP_16 end ExplodingTrap17: ; 0x6c9e0 - checkbit1 $02f9 + checkbit1 EVENT_EXPLODING_TRAP_17 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 $02f9 + setbit1 EVENT_EXPLODING_TRAP_17 end ExplodingTrap18: ; 0x6c9ee - checkbit1 $02fa + checkbit1 EVENT_EXPLODING_TRAP_18 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 $02fa + setbit1 EVENT_EXPLODING_TRAP_18 end ExplodingTrap19: ; 0x6c9fc - checkbit1 $02fb + checkbit1 EVENT_EXPLODING_TRAP_19 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 $02fb + setbit1 EVENT_EXPLODING_TRAP_19 end ExplodingTrap20: ; 0x6ca0a - checkbit1 $02fc + checkbit1 EVENT_EXPLODING_TRAP_20 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 $02fc + setbit1 EVENT_EXPLODING_TRAP_20 end ExplodingTrap21: ; 0x6ca18 - checkbit1 $02fd + checkbit1 EVENT_EXPLODING_TRAP_21 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 $02fd + setbit1 EVENT_EXPLODING_TRAP_21 end ExplodingTrap22: ; 0x6ca26 - checkbit1 $02fe + checkbit1 EVENT_EXPLODING_TRAP_22 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 $02fe + setbit1 EVENT_EXPLODING_TRAP_22 end VoltorbExplodingTrap: ; 0x6ca34 @@ -561,18 +561,18 @@ MapTeamRocketBaseB1FSignpost7Script: ; 0x6ca99 MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c loadfont - checkbit1 $02e3 + checkbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS iftrue UnknownScript_0x6cabe 2writetext UnknownText_0x6cdad playsound $0021 closetext loadmovesprites - setbit1 $02e3 - setbit1 $02e4 - setbit1 $02e5 - setbit1 $02e6 - setbit1 $02e7 - setbit1 $02e8 + setbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS + setbit1 EVENT_SECURITY_CAMERA_1 + setbit1 EVENT_SECURITY_CAMERA_2 + setbit1 EVENT_SECURITY_CAMERA_3 + setbit1 EVENT_SECURITY_CAMERA_4 + setbit1 EVENT_SECURITY_CAMERA_5 end ; 0x6cabe diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index c0ef3fa76..229dbddcc 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -33,7 +33,7 @@ UnknownScript_0x6cf88: ; 0x6cf88 ; 0x6cf89 UnknownScript_0x6cf89: ; 0x6cf89 - checkbit1 $0300 + checkbit1 EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER iftrue UnknownScript_0x6cf90 return ; 0x6cf90 @@ -349,7 +349,7 @@ UnknownScript_0x6d184: ; 0x6d184 2writetext UnknownText_0x6d809 keeptextopen verbosegiveitem HM_06, 1 - setbit1 $0015 + setbit1 EVENT_GOT_HM06_WHIRLPOOL 2writetext UnknownText_0x6d8f8 closetext loadmovesprites @@ -361,18 +361,18 @@ UnknownScript_0x6d184: ; 0x6d184 spriteface $0, $0 applymovement $4, MovementData_0x6d283 disappear $4 - setbit1 $0022 + setbit1 EVENT_CLEARED_ROCKET_HIDEOUT clearbit2 $000e setbit1 $06dc setbit1 $0757 dotrigger $3 clearbit1 $0735 - setbit1 $02e3 - setbit1 $02e4 - setbit1 $02e5 - setbit1 $02e6 - setbit1 $02e7 - setbit1 $02e8 + setbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS + setbit1 EVENT_SECURITY_CAMERA_1 + setbit1 EVENT_SECURITY_CAMERA_2 + setbit1 EVENT_SECURITY_CAMERA_3 + setbit1 EVENT_SECURITY_CAMERA_4 + setbit1 EVENT_SECURITY_CAMERA_5 end ; 0x6d1d7 @@ -384,7 +384,7 @@ MapTeamRocketBaseB2FSignpostPtr1: ; 0x6d1d7 MapTeamRocketBaseB2FSignpost1Script: ; 0x6d1db loadfont - checkbit1 $02ff + checkbit1 EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 2writetext UnknownText_0x6dd39 closetext @@ -399,14 +399,14 @@ UnknownScript_0x6d1e8: ; 0x6d1e8 changeblock $e, $c, $7 reloadmappart loadmovesprites - setbit1 $0300 + setbit1 EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER waitbutton end ; 0x6d1fa MapTeamRocketBaseB2FSignpost21Script: ; 0x6d1fa loadfont - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x6d207 2writetext UnknownText_0x6dda7 closetext diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 0fd031fdc..9e89313b5 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -125,7 +125,7 @@ MoltresScript_0x6e091: ; 0x6e091 2writetext UnknownText_0x6e585 closetext loadmovesprites - setbit1 $02ff + setbit1 EVENT_LEARNED_HAIL_GIOVANNI end ; 0x6e09b diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 2eb1a5a98..5f927fb36 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -26,7 +26,7 @@ UnknownScript_0x18502e: ; 0x18502e ; 0x18502f UnknownScript_0x18502f: ; 0x18502f - checkbit1 $0336 + checkbit1 EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x185047 checkbit1 $0044 iffalse UnknownScript_0x185050 @@ -35,7 +35,7 @@ UnknownScript_0x18502f: ; 0x18502f clearbit1 $07c5 setbit1 $07b6 UnknownScript_0x185047: ; 0x185047 - checkbit1 $0317 + checkbit1 EVENT_FOUGHT_HO_OH iffalse UnknownScript_0x18504f appear $5 UnknownScript_0x18504f: ; 0x18504f @@ -43,7 +43,7 @@ UnknownScript_0x18504f: ; 0x18504f ; 0x185050 UnknownScript_0x185050: ; 0x185050 - checkbit1 $0335 + checkbit1 EVENT_FOUGHT_SUICUNE iftrue UnknownScript_0x185077 appear $2 writebyte RAIKOU @@ -79,7 +79,7 @@ UnknownScript_0x185077: ; 0x185077 ; 0x185084 UnknownScript_0x185084: ; 0x185084 - checkbit1 $0336 + checkbit1 EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x18508e changeblock $a, $2, $9 UnknownScript_0x18508e: ; 0x18508e @@ -126,15 +126,15 @@ UnknownScript_0x1850d7: ; 0x1850d7 startbattle reloadmapmusic disappear $2 - setbit1 $0335 - setbit1 $07af + setbit1 EVENT_FOUGHT_SUICUNE + setbit1 EVENT_SAW_SUICUNE_ON_ROUTE_42 domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $0 - setbit1 $07b0 + setbit1 EVENT_SAW_SUICUNE_ON_ROUTE_36 domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $0 - setbit1 $07ae + setbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $0 dotrigger $1 - clearbit1 $07b7 + clearbit1 EVENT_SET_WHEN_FOUGHT_HO_OH returnafterbattle pause 20 spriteface $0, $0 @@ -186,7 +186,7 @@ SageScript_0x185179: ; 0x185179 ; 0x18517c SageScript_0x18517c: ; 0x18517c - checkbit1 $0317 + checkbit1 EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x185185 jumptextfaceplayer UnknownText_0x1855ee ; 0x185185 @@ -198,9 +198,9 @@ UnknownScript_0x185185: ; 0x185185 SageScript_0x185188: ; 0x185188 faceplayer loadfont - checkbit1 $0317 + checkbit1 EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x1851b6 - checkbit1 $0336 + checkbit1 EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x1851b0 2writetext UnknownText_0x185629 keeptextopen @@ -212,7 +212,7 @@ SageScript_0x185188: ; 0x185188 playsound $001b changeblock $a, $2, $20 reloadmappart - setbit1 $0336 + setbit1 EVENT_GOT_RAINBOW_WING loadmovesprites loadfont UnknownScript_0x1851b0: ; 0x1851b0 @@ -230,7 +230,7 @@ UnknownScript_0x1851b6: ; 0x1851b6 ; 0x1851bc SageScript_0x1851bc: ; 0x1851bc - checkbit1 $0317 + checkbit1 EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x1851c5 jumptextfaceplayer UnknownText_0x185654 ; 0x1851c5 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 409ffaa98..c30744c0b 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -11,7 +11,7 @@ TinTowerRoof_MapScriptHeader: ; 0x7722b ; 0x77230 UnknownScript_0x77230: ; 0x77230 - checkbit1 $0317 + checkbit1 EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x77241 checkitem RAINBOW_WING iftrue UnknownScript_0x7723e @@ -35,13 +35,13 @@ HoOhScript_0x77244: ; 0x77244 cry HO_OH pause 15 loadmovesprites - setbit1 $0317 + setbit1 EVENT_FOUGHT_HO_OH writecode $3, $a loadpokedata HO_OH, 60 startbattle disappear $2 returnafterbattle - setbit1 $07b7 + setbit1 EVENT_SET_WHEN_FOUGHT_HO_OH end ; 0x77260 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 8b9dbed3c..36b951d59 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -23,51 +23,51 @@ UnknownScript_0x7c9f6: ; 0x7c9f6 ; 0x7c9f7 UnknownScript_0x7c9f7: ; 0x7c9f7 - checkbit1 $02d7 + checkbit1 EVENT_SWITCH_4 iffalse UnknownScript_0x7ca01 changeblock $10, $6, $2d UnknownScript_0x7ca01: ; 0x7ca01 - checkbit1 $02d8 + checkbit1 EVENT_SWITCH_5 iffalse UnknownScript_0x7ca0b changeblock $a, $6, $2d UnknownScript_0x7ca0b: ; 0x7ca0b - checkbit1 $02d9 + checkbit1 EVENT_SWITCH_6 iffalse UnknownScript_0x7ca15 changeblock $2, $6, $2d UnknownScript_0x7ca15: ; 0x7ca15 - checkbit1 $02da + checkbit1 EVENT_SWITCH_7 iffalse UnknownScript_0x7ca1f changeblock $2, $a, $2d UnknownScript_0x7ca1f: ; 0x7ca15 - checkbit1 $02db + checkbit1 EVENT_SWITCH_8 iffalse UnknownScript_0x7ca29 changeblock $a, $a, $2d UnknownScript_0x7ca29: ; 0x7ca29 - checkbit1 $02dc + checkbit1 EVENT_SWITCH_9 iffalse UnknownScript_0x7ca33 changeblock $10, $a, $2d UnknownScript_0x7ca33: ; 0x7ca33 - checkbit1 $02dd + checkbit1 EVENT_SWITCH_10 iffalse UnknownScript_0x7ca41 changeblock $c, $6, $2a changeblock $c, $8, $2d UnknownScript_0x7ca41: ; 0x7ca41 - checkbit1 $02de + checkbit1 EVENT_SWITCH_11 iffalse UnknownScript_0x7ca4f changeblock $6, $6, $2a changeblock $6, $8, $2d UnknownScript_0x7ca4f: ; 0x7ca4f - checkbit1 $02df + checkbit1 EVENT_SWITCH_12 iffalse UnknownScript_0x7ca5d changeblock $c, $a, $2a changeblock $c, $c, $2d UnknownScript_0x7ca5d: ; 0x7ca5d - checkbit1 $02e0 + checkbit1 EVENT_SWITCH_13 iffalse UnknownScript_0x7ca6b changeblock $6, $a, $2a changeblock $6, $c, $2d UnknownScript_0x7ca6b: ; 0x7ca6b - checkbit1 $02e1 + checkbit1 EVENT_SWITCH_14 iffalse UnknownScript_0x7ca79 changeblock $12, $a, $2a changeblock $12, $c, $2d @@ -135,9 +135,9 @@ UnknownScript_0x7cae1: ; 0x7cae1 closetext loadmovesprites setbit1 $06c1 - checkbit1 $001c + checkbit1 EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x7cb09 - checkbit1 $001d + checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x7cb19 winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 setlasttalked $c @@ -355,7 +355,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost0Script: ; 0x7cbab loadfont 2writetext UnknownText_0x7d554 keeptextopen - checkbit1 $02d3 + checkbit1 EVENT_SWITCH_1 iftrue UnknownScript_0x7cbcb 2writetext UnknownText_0x7d617 yesorno @@ -363,7 +363,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost0Script: ; 0x7cbab copybytetovar UndergroundSwitchPositions addvar $1 copyvartobyte UndergroundSwitchPositions - setbit1 $02d3 + setbit1 EVENT_SWITCH_1 2jump UnknownScript_0x7cc8d ; 0x7cbcb @@ -374,7 +374,7 @@ UnknownScript_0x7cbcb: ; 0x7cbcb copybytetovar UndergroundSwitchPositions addvar -1 copyvartobyte UndergroundSwitchPositions - clearbit1 $02d3 + clearbit1 EVENT_SWITCH_1 2jump UnknownScript_0x7cc8d ; 0x7cbe0 @@ -382,7 +382,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost1Script: ; 0x7cbe0 loadfont 2writetext UnknownText_0x7d643 keeptextopen - checkbit1 $02d4 + checkbit1 EVENT_SWITCH_2 iftrue UnknownScript_0x7cc00 2writetext UnknownText_0x7d617 yesorno @@ -390,7 +390,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost1Script: ; 0x7cbe0 copybytetovar UndergroundSwitchPositions addvar $2 copyvartobyte UndergroundSwitchPositions - setbit1 $02d4 + setbit1 EVENT_SWITCH_2 2jump UnknownScript_0x7cc8d ; 0x7cc00 @@ -401,7 +401,7 @@ UnknownScript_0x7cc00: ; 0x7cc00 copybytetovar UndergroundSwitchPositions addvar -2 copyvartobyte UndergroundSwitchPositions - clearbit1 $02d4 + clearbit1 EVENT_SWITCH_2 2jump UnknownScript_0x7cc8d ; 0x7cc15 @@ -409,7 +409,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost2Script: ; 0x7cc15 loadfont 2writetext UnknownText_0x7d65a keeptextopen - checkbit1 $02d5 + checkbit1 EVENT_SWITCH_3 iftrue UnknownScript_0x7cc35 2writetext UnknownText_0x7d617 yesorno @@ -417,7 +417,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost2Script: ; 0x7cc15 copybytetovar UndergroundSwitchPositions addvar $3 copyvartobyte UndergroundSwitchPositions - setbit1 $02d5 + setbit1 EVENT_SWITCH_3 2jump UnknownScript_0x7cc8d ; 0x7cc35 @@ -428,7 +428,7 @@ UnknownScript_0x7cc35: ; 0x7cc35 copybytetovar UndergroundSwitchPositions addvar -3 copyvartobyte UndergroundSwitchPositions - clearbit1 $02d5 + clearbit1 EVENT_SWITCH_3 2jump UnknownScript_0x7cc8d ; 0x7cc4a @@ -436,17 +436,17 @@ MapUndergroundPathSwitchRoomEntrancesSignpost3Script: ; 0x7cc4a loadfont 2writetext UnknownText_0x7d671 keeptextopen - checkbit1 $02d6 + checkbit1 EVENT_EMERGENCY_SWITCH iftrue UnknownScript_0x7cc70 2writetext UnknownText_0x7d617 yesorno iffalse UnknownScript_0x7cc8b writebyte $7 copyvartobyte UndergroundSwitchPositions - setbit1 $02d6 - setbit1 $02d3 - setbit1 $02d4 - setbit1 $02d5 + setbit1 EVENT_EMERGENCY_SWITCH + setbit1 EVENT_SWITCH_1 + setbit1 EVENT_SWITCH_2 + setbit1 EVENT_SWITCH_3 2jump UnknownScript_0x7cc8d ; 0x7cc70 @@ -456,10 +456,10 @@ UnknownScript_0x7cc70: ; 0x7cc70 iffalse UnknownScript_0x7cc8b writebyte $0 copyvartobyte UndergroundSwitchPositions - clearbit1 $02d6 - clearbit1 $02d3 - clearbit1 $02d4 - clearbit1 $02d5 + clearbit1 EVENT_EMERGENCY_SWITCH + clearbit1 EVENT_SWITCH_1 + clearbit1 EVENT_SWITCH_2 + clearbit1 EVENT_SWITCH_3 2jump UnknownScript_0x7cc8d ; 0x7cc8b @@ -602,143 +602,143 @@ UnknownScript_0x7cd79: ; 0x7cd79 UnknownScript_0x7cda5: ; 0x7cda5 changeblock $10, $6, $2d - setbit1 $02d7 + setbit1 EVENT_SWITCH_4 end ; 0x7cdad UnknownScript_0x7cdad: ; 0x7cdad changeblock $a, $6, $2d - setbit1 $02d8 + setbit1 EVENT_SWITCH_5 end ; 0x7cdb5 UnknownScript_0x7cdb5: ; 0x7cdb5 changeblock $2, $6, $2d - setbit1 $02d9 + setbit1 EVENT_SWITCH_6 end ; 0x7cdbd UnknownScript_0x7cdbd: ; 0x7cdbd changeblock $2, $a, $2d - setbit1 $02da + setbit1 EVENT_SWITCH_7 end ; 0x7cdc5 UnknownScript_0x7cdc5: ; 0x7cdc5 changeblock $a, $a, $2d - setbit1 $02db + setbit1 EVENT_SWITCH_8 end ; 0x7cdcd UnknownScript_0x7cdcd: ; 0x7cdcd changeblock $10, $a, $2d - setbit1 $02dc + setbit1 EVENT_SWITCH_9 end ; 0x7cdd5 UnknownScript_0x7cdd5: ; 0x7cdd5 changeblock $c, $6, $2a changeblock $c, $8, $2d - setbit1 $02dd + setbit1 EVENT_SWITCH_10 end ; 0x7cde1 UnknownScript_0x7cde1: ; 0x7cde1 changeblock $6, $6, $2a changeblock $6, $8, $2d - setbit1 $02de + setbit1 EVENT_SWITCH_11 end ; 0x7cded UnknownScript_0x7cded: ; 0x7cded changeblock $c, $a, $2a changeblock $c, $c, $2d - setbit1 $02df + setbit1 EVENT_SWITCH_12 end ; 0x7cdf9 UnknownScript_0x7cdf9: ; 0x7cdf9 changeblock $6, $a, $2a changeblock $6, $c, $2d - setbit1 $02e0 + setbit1 EVENT_SWITCH_13 end ; 0x7ce05 UnknownScript_0x7ce05: ; 0x7ce05 changeblock $12, $a, $2a changeblock $12, $c, $2d - setbit1 $02e1 + setbit1 EVENT_SWITCH_14 end ; 0x7ce11 UnknownScript_0x7ce11: ; 0x7ce11 changeblock $10, $6, $3e - clearbit1 $02d7 + clearbit1 EVENT_SWITCH_4 end ; 0x7ce19 UnknownScript_0x7ce19: ; 0x7ce19 changeblock $a, $6, $3e - clearbit1 $02d8 + clearbit1 EVENT_SWITCH_5 end ; 0x7ce21 UnknownScript_0x7ce21: ; 0x7ce21 changeblock $2, $6, $3e - clearbit1 $02d9 + clearbit1 EVENT_SWITCH_6 end ; 0x7ce29 UnknownScript_0x7ce29: ; 0x7ce29 changeblock $2, $a, $3e - clearbit1 $02da + clearbit1 EVENT_SWITCH_7 end ; 0x7ce31 UnknownScript_0x7ce31: ; 0x7ce31 changeblock $a, $a, $3e - clearbit1 $02db + clearbit1 EVENT_SWITCH_8 end ; 0x7ce39 UnknownScript_0x7ce39: ; 0x7ce39 changeblock $10, $a, $3e - clearbit1 $02dc + clearbit1 EVENT_SWITCH_9 end ; 0x7ce41 UnknownScript_0x7ce41: ; 0x7ce41 changeblock $c, $6, $3f changeblock $c, $8, $3d - clearbit1 $02dd + clearbit1 EVENT_SWITCH_10 end ; 0x7ce4d UnknownScript_0x7ce4d: ; 0x7ce4d changeblock $6, $6, $3f changeblock $6, $8, $3d - clearbit1 $02de + clearbit1 EVENT_SWITCH_11 end ; 0x7ce59 UnknownScript_0x7ce59: ; 0x7ce59 changeblock $c, $a, $3f changeblock $c, $c, $3d - clearbit1 $02df + clearbit1 EVENT_SWITCH_12 end ; 0x7ce65 UnknownScript_0x7ce65: ; 0x7ce65 changeblock $6, $a, $3f changeblock $6, $c, $3d - clearbit1 $02e0 + clearbit1 EVENT_SWITCH_13 end ; 0x7ce71 UnknownScript_0x7ce71: ; 0x7ce71 changeblock $12, $a, $3f changeblock $12, $c, $3d - clearbit1 $02e1 + clearbit1 EVENT_SWITCH_14 end ; 0x7ce7d diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 43420ee05..f20f78273 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -11,21 +11,21 @@ UndergroundWarehouse_MapScriptHeader: ; 0x7d94b ; 0x7d950 UnknownScript_0x7d950: ; 0x7d950 - clearbit1 $02d3 - clearbit1 $02d4 - clearbit1 $02d5 - clearbit1 $02d6 - clearbit1 $02d7 - clearbit1 $02d8 - clearbit1 $02d9 - clearbit1 $02da - clearbit1 $02db - clearbit1 $02dc - clearbit1 $02dd - clearbit1 $02de - clearbit1 $02df - clearbit1 $02e0 - clearbit1 $02e1 + clearbit1 EVENT_SWITCH_1 + clearbit1 EVENT_SWITCH_2 + clearbit1 EVENT_SWITCH_3 + clearbit1 EVENT_EMERGENCY_SWITCH + clearbit1 EVENT_SWITCH_4 + clearbit1 EVENT_SWITCH_5 + clearbit1 EVENT_SWITCH_6 + clearbit1 EVENT_SWITCH_7 + clearbit1 EVENT_SWITCH_8 + clearbit1 EVENT_SWITCH_9 + clearbit1 EVENT_SWITCH_10 + clearbit1 EVENT_SWITCH_11 + clearbit1 EVENT_SWITCH_12 + clearbit1 EVENT_SWITCH_13 + clearbit1 EVENT_SWITCH_14 writebyte $0 copyvartobyte UndergroundSwitchPositions return diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index ef2aff882..69ba933e6 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -60,7 +60,7 @@ UnknownScript_0x1aa9ab: ; 0x1aa9ab loadpokedata SNORLAX, 50 startbattle disappear $6 - setbit1 $0750 + setbit1 EVENT_FOUGHT_SNORLAX returnafterbattle end ; 0x1aa9c2 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index c671d3571..1988a1588 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -18,10 +18,10 @@ SurgeScript_0x1920a5: ; 0x1920a5 loadtrainer LT_SURGE, 1 startbattle returnafterbattle - setbit1 $04c7 - setbit1 $049c - setbit1 $0494 - setbit1 $0497 + setbit1 EVENT_BEAT_LTSURGE + setbit1 EVENT_BEAT_GENTLEMAN_GREGORY + setbit1 EVENT_BEAT_GUITARIST_VINCENT + setbit1 EVENT_BEAT_JUGGLER_HORTON loadfont 2writetext UnknownText_0x192277 playsound $009c @@ -130,7 +130,7 @@ JugglerHortonScript: ; 0x192113 VermilionGymGuyScript: ; 0x19211b faceplayer loadfont - checkbit1 $04c7 + checkbit1 EVENT_BEAT_LTSURGE iftrue .VermilionGymGuyWinScript 2writetext VermilionGymGuyText closetext diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 0a10c04dc..4bf949b10 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -13,7 +13,7 @@ NurseScript_0x191603: ; 0x191603 FishingGuruScript_0x191606: ; 0x191606 faceplayer loadfont - checkbit1 $0750 + checkbit1 EVENT_FOUGHT_SNORLAX iftrue UnknownScript_0x191614 2writetext UnknownText_0x191620 closetext diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 86a55a1b8..c541f77b2 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -61,16 +61,16 @@ SailorScript_0x74dc4: ; 0x74dc4 waitbutton setbit1 $073a clearbit1 $073b - clearbit1 $04eb - clearbit1 $042f - clearbit1 $0540 - clearbit1 $0493 - clearbit1 $04d4 - clearbit1 $04dd - clearbit1 $057c - clearbit1 $05b7 - clearbit1 $0476 - clearbit1 $0477 + clearbit1 EVENT_BEAT_POKEMANIAC_ETHAN + clearbit1 EVENT_BEAT_BURGLAR_COREY + clearbit1 EVENT_BEAT_BUG_CATCHER_KEN + clearbit1 EVENT_BEAT_GUITARIST_CLYDE + clearbit1 EVENT_BEAT_POKEFANM_JEREMY + clearbit1 EVENT_BEAT_POKEFANF_GEORGIA + clearbit1 EVENT_BEAT_SAILOR_KENNETH + clearbit1 EVENT_BEAT_TEACHER_SHIRLEY + clearbit1 EVENT_BEAT_SCHOOLBOY_NATE + clearbit1 EVENT_BEAT_SCHOOLBOY_RICKY setbit1 $002f appear $2 domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 0109fcc92..86f94969c 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -57,9 +57,9 @@ UnknownScript_0x744d4: ; 0x744d4 closetext loadmovesprites setbit1 $06c2 - checkbit1 $001c + checkbit1 EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff - checkbit1 $001d + checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x7450f winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked $2 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 502daee05..9c4a862f2 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -9,7 +9,7 @@ VioletGym_MapScriptHeader: ; 0x683c0 FalknerScript_0x683c2: ; 0x683c2 faceplayer loadfont - checkbit1 $04bd + checkbit1 EVENT_BEAT_FALKNER iftrue UnknownScript_0x683ec 2writetext UnknownText_0x68473 closetext @@ -18,7 +18,7 @@ FalknerScript_0x683c2: ; 0x683c2 loadtrainer FALKNER, 1 startbattle returnafterbattle - setbit1 $04bd + setbit1 EVENT_BEAT_FALKNER loadfont 2writetext UnknownText_0x685af playsound $009c @@ -27,17 +27,17 @@ FalknerScript_0x683c2: ; 0x683c2 checkcode $7 2call UnknownScript_0x68418 UnknownScript_0x683ec: ; 0x683ec - checkbit1 $0008 + checkbit1 EVENT_GOT_TM31_MUD_SLAP iftrue UnknownScript_0x68412 - setbit1 $03fb - setbit1 $03fc + setbit1 EVENT_BEAT_BIRD_KEEPER_ROD + setbit1 EVENT_BEAT_BIRD_KEEPER_ABE domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2 specialphonecall $3 2writetext UnknownText_0x685c8 keeptextopen verbosegiveitem TM_31, 1 iffalse UnknownScript_0x68416 - setbit1 $0008 + setbit1 EVENT_GOT_TM31_MUD_SLAP 2writetext UnknownText_0x68648 closetext loadmovesprites @@ -127,7 +127,7 @@ Bird_keeperAbeScript: ; 0x68447 VioletGymGuyScript: ; 0x6844f faceplayer loadfont - checkbit1 $04bd + checkbit1 EVENT_BEAT_FALKNER iftrue .VioletGymGuyWinScript 2writetext VioletGymGuyText closetext diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 0ed13e26b..1fba9bb62 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -13,7 +13,7 @@ NurseScript_0x694c9: ; 0x694c9 ScientistScript_0x694cc: ; 0x694cc faceplayer loadfont - checkbit1 $002c + checkbit1 EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x6953a 2writetext UnknownText_0x69555 UnknownScript_0x694d7: ; 0x694d7 @@ -24,9 +24,9 @@ UnknownScript_0x694d7: ; 0x694d7 giveegg TOGEPI, 5 stringtotext .eggname, $1 2call UnknownScript_0x69527 - setbit1 $002d - clearbit1 $0701 - clearbit1 $0054 + setbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE + clearbit1 EVENT_ELMS_AIDE_IN_LAB + clearbit1 EVENT_TOGEPI_HATCHED domaptrigger GROUP_ROUTE_32, MAP_ROUTE_32, $1 2writetext UnknownText_0x695c5 closetext @@ -70,7 +70,7 @@ UnknownScript_0x69531: ; 0x69531 2writetext UnknownText_0x696f2 closetext loadmovesprites - setbit1 $002c + setbit1 EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE end ; 0x6953a diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 489208241..e16dad94c 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -55,13 +55,13 @@ UnknownScript_0x1a9a6f: ; 0x1a9a6f FisherScript_0x1a9a75: ; 0x1a9a75 faceplayer loadfont - checkbit1 $00e0 + checkbit1 EVENT_GOT_TM42_DREAM_EATER iftrue UnknownScript_0x1a9a8a 2writetext UnknownText_0x1a9cc4 keeptextopen verbosegiveitem TM_42, 1 iffalse UnknownScript_0x1a9a8e - setbit1 $00e0 + setbit1 EVENT_GOT_TM42_DREAM_EATER UnknownScript_0x1a9a8a: ; 0x1a9a8a 2writetext UnknownText_0x1a9d86 closetext diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 393940f7b..b8f733bb3 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -18,7 +18,7 @@ BlueScript_0x9aa26: ; 0x9aa26 loadtrainer BLUE, 1 startbattle returnafterbattle - setbit1 $04cc + setbit1 EVENT_BEAT_BLUE loadfont 2writetext UnknownText_0x9ac0f playsound $009c @@ -40,7 +40,7 @@ UnknownScript_0x9aa51: ; 0x9aa51 ViridianGymGuyScript: ; 0x9aa57 faceplayer loadfont - checkbit1 $04cc + checkbit1 EVENT_BEAT_BLUE iftrue .ViridianGymGuyWinScript 2writetext ViridianGymGuyText closetext diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index ad83746d1..ba083e7ff 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -15,28 +15,28 @@ WarehouseEntrance_MapScriptHeader: ; 0x7c038 ; 0x7c043 UnknownScript_0x7c043: ; 0x7c043 - clearbit1 $02d3 - clearbit1 $02d4 - clearbit1 $02d5 - clearbit1 $02d6 - clearbit1 $02d7 - clearbit1 $02d8 - clearbit1 $02d9 - clearbit1 $02da - clearbit1 $02db - clearbit1 $02dc - clearbit1 $02dd - clearbit1 $02de - clearbit1 $02df - clearbit1 $02e0 - clearbit1 $02e1 + clearbit1 EVENT_SWITCH_1 + clearbit1 EVENT_SWITCH_2 + clearbit1 EVENT_SWITCH_3 + clearbit1 EVENT_EMERGENCY_SWITCH + clearbit1 EVENT_SWITCH_4 + clearbit1 EVENT_SWITCH_5 + clearbit1 EVENT_SWITCH_6 + clearbit1 EVENT_SWITCH_7 + clearbit1 EVENT_SWITCH_8 + clearbit1 EVENT_SWITCH_9 + clearbit1 EVENT_SWITCH_10 + clearbit1 EVENT_SWITCH_11 + clearbit1 EVENT_SWITCH_12 + clearbit1 EVENT_SWITCH_13 + clearbit1 EVENT_SWITCH_14 writebyte $0 copyvartobyte UndergroundSwitchPositions return ; 0x7c076 UnknownScript_0x7c076: ; 0x7c076 - checkbit1 $0049 + checkbit1 EVENT_USED_BASEMENT_KEY iffalse UnknownScript_0x7c07d return ; 0x7c07d @@ -470,7 +470,7 @@ UnknownScript_0x7c2cd: ; 0x7c2cd MapWarehouseEntranceSignpost0Script: ; 0x7c2d6 loadfont - checkbit1 $0049 + checkbit1 EVENT_USED_BASEMENT_KEY iftrue UnknownScript_0x7c2fa checkitem BASEMENT_KEY iftrue UnknownScript_0x7c2e8 @@ -488,7 +488,7 @@ UnknownScript_0x7c2e8: ; 0x7c2e8 changeblock $12, $6, $2e reloadmappart loadmovesprites - setbit1 $0049 + setbit1 EVENT_USED_BASEMENT_KEY end ; 0x7c2fa diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 8b394ea22..1b002757b 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -11,7 +11,7 @@ WhirlIslandLugiaChamber_MapScriptHeader: ; 0x18c4ff ; 0x18c504 UnknownScript_0x18c504: ; 0x18c504 - checkbit1 $0318 + checkbit1 EVENT_FOUGHT_LUGIA iftrue UnknownScript_0x18c515 checkitem SILVER_WING iftrue UnknownScript_0x18c512 @@ -35,7 +35,7 @@ LugiaScript_0x18c518: ; 0x18c518 cry LUGIA pause 15 loadmovesprites - setbit1 $0318 + setbit1 EVENT_FOUGHT_LUGIA writecode $3, $a loadpokedata LUGIA, 60 startbattle diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index e59a1ac62..8089c469e 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -28,7 +28,7 @@ UnknownScript_0x1804cb: ; 0x1804cb iffalse UnknownScript_0x1804d5 changeblock $4, $e, $2a UnknownScript_0x1804d5: ; 0x1804d5 - checkbit1 $030a + checkbit1 EVENT_WILLS_ROOM_EXIT_OPEN iffalse UnknownScript_0x1804df changeblock $4, $2, $16 UnknownScript_0x1804df: ; 0x1804df @@ -70,7 +70,7 @@ WillScript_0x1804f8: ; 0x1804f8 changeblock $4, $2, $16 reloadmappart loadmovesprites - setbit1 $030a + setbit1 EVENT_WILLS_ROOM_EXIT_OPEN waitbutton end ; 0x180526 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 79dce2d5e..f99817aac 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -23,9 +23,9 @@ UnknownScript_0x98573: ; 0x98573 ; 0x98574 UnknownScript_0x98574: ; 0x98574 - checkbit1 $0335 + checkbit1 EVENT_FOUGHT_SUICUNE iftrue UnknownScript_0x98593 - checkbit1 $0334 + checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9858c checkitem CLEAR_BELL iftrue UnknownScript_0x9858c @@ -152,7 +152,7 @@ TrainerSageKoji: ; 0x985ec ; 0x985f8 SageKojiScript: ; 0x985f8 - checkbit1 $0334 + checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 showemote $0, $7, 20 @@ -164,7 +164,7 @@ SageKojiScript: ; 0x985f8 loadmovesprites applymovement $7, MovementData_0x98628 spriteface $7, $1 - setbit1 $0334 + setbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER dotrigger $1 end ; 0x9861b diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm new file mode 100644 index 000000000..ddd7b6e3a --- /dev/null +++ b/maps/blockdata_1.asm @@ -0,0 +1,308 @@ +Route32_BlockData: ; 0xa8000 + INCBIN "maps/Route32.blk" +; 0xa81c2 + +Route40_BlockData: ; 0xa81c2 + INCBIN "maps/Route40.blk" +; 0xa8276 + +Route36_BlockData: ; 0xa8276 + INCBIN "maps/Route36.blk" +; 0xa8384 + +Route44_BlockData: ; 0xa8384 + INCBIN "maps/Route44.blk" +; 0xa8492 + +Route28_BlockData: ; 0xa8492 + INCBIN "maps/Route28.blk" +; 0xa8546 + +BetaHerosHouse_BlockData: ; 0xa8546 + INCBIN "maps/BetaHerosHouse.blk" +; 0xa8552 + +CeladonCity_BlockData: ; 0xa8552 + INCBIN "maps/CeladonCity.blk" +; 0xa86ba + +SaffronCity_BlockData: ; 0xa86ba + INCBIN "maps/SaffronCity.blk" +; 0xa8822 + +Route2_BlockData: ; 0xa8822 + INCBIN "maps/Route2.blk" +; 0xa8930 + +ElmsHouse_BlockData: ; 0xa8930 + INCBIN "maps/ElmsHouse.blk" +; 0xa8940 + +BetaSproutTower1_BlockData: ; 0xa8940 + INCBIN "maps/BetaSproutTower1.blk" +; 0xa899a + +Route11_BlockData: ; 0xa899a + INCBIN "maps/Route11.blk" +; 0xa8a4e + +BetaSproutTower5_BlockData: ; 0xa8a4e + INCBIN "maps/BetaSproutTower5.blk" +; 0xa8aa8 + +Route15_BlockData: ; 0xa8aa8 + INCBIN "maps/Route15.blk" +; 0xa8b5c + +BetaSproutTower9_BlockData: ; 0xa8b5c + INCBIN "maps/BetaSproutTower9.blk" +; 0xa8b80 + +Route19_BlockData: ; 0xa8b80 + INCBIN "maps/Route19.blk" +; 0xa8c34 + +BetaBlackthornCity_BlockData: ; 0xa8c34 + INCBIN "maps/BetaBlackthornCity.blk" +; 0xa8d9c + +Route10South_BlockData: ; 0xa8d9c + INCBIN "maps/Route10South.blk" +; 0xa8df6 + +CinnabarPokeCenter2FBeta_BlockData: ; 0xa8df6 + INCBIN "maps/CinnabarPokeCenter2FBeta.blk" +; 0xa8e16 + +Route41_BlockData: ; 0xa8e16 + INCBIN "maps/Route41.blk" +; 0xa90b9 + +Route33_BlockData: ; 0xa90b9 + INCBIN "maps/Route33.blk" +; 0xa9113 + +Route45_BlockData: ; 0xa9113 + INCBIN "maps/Route45.blk" +; 0xa92d5 + +Route29_BlockData: ; 0xa92d5 + INCBIN "maps/Route29.blk" +; 0xa93e3 + +Route37_BlockData: ; 0xa93e3 + INCBIN "maps/Route37.blk" +; 0xa943d + +LavenderTown_BlockData: ; 0xa943d + INCBIN "maps/LavenderTown.blk" +; 0xa9497 + +PalletTown_BlockData: ; 0xa9497 + INCBIN "maps/PalletTown.blk" +; 0xa94f1 + +Route25_BlockData: ; 0xa94f1 + INCBIN "maps/Route25.blk" +; 0xa95ff + +Route24_BlockData: ; 0xa95ff + INCBIN "maps/Route24.blk" +; 0xa9659 + +BetaVioletCity_BlockData: ; 0xa9659 + INCBIN "maps/BetaVioletCity.blk" +; 0xa97c1 + +Route3_BlockData: ; 0xa97c1 + INCBIN "maps/Route3.blk" +; 0xa98cf + +PewterCity_BlockData: ; 0xa98cf + INCBIN "maps/PewterCity.blk" +; 0xa9a37 + +BetaIlexForest_BlockData: ; 0xa9a37 + INCBIN "maps/BetaIlexForest.blk" +; 0xa9b9f + +BetaSproutTower2_BlockData: ; 0xa9b9f + INCBIN "maps/BetaSproutTower2.blk" +; 0xa9bf9 + +Route12_BlockData: ; 0xa9bf9 + INCBIN "maps/Route12.blk" +; 0xa9d07 + +BetaGoldenrodCity_BlockData: ; 0xa9d07 + INCBIN "maps/BetaGoldenrodCity.blk" +; 0xa9e6f + +Route20_BlockData: ; 0xa9e6f + INCBIN "maps/Route20.blk" +; 0xa9f7d + +BetaSproutTower6_BlockData: ; 0xa9f7d + INCBIN "maps/BetaSproutTower6.blk" +; 0xa9fd7 + +BetaPokecenterMainHouse_BlockData: ; 0xa9fd7 + INCBIN "maps/BetaPokecenterMainHouse.blk" +; 0xa9ff7 + +Route30_BlockData: ; 0xa9ff7 + INCBIN "maps/Route30.blk" +; 0xaa105 + +Route26_BlockData: ; 0xaa105 + INCBIN "maps/Route26.blk" +; 0xaa321 + +Route42_BlockData: ; 0xaa321 + INCBIN "maps/Route42.blk" +; 0xaa42f + +Route34_BlockData: ; 0xaa42f + INCBIN "maps/Route34.blk" +; 0xaa53d + +Route46_BlockData: ; 0xaa53d + INCBIN "maps/Route46.blk" +; 0xaa5f1 + +FuchsiaCity_BlockData: ; 0xaa5f1 + INCBIN "maps/FuchsiaCity.blk" +; 0xaa759 + +Route38_BlockData: ; 0xaa759 + INCBIN "maps/Route38.blk" +; 0xaa80d + +BetaCianwoodCity_BlockData: ; 0xaa80d + INCBIN "maps/BetaCianwoodCity.blk" +; 0xaa867 + +OlivineVoltorbHouse_BlockData: ; 0xaa867 + INCBIN "maps/OlivineVoltorbHouse.blk" +; 0xaa877 + +SafariZoneFuchsiaGateBeta_BlockData: ; 0xaa877 + INCBIN "maps/SafariZoneFuchsiaGateBeta.blk" +; 0xaa88b + +BetaTeakCity_BlockData: ; 0xaa88b + INCBIN "maps/BetaTeakCity.blk" +; 0xaa9f3 + +BetaCherrygroveCity_BlockData: ; 0xaa9f3 + INCBIN "maps/BetaCherrygroveCity.blk" +; 0xaaa4d + +CinnabarIsland_BlockData: ; 0xaaa4d + INCBIN "maps/CinnabarIsland.blk" +; 0xaaaa7 + +Route4_BlockData: ; 0xaaaa7 + INCBIN "maps/Route4.blk" +; 0xaab5b + +Route8_BlockData: ; 0xaab5b + INCBIN "maps/Route8.blk" +; 0xaac0f + +BetaSproutTower3_BlockData: ; 0xaac0f + INCBIN "maps/BetaSproutTower3.blk" +; 0xaac69 + +ViridianCity_BlockData: ; 0xaac69 + INCBIN "maps/ViridianCity.blk" +; 0xaadd1 + +Route13_BlockData: ; 0xaadd1 + INCBIN "maps/Route13.blk" +; 0xaaedf + +Route21_BlockData: ; 0xaaedf + INCBIN "maps/Route21.blk" +; 0xaaf93 + +BetaSproutTower7_BlockData: ; 0xaaf93 + INCBIN "maps/BetaSproutTower7.blk" +; 0xaafed + +Route17_BlockData: ; 0xaafed + INCBIN "maps/Route17.blk" +; 0xab1af + +BetaMahoganyTown_BlockData: ; 0xab1af + INCBIN "maps/BetaMahoganyTown.blk" +; 0xab209 + +Route31_BlockData: ; 0xab209 + INCBIN "maps/Route31.blk" +; 0xab2bd + +Route27_BlockData: ; 0xab2bd + INCBIN "maps/Route27.blk" +; 0xab425 + +Route35_BlockData: ; 0xab425 + INCBIN "maps/Route35.blk" +; 0xab4d9 + +Route43_BlockData: ; 0xab4d9 + INCBIN "maps/Route43.blk" +; 0xab5e7 + +Route39_BlockData: ; 0xab5e7 + INCBIN "maps/Route39.blk" +; 0xab69b + +KrissHouse1F_BlockData: ; 0xab69b + INCBIN "maps/KrissHouse1F.blk" +; 0xab6af + +Route38EcruteakGate_BlockData: ; 0xab6af + INCBIN "maps/Route38EcruteakGate.blk" +; 0xab6c3 + +BetaAzaleaTown_BlockData: ; 0xab6c3 + INCBIN "maps/BetaAzaleaTown.blk" +; 0xab82b + +VermilionCity_BlockData: ; 0xab82b + INCBIN "maps/VermilionCity.blk" +; 0xab993 + +BetaOlivineCity_BlockData: ; 0xab993 + INCBIN "maps/BetaOlivineCity.blk" +; 0xabafb + +BetaNewBarkTown_BlockData: ; 0xabafb + INCBIN "maps/BetaNewBarkTown.blk" +; 0xabb55 + +ElmsLab_BlockData: ; 0xabb55 + INCBIN "maps/ElmsLab.blk" +; 0xabb73 + +CeruleanCity_BlockData: ; 0xabb73 + INCBIN "maps/CeruleanCity.blk" +; 0xabcdb + +Route1_BlockData: ; 0xabcdb + INCBIN "maps/Route1.blk" +; 0xabd8f + +Route5_BlockData: ; 0xabd8f + INCBIN "maps/Route5.blk" +; 0xabde9 + +Route9_BlockData: ; 0xabde9 + INCBIN "maps/Route9.blk" +; 0xabef7 + +Route22_BlockData: ; 0xabef7 + INCBIN "maps/Route22.blk" +; 0xabfab + diff --git a/maps/blockdata_2.asm b/maps/blockdata_2.asm new file mode 100644 index 000000000..6e0059d2a --- /dev/null +++ b/maps/blockdata_2.asm @@ -0,0 +1,552 @@ +Route14_BlockData: ; 0xac000 + INCBIN "maps/Route14.blk" +; 0xac0b4 + +BetaSproutTower8_BlockData: ; 0xac0b4 + INCBIN "maps/BetaSproutTower8.blk" +; 0xac10e + +OlivineMart_BlockData: ; 0xac10e + INCBIN "maps/OlivineMart.blk" +; 0xac126 + +Route10North_BlockData: ; 0xac126 + INCBIN "maps/Route10North.blk" +; 0xac180 + +BetaLakeOfRage_BlockData: ; 0xac180 + INCBIN "maps/BetaLakeOfRage.blk" +; 0xac2e8 + +OlivinePokeCenter1F_BlockData: ; 0xac2e8 + INCBIN "maps/OlivinePokeCenter1F.blk" +; 0xac2fc + +BetaPewterMuseumOfScience1F_BlockData: ; 0xac2fc + INCBIN "maps/BetaPewterMuseumOfScience1F.blk" +; 0xac324 + +BetaPewterMuseumOfScience2F_BlockData: ; 0xac324 + INCBIN "maps/BetaPewterMuseumOfScience2F.blk" +; 0xac340 + +EarlsPokemonAcademy_BlockData: ; 0xac340 + INCBIN "maps/EarlsPokemonAcademy.blk" +; 0xac360 + +BetaCinnabarIslandPokemonLabHallway_BlockData: ; 0xac360 + INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk" +; 0xac384 + +BetaCinnabarIslandPokemonLabRoom1_BlockData: ; 0xac384 + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk" +; 0xac394 + +BetaCinnabarIslandPokemonLabRoom2_BlockData: ; 0xac394 + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk" +; 0xac3a4 + +BetaCinnabarIslandPokemonLabRoom3_BlockData: ; 0xac3a4 + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk" +; 0xac3b4 + +GoldenrodDeptStore1F_BlockData: ; 0xac3b4 + INCBIN "maps/GoldenrodDeptStore1F.blk" +; 0xac3d4 + +GoldenrodDeptStore2F_BlockData: ; 0xac3d4 + INCBIN "maps/GoldenrodDeptStore2F.blk" +; 0xac3f4 + +GoldenrodDeptStore3F_BlockData: ; 0xac3f4 + INCBIN "maps/GoldenrodDeptStore3F.blk" +; 0xac414 + +GoldenrodDeptStore4F_BlockData: ; 0xac414 + INCBIN "maps/GoldenrodDeptStore4F.blk" +; 0xac434 + +GoldenrodDeptStore5F_BlockData: ; 0xac434 + INCBIN "maps/GoldenrodDeptStore5F.blk" +; 0xac454 + +GoldenrodDeptStore6F_BlockData: ; 0xac454 + INCBIN "maps/GoldenrodDeptStore6F.blk" +; 0xac474 + +GoldenrodDeptStoreElevator_BlockData: ; 0xac474 + INCBIN "maps/GoldenrodDeptStoreElevator.blk" +; 0xac478 + +CeladonMansion1F_BlockData: ; 0xac478 + INCBIN "maps/CeladonMansion1F.blk" +; 0xac48c + +CeladonMansion2F_BlockData: ; 0xac48c + INCBIN "maps/CeladonMansion2F.blk" +; 0xac4a0 + +CeladonMansion3F_BlockData: ; 0xac4a0 + INCBIN "maps/CeladonMansion3F.blk" +; 0xac4b4 + +CeladonMansionRoof_BlockData: ; 0xac4b4 + INCBIN "maps/CeladonMansionRoof.blk" +; 0xac4c8 + +BetaHouse_BlockData: ; 0xac4c8 + INCBIN "maps/BetaHouse.blk" +; 0xac4d8 + +CeladonGameCorner_BlockData: ; 0xac4d8 + INCBIN "maps/CeladonGameCorner.blk" +; 0xac51e + +CeladonGameCornerPrizeRoom_BlockData: ; 0xac51e + INCBIN "maps/CeladonGameCornerPrizeRoom.blk" +; 0xac527 + +Colosseum_BlockData: ; 0xac527 + INCBIN "maps/Colosseum.blk" +; 0xac53b + +TradeCenter_BlockData: ; 0xac53b + INCBIN "maps/TradeCenter.blk" +; 0xac54f + +EcruteakLugiaSpeechHouse_BlockData: ; 0xac54f + INCBIN "maps/EcruteakLugiaSpeechHouse.blk" +; 0xac55f + +BetaCave_BlockData: ; 0xac55f + INCBIN "maps/BetaCave.blk" +; 0xac5b9 + +UnionCaveB1F_BlockData: ; 0xac5b9 + INCBIN "maps/UnionCaveB1F.blk" +; 0xac66d + +UnionCaveB2F_BlockData: ; 0xac66d + INCBIN "maps/UnionCaveB2F.blk" +; 0xac721 + +UnionCave1F_BlockData: ; 0xac721 + INCBIN "maps/UnionCave1F.blk" +; 0xac7d5 + +NationalPark_BlockData: ; 0xac7d5 + INCBIN "maps/NationalPark.blk" +; 0xac9f1 + +Route6UndergroundEntrance_BlockData: ; 0xac9f1 + INCBIN "maps/Route6UndergroundEntrance.blk" +; 0xaca01 + +BetaPokecenterTradeStation_BlockData: ; 0xaca01 + INCBIN "maps/BetaPokecenterTradeStation.blk" +; 0xaca11 + +KurtsHouse_BlockData: ; 0xaca11 + INCBIN "maps/KurtsHouse.blk" +; 0xaca31 + +GoldenrodMagnetTrainStation_BlockData: ; 0xaca31 + INCBIN "maps/GoldenrodMagnetTrainStation.blk" +; 0xaca8b + +RuinsofAlphOutside_BlockData: ; 0xaca8b + INCBIN "maps/RuinsofAlphOutside.blk" +; 0xacb3f + +BetaAlphRuinUnsolvedPuzzleRoom_BlockData: ; 0xacb3f + INCBIN "maps/BetaAlphRuinUnsolvedPuzzleRoom.blk" +; 0xacb53 + +RuinsofAlphInnerChamber_BlockData: ; 0xacb53 + INCBIN "maps/RuinsofAlphInnerChamber.blk" +; 0xacbdf + +RuinsofAlphHoOhChamber_BlockData: ; 0xacbdf + INCBIN "maps/RuinsofAlphHoOhChamber.blk" +; 0xacbf3 + +SproutTower1F_BlockData: ; 0xacbf3 + INCBIN "maps/SproutTower1F.blk" +; 0xacc43 + +BetaSproutTowerCutOut1_BlockData: ; 0xacc43 + INCBIN "maps/BetaSproutTowerCutOut1.blk" +; 0xacc4d + +SproutTower2F_BlockData: ; 0xacc4d + INCBIN "maps/SproutTower2F.blk" +; 0xacc9d + +BetaSproutTowerCutOut2_BlockData: ; 0xacc9d + INCBIN "maps/BetaSproutTowerCutOut2.blk" +; 0xacca7 + +SproutTower3F_BlockData: ; 0xacca7 + INCBIN "maps/SproutTower3F.blk" +; 0xaccf7 + +BetaSproutTowerCutOut3_BlockData: ; 0xaccf7 + INCBIN "maps/BetaSproutTowerCutOut3.blk" +; 0xacd01 + +RadioTower1F_BlockData: ; 0xacd01 + INCBIN "maps/RadioTower1F.blk" +; 0xacd25 + +RadioTower2F_BlockData: ; 0xacd25 + INCBIN "maps/RadioTower2F.blk" +; 0xacd49 + +RadioTower3F_BlockData: ; 0xacd49 + INCBIN "maps/RadioTower3F.blk" +; 0xacd6d + +RadioTower4F_BlockData: ; 0xacd6d + INCBIN "maps/RadioTower4F.blk" +; 0xacd91 + +RadioTower5F_BlockData: ; 0xacd91 + INCBIN "maps/RadioTower5F.blk" +; 0xacdb5 + +NewBarkTown_BlockData: ; 0xacdb5 + INCBIN "maps/NewBarkTown.blk" +; 0xace0f + +CherrygroveCity_BlockData: ; 0xace0f + INCBIN "maps/CherrygroveCity.blk" +; 0xacec3 + +VioletCity_BlockData: ; 0xacec3 + INCBIN "maps/VioletCity.blk" +; 0xad02b + +AzaleaTown_BlockData: ; 0xad02b + INCBIN "maps/AzaleaTown.blk" +; 0xad0df + +CianwoodCity_BlockData: ; 0xad0df + INCBIN "maps/CianwoodCity.blk" +; 0xad274 + +GoldenrodCity_BlockData: ; 0xad274 + INCBIN "maps/GoldenrodCity.blk" +; 0xad3dc + +OlivineCity_BlockData: ; 0xad3dc + INCBIN "maps/OlivineCity.blk" +; 0xad544 + +EcruteakCity_BlockData: ; 0xad544 + INCBIN "maps/EcruteakCity.blk" +; 0xad6ac + +MahoganyTown_BlockData: ; 0xad6ac + INCBIN "maps/MahoganyTown.blk" +; 0xad706 + +LakeofRage_BlockData: ; 0xad706 + INCBIN "maps/LakeofRage.blk" +; 0xad86e + +BlackthornCity_BlockData: ; 0xad86e + INCBIN "maps/BlackthornCity.blk" +; 0xad9d6 + +SilverCaveOutside_BlockData: ; 0xad9d6 + INCBIN "maps/SilverCaveOutside.blk" +; 0xadb3e + +Route6_BlockData: ; 0xadb3e + INCBIN "maps/Route6.blk" +; 0xadb98 + +Route7_BlockData: ; 0xadb98 + INCBIN "maps/Route7.blk" +; 0xadbf2 + +Route16_BlockData: ; 0xadbf2 + INCBIN "maps/Route16.blk" +; 0xadc4c + +Route18_BlockData: ; 0xadc4c + INCBIN "maps/Route18.blk" +; 0xadca6 + +WarehouseEntrance_BlockData: ; 0xadca6 + INCBIN "maps/WarehouseEntrance.blk" +; 0xaddb4 + +UndergroundPathSwitchRoomEntrances_BlockData: ; 0xaddb4 + INCBIN "maps/UndergroundPathSwitchRoomEntrances.blk" +; 0xadec2 + +GoldenrodDeptStoreB1F_BlockData: ; 0xadec2 + INCBIN "maps/GoldenrodDeptStoreB1F.blk" +; 0xadf1c + +UndergroundWarehouse_BlockData: ; 0xadf1c + INCBIN "maps/UndergroundWarehouse.blk" +; 0xadf76 + +BetaElevator_BlockData: ; 0xadf76 + INCBIN "maps/BetaElevator.blk" +; 0xadf8f + +TinTower1F_BlockData: ; 0xadf8f + INCBIN "maps/TinTower1F.blk" +; 0xadfe9 + +TinTower2F_BlockData: ; 0xadfe9 + INCBIN "maps/TinTower2F.blk" +; 0xae043 + +TinTower3F_BlockData: ; 0xae043 + INCBIN "maps/TinTower3F.blk" +; 0xae09d + +TinTower4F_BlockData: ; 0xae09d + INCBIN "maps/TinTower4F.blk" +; 0xae0f7 + +TinTower5F_BlockData: ; 0xae0f7 + INCBIN "maps/TinTower5F.blk" +; 0xae151 + +TinTower6F_BlockData: ; 0xae151 + INCBIN "maps/TinTower6F.blk" +; 0xae1ab + +TinTower7F_BlockData: ; 0xae1ab + INCBIN "maps/TinTower7F.blk" +; 0xae205 + +TinTower8F_BlockData: ; 0xae205 + INCBIN "maps/TinTower8F.blk" +; 0xae25f + +TinTower9F_BlockData: ; 0xae25f + INCBIN "maps/TinTower9F.blk" +; 0xae2b9 + +TinTowerRoof_BlockData: ; 0xae2b9 + INCBIN "maps/TinTowerRoof.blk" +; 0xae313 + +BurnedTower1F_BlockData: ; 0xae313 + INCBIN "maps/BurnedTower1F.blk" +; 0xae36d + +BurnedTowerB1F_BlockData: ; 0xae36d + INCBIN "maps/BurnedTowerB1F.blk" +; 0xae3c7 + +BetaCaveTestMap_BlockData: ; 0xae3c7 + INCBIN "maps/BetaCaveTestMap.blk" +; 0xae4d5 + +MountMortar1FOutside_BlockData: ; 0xae4d5 + INCBIN "maps/MountMortar1FOutside.blk" +; 0xae63d + +MountMortar1FInside_BlockData: ; 0xae63d + INCBIN "maps/MountMortar1FInside.blk" +; 0xae859 + +MountMortar2FInside_BlockData: ; 0xae859 + INCBIN "maps/MountMortar2FInside.blk" +; 0xae9c1 + +MountMortarB1F_BlockData: ; 0xae9c1 + INCBIN "maps/MountMortarB1F.blk" +; 0xaeb29 + +IcePath1F_BlockData: ; 0xaeb29 + INCBIN "maps/IcePath1F.blk" +; 0xaec91 + +IcePathB1F_BlockData: ; 0xaec91 + INCBIN "maps/IcePathB1F.blk" +; 0xaed45 + +IcePathB2FMahoganySide_BlockData: ; 0xaed45 + INCBIN "maps/IcePathB2FMahoganySide.blk" +; 0xaed9f + +IcePathB2FBlackthornSide_BlockData: ; 0xaed9f + INCBIN "maps/IcePathB2FBlackthornSide.blk" +; 0xaedcc + +IcePathB3F_BlockData: ; 0xaedcc + INCBIN "maps/IcePathB3F.blk" +; 0xaee26 + +WhirlIslandNW_BlockData: ; 0xaee26 + INCBIN "maps/WhirlIslandNW.blk" +; 0xaee53 + +WhirlIslandNE_BlockData: ; 0xaee53 + INCBIN "maps/WhirlIslandNE.blk" +; 0xaeead + +WhirlIslandSW_BlockData: ; 0xaeead + INCBIN "maps/WhirlIslandSW.blk" +; 0xaef07 + +WhirlIslandCave_BlockData: ; 0xaef07 + INCBIN "maps/WhirlIslandCave.blk" +; 0xaef34 + +WhirlIslandSE_BlockData: ; 0xaef34 + INCBIN "maps/WhirlIslandSE.blk" +; 0xaef61 + +WhirlIslandB1F_BlockData: ; 0xaef61 + INCBIN "maps/WhirlIslandB1F.blk" +; 0xaf0c9 + +WhirlIslandB2F_BlockData: ; 0xaf0c9 + INCBIN "maps/WhirlIslandB2F.blk" +; 0xaf17d + +WhirlIslandLugiaChamber_BlockData: ; 0xaf17d + INCBIN "maps/WhirlIslandLugiaChamber.blk" +; 0xaf1d7 + +SilverCaveRoom1_BlockData: ; 0xaf1d7 + INCBIN "maps/SilverCaveRoom1.blk" +; 0xaf28b + +SilverCaveRoom2_BlockData: ; 0xaf28b + INCBIN "maps/SilverCaveRoom2.blk" +; 0xaf399 + +SilverCaveRoom3_BlockData: ; 0xaf399 + INCBIN "maps/SilverCaveRoom3.blk" +; 0xaf44d + +BetaRocketHideout1_BlockData: ; 0xaf44d + INCBIN "maps/BetaRocketHideout1.blk" +; 0xaf55b + +BetaRocketHideout2_BlockData: ; 0xaf55b + INCBIN "maps/BetaRocketHideout2.blk" +; 0xaf669 + +BetaEmptyHouse_BlockData: ; 0xaf669 + INCBIN "maps/BetaEmptyHouse.blk" +; 0xaf777 + +BetaRocketHideout3_BlockData: ; 0xaf777 + INCBIN "maps/BetaRocketHideout3.blk" +; 0xaf885 + +MahoganyMart1F_BlockData: ; 0xaf885 + INCBIN "maps/MahoganyMart1F.blk" +; 0xaf895 + +TeamRocketBaseB1F_BlockData: ; 0xaf895 + INCBIN "maps/TeamRocketBaseB1F.blk" +; 0xaf91c + +TeamRocketBaseB2F_BlockData: ; 0xaf91c + INCBIN "maps/TeamRocketBaseB2F.blk" +; 0xaf9a3 + +TeamRocketBaseB3F_BlockData: ; 0xaf9a3 + INCBIN "maps/TeamRocketBaseB3F.blk" +; 0xafa2a + +BetaRoute23EarlyVersion_BlockData: ; 0xafa2a + INCBIN "maps/BetaRoute23EarlyVersion.blk" +; 0xafa84 + +IndigoPlateauPokeCenter1F_BlockData: ; 0xafa84 + INCBIN "maps/IndigoPlateauPokeCenter1F.blk" +; 0xafac3 + +WillsRoom_BlockData: ; 0xafac3 + INCBIN "maps/WillsRoom.blk" +; 0xafaf0 + +KogasRoom_BlockData: ; 0xafaf0 + INCBIN "maps/KogasRoom.blk" +; 0xafb1d + +BrunosRoom_BlockData: ; 0xafb1d + INCBIN "maps/BrunosRoom.blk" +; 0xafb4a + +KarensRoom_BlockData: ; 0xafb4a + INCBIN "maps/KarensRoom.blk" +; 0xafb77 + +AzaleaGym_BlockData: ; 0xafb77 + INCBIN "maps/AzaleaGym.blk" +; 0xafb9f + +VioletGym_BlockData: ; 0xafb9f + INCBIN "maps/VioletGym.blk" +; 0xafbc7 + +GoldenrodGym_BlockData: ; 0xafbc7 + INCBIN "maps/GoldenrodGym.blk" +; 0xafc21 + +EcruteakGym_BlockData: ; 0xafc21 + INCBIN "maps/EcruteakGym.blk" +; 0xafc4e + +MahoganyGym_BlockData: ; 0xafc4e + INCBIN "maps/MahoganyGym.blk" +; 0xafc7b + +OlivineGym_BlockData: ; 0xafc7b + INCBIN "maps/OlivineGym.blk" +; 0xafca3 + +BetaUnknown_BlockData: ; 0xafca3 + INCBIN "maps/BetaUnknown.blk" +; 0xafcb7 + +CianwoodGym_BlockData: ; 0xafcb7 + INCBIN "maps/CianwoodGym.blk" +; 0xafce4 + +BlackthornGym1F_BlockData: ; 0xafce4 + INCBIN "maps/BlackthornGym1F.blk" +; 0xafd11 + +BlackthornGym2F_BlockData: ; 0xafd11 + INCBIN "maps/BlackthornGym2F.blk" +; 0xafd3e + +OlivineLighthouse1F_BlockData: ; 0xafd3e + INCBIN "maps/OlivineLighthouse1F.blk" +; 0xafd98 + +OlivineLighthouse2F_BlockData: ; 0xafd98 + INCBIN "maps/OlivineLighthouse2F.blk" +; 0xafdf2 + +OlivineLighthouse3F_BlockData: ; 0xafdf2 + INCBIN "maps/OlivineLighthouse3F.blk" +; 0xafe4c + +OlivineLighthouse4F_BlockData: ; 0xafe4c + INCBIN "maps/OlivineLighthouse4F.blk" +; 0xafea6 + +OlivineLighthouse5F_BlockData: ; 0xafea6 + INCBIN "maps/OlivineLighthouse5F.blk" +; 0xaff00 + +OlivineLighthouse6F_BlockData: ; 0xaff00 + INCBIN "maps/OlivineLighthouse6F.blk" +; 0xaff5a + diff --git a/maps/blockdata_3.asm b/maps/blockdata_3.asm new file mode 100644 index 000000000..261406e84 --- /dev/null +++ b/maps/blockdata_3.asm @@ -0,0 +1,348 @@ +BetaCave2_BlockData: ; 0xb0000 + INCBIN "maps/BetaCave2.blk" +; 0xb0023 + +SlowpokeWellB1F_BlockData: ; 0xb0023 + INCBIN "maps/SlowpokeWellB1F.blk" +; 0xb007d + +SlowpokeWellB2F_BlockData: ; 0xb007d + INCBIN "maps/SlowpokeWellB2F.blk" +; 0xb00d7 + +IlexForest_BlockData: ; 0xb00d7 + INCBIN "maps/IlexForest.blk" +; 0xb026c + +DarkCaveVioletEntrance_BlockData: ; 0xb026c + INCBIN "maps/DarkCaveVioletEntrance.blk" +; 0xb03d4 + +DarkCaveBlackthornEntrance_BlockData: ; 0xb03d4 + INCBIN "maps/DarkCaveBlackthornEntrance.blk" +; 0xb04e2 + +RuinsofAlphResearchCenter_BlockData: ; 0xb04e2 + INCBIN "maps/RuinsofAlphResearchCenter.blk" +; 0xb04f2 + +GoldenrodBikeShop_BlockData: ; 0xb04f2 + INCBIN "maps/GoldenrodBikeShop.blk" +; 0xb0502 + +DanceTheatre_BlockData: ; 0xb0502 + INCBIN "maps/DanceTheatre.blk" +; 0xb052c + +EcruteakHouse_BlockData: ; 0xb052c + INCBIN "maps/EcruteakHouse.blk" +; 0xb0586 + +GoldenrodGameCorner_BlockData: ; 0xb0586 + INCBIN "maps/GoldenrodGameCorner.blk" +; 0xb05cc + +Route35NationalParkgate_BlockData: ; 0xb05cc + INCBIN "maps/Route35NationalParkgate.blk" +; 0xb05dc + +Route36NationalParkgate_BlockData: ; 0xb05dc + INCBIN "maps/Route36NationalParkgate.blk" +; 0xb05f0 + +FastShip1F_BlockData: ; 0xb05f0 + INCBIN "maps/FastShip1F.blk" +; 0xb0680 + +FastShipB1F_BlockData: ; 0xb0680 + INCBIN "maps/FastShipB1F.blk" +; 0xb0700 + +BetaSsAquaInsideCutOut_BlockData: ; 0xb0700 + INCBIN "maps/BetaSsAquaInsideCutOut.blk" +; 0xb0710 + +FastShipCabins_NNW_NNE_NE_BlockData: ; 0xb0710 + INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" +; 0xb0750 + +FastShipCabins_SW_SSW_NW_BlockData: ; 0xb0750 + INCBIN "maps/FastShipCabins_SW_SSW_NW.blk" +; 0xb0790 + +FastShipCabins_SE_SSE_CaptainsCabin_BlockData: ; 0xb0790 + INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk" +; 0xb07e5 + +OlivinePort_BlockData: ; 0xb07e5 + INCBIN "maps/OlivinePort.blk" +; 0xb0899 + +VermilionPort_BlockData: ; 0xb0899 + INCBIN "maps/VermilionPort.blk" +; 0xb094d + +OlivineCafe_BlockData: ; 0xb094d + INCBIN "maps/OlivineCafe.blk" +; 0xb095d + +KrissHouse2F_BlockData: ; 0xb095d + INCBIN "maps/KrissHouse2F.blk" +; 0xb0969 + +SaffronTrainStation_BlockData: ; 0xb0969 + INCBIN "maps/SaffronTrainStation.blk" +; 0xb09c3 + +CeruleanGym_BlockData: ; 0xb09c3 + INCBIN "maps/CeruleanGym.blk" +; 0xb09eb + +VermilionGym_BlockData: ; 0xb09eb + INCBIN "maps/VermilionGym.blk" +; 0xb0a18 + +SaffronGym_BlockData: ; 0xb0a18 + INCBIN "maps/SaffronGym.blk" +; 0xb0a72 + +PowerPlant_BlockData: ; 0xb0a72 + INCBIN "maps/PowerPlant.blk" +; 0xb0acc + +PokemonFanClub_BlockData: ; 0xb0acc + INCBIN "maps/PokemonFanClub.blk" +; 0xb0ae0 + +FightingDojo_BlockData: ; 0xb0ae0 + INCBIN "maps/FightingDojo.blk" +; 0xb0afe + +SilphCo1F_BlockData: ; 0xb0afe + INCBIN "maps/SilphCo1F.blk" +; 0xb0b1e + +ViridianGym_BlockData: ; 0xb0b1e + INCBIN "maps/ViridianGym.blk" +; 0xb0b4b + +TrainerHouse1F_BlockData: ; 0xb0b4b + INCBIN "maps/TrainerHouse1F.blk" +; 0xb0b6e + +TrainerHouseB1F_BlockData: ; 0xb0b6e + INCBIN "maps/TrainerHouseB1F.blk" +; 0xb0b96 + +RedsHouse1F_BlockData: ; 0xb0b96 + INCBIN "maps/RedsHouse1F.blk" +; 0xb0ba6 + +RedsHouse2F_BlockData: ; 0xb0ba6 + INCBIN "maps/RedsHouse2F.blk" +; 0xb0bb6 + +OaksLab_BlockData: ; 0xb0bb6 + INCBIN "maps/OaksLab.blk" +; 0xb0bd4 + +MrFujisHouse_BlockData: ; 0xb0bd4 + INCBIN "maps/MrFujisHouse.blk" +; 0xb0be8 + +LavRadioTower1F_BlockData: ; 0xb0be8 + INCBIN "maps/LavRadioTower1F.blk" +; 0xb0c10 + +SilverCaveItemRooms_BlockData: ; 0xb0c10 + INCBIN "maps/SilverCaveItemRooms.blk" +; 0xb0c6a + +DayCare_BlockData: ; 0xb0c6a + INCBIN "maps/DayCare.blk" +; 0xb0c7e + +SoulHouse_BlockData: ; 0xb0c7e + INCBIN "maps/SoulHouse.blk" +; 0xb0c92 + +PewterGym_BlockData: ; 0xb0c92 + INCBIN "maps/PewterGym.blk" +; 0xb0cb5 + +CeladonGym_BlockData: ; 0xb0cb5 + INCBIN "maps/CeladonGym.blk" +; 0xb0ce2 + +BetaHouse2_BlockData: ; 0xb0ce2 + INCBIN "maps/BetaHouse2.blk" +; 0xb0cf6 + +CeladonCafe_BlockData: ; 0xb0cf6 + INCBIN "maps/CeladonCafe.blk" +; 0xb0d0e + +BetaCeladonMansion_BlockData: ; 0xb0d0e + INCBIN "maps/BetaCeladonMansion.blk" +; 0xb0d26 + +RockTunnel1F_BlockData: ; 0xb0d26 + INCBIN "maps/RockTunnel1F.blk" +; 0xb0e34 + +RockTunnelB1F_BlockData: ; 0xb0e34 + INCBIN "maps/RockTunnelB1F.blk" +; 0xb0f42 + +DiglettsCave_BlockData: ; 0xb0f42 + INCBIN "maps/DiglettsCave.blk" +; 0xb0ff6 + +MountMoon_BlockData: ; 0xb0ff6 + INCBIN "maps/MountMoon.blk" +; 0xb107d + +SeafoamGym_BlockData: ; 0xb107d + INCBIN "maps/SeafoamGym.blk" +; 0xb1091 + +MrPokemonsHouse_BlockData: ; 0xb1091 + INCBIN "maps/MrPokemonsHouse.blk" +; 0xb10a1 + +VictoryRoadGate_BlockData: ; 0xb10a1 + INCBIN "maps/VictoryRoadGate.blk" +; 0xb10fb + +OlivinePortPassage_BlockData: ; 0xb10fb + INCBIN "maps/OlivinePortPassage.blk" +; 0xb1155 + +FuchsiaGym_BlockData: ; 0xb1155 + INCBIN "maps/FuchsiaGym.blk" +; 0xb1182 + +SafariZoneBeta_BlockData: ; 0xb1182 + INCBIN "maps/SafariZoneBeta.blk" +; 0xb1236 + +Underground_BlockData: ; 0xb1236 + INCBIN "maps/Underground.blk" +; 0xb1260 + +Route39Barn_BlockData: ; 0xb1260 + INCBIN "maps/Route39Barn.blk" +; 0xb1270 + +VictoryRoad_BlockData: ; 0xb1270 + INCBIN "maps/VictoryRoad.blk" +; 0xb13d8 + +Route23_BlockData: ; 0xb13d8 + INCBIN "maps/Route23.blk" +; 0xb1432 + +LancesRoom_BlockData: ; 0xb1432 + INCBIN "maps/LancesRoom.blk" +; 0xb146e + +HallOfFame_BlockData: ; 0xb146e + INCBIN "maps/HallOfFame.blk" +; 0xb1491 + +CopycatsHouse1F_BlockData: ; 0xb1491 + INCBIN "maps/CopycatsHouse1F.blk" +; 0xb14a1 + +CopycatsHouse2F_BlockData: ; 0xb14a1 + INCBIN "maps/CopycatsHouse2F.blk" +; 0xb14b0 + +GoldenrodFlowerShop_BlockData: ; 0xb14b0 + INCBIN "maps/GoldenrodFlowerShop.blk" +; 0xb14c0 + +MountMoonSquare_BlockData: ; 0xb14c0 + INCBIN "maps/MountMoonSquare.blk" +; 0xb1547 + +WiseTriosRoom_BlockData: ; 0xb1547 + INCBIN "maps/WiseTriosRoom.blk" +; 0xb1557 + +DragonsDen1F_BlockData: ; 0xb1557 + INCBIN "maps/DragonsDen1F.blk" +; 0xb1584 + +DragonsDenB1F_BlockData: ; 0xb1584 + INCBIN "maps/DragonsDenB1F.blk" +; 0xb16ec + +TohjoFalls_BlockData: ; 0xb16ec + INCBIN "maps/TohjoFalls.blk" +; 0xb1773 + +RuinsofAlphHoOhItemRoom_BlockData: ; 0xb1773 + INCBIN "maps/RuinsofAlphHoOhItemRoom.blk" +; 0xb1787 + +RuinsofAlphHoOhWordRoom_BlockData: ; 0xb1787 + INCBIN "maps/RuinsofAlphHoOhWordRoom.blk" +; 0xb17ff + +RuinsofAlphKabutoWordRoom_BlockData: ; 0xb17ff + INCBIN "maps/RuinsofAlphKabutoWordRoom.blk" +; 0xb1845 + +RuinsofAlphOmanyteWordRoom_BlockData: ; 0xb1845 + INCBIN "maps/RuinsofAlphOmanyteWordRoom.blk" +; 0xb1895 + +RuinsofAlphAerodactylWordRoom_BlockData: ; 0xb1895 + INCBIN "maps/RuinsofAlphAerodactylWordRoom.blk" +; 0xb18db + +DragonShrine_BlockData: ; 0xb18db + INCBIN "maps/DragonShrine.blk" +; 0xb18f4 + +BattleTower1F_BlockData: ; 0xb18f4 + INCBIN "maps/BattleTower1F.blk" +; 0xb191c + +BattleTowerBattleRoom_BlockData: ; 0xb191c + INCBIN "maps/BattleTowerBattleRoom.blk" +; 0xb192c + +GoldenrodPokeComCenter2FMobile_BlockData: ; 0xb192c + INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" +; 0xb1a2c + +MobileTradeRoomMobile_BlockData: ; 0xb1a2c + INCBIN "maps/MobileTradeRoomMobile.blk" +; 0xb1a40 + +MobileBattleRoom_BlockData: ; 0xb1a40 + INCBIN "maps/MobileBattleRoom.blk" +; 0xb1a54 + +BattleTowerHallway_BlockData: ; 0xb1a54 + INCBIN "maps/BattleTowerHallway.blk" +; 0xb1a6a + +BattleTowerElevator_BlockData: ; 0xb1a6a + INCBIN "maps/BattleTowerElevator.blk" +; 0xb1a6e + +BattleTowerOutside_BlockData: ; 0xb1a6e + INCBIN "maps/BattleTowerOutside.blk" +; 0xb1afa + +BetaBlank_BlockData: ; 0xb1afa + INCBIN "maps/BetaBlank.blk" +; 0xb1b22 + +GoldenrodDeptStoreRoof_BlockData: ; 0xb1b22 + INCBIN "maps/GoldenrodDeptStoreRoof.blk" +; 0xb1b42 + |