summaryrefslogtreecommitdiff
path: root/data/map_event_scripts.inc
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-04-18 00:34:09 -0400
committergarak <garakmon@gmail.com>2019-05-05 16:33:50 -0400
commitc66f72ab9f8933755941c2650c4795634c51f90d (patch)
tree01a5e5ececdbb696e715d12b05ced080f5b6a7e0 /data/map_event_scripts.inc
parent57eb0d487eee101ce62e50d147dc40d665cd7e72 (diff)
dump map events
Diffstat (limited to 'data/map_event_scripts.inc')
-rw-r--r--data/map_event_scripts.inc2561
1 files changed, 2380 insertions, 181 deletions
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc
index 2be60db91..64fc45727 100644
--- a/data/map_event_scripts.inc
+++ b/data/map_event_scripts.inc
@@ -53,7 +53,46 @@ gMapScripts_ViridianForest:: @ 816051F
.byte 0
ViridianForest_MapScript1_160525:: @ 8160525
- .incbin "baserom.gba", 0x160525, 0xBF
+ .incbin "baserom.gba", 0x160525, 0x4
+
+ViridianForest_EventScript_160529:: @ 8160529
+ .incbin "baserom.gba", 0x160529, 0x9
+
+ViridianForest_EventScript_160532:: @ 8160532
+ .incbin "baserom.gba", 0x160532, 0x9
+
+ViridianForest_EventScript_16053B:: @ 816053B
+ .incbin "baserom.gba", 0x16053B, 0x9
+
+ViridianForest_EventScript_160544:: @ 8160544
+ .incbin "baserom.gba", 0x160544, 0x9
+
+ViridianForest_EventScript_16054D:: @ 816054D
+ .incbin "baserom.gba", 0x16054D, 0x9
+
+ViridianForest_EventScript_160556:: @ 8160556
+ .incbin "baserom.gba", 0x160556, 0x9
+
+ViridianForest_EventScript_16055F:: @ 816055F
+ .incbin "baserom.gba", 0x16055F, 0x9
+
+ViridianForest_EventScript_160568:: @ 8160568
+ .incbin "baserom.gba", 0x160568, 0x9
+
+ViridianForest_EventScript_160571:: @ 8160571
+ .incbin "baserom.gba", 0x160571, 0x17
+
+ViridianForest_EventScript_160588:: @ 8160588
+ .incbin "baserom.gba", 0x160588, 0x17
+
+ViridianForest_EventScript_16059F:: @ 816059F
+ .incbin "baserom.gba", 0x16059F, 0x17
+
+ViridianForest_EventScript_1605B6:: @ 81605B6
+ .incbin "baserom.gba", 0x1605B6, 0x17
+
+ViridianForest_EventScript_1605CD:: @ 81605CD
+ .incbin "baserom.gba", 0x1605CD, 0x17
gMapScripts_MtMoon_1F:: @ 81605E4
map_script 3, MtMoon_1F_MapScript1_1605EA
@@ -144,7 +183,16 @@ gMapScripts_SSAnne_2F_Corridor:: @ 81608DE
.byte 0
SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF
- .incbin "baserom.gba", 0x1608DF, 0x17E
+ .incbin "baserom.gba", 0x1608DF, 0xC
+
+SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB
+ .incbin "baserom.gba", 0x1608EB, 0xC
+
+SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7
+ .incbin "baserom.gba", 0x1608F7, 0x15D
+
+SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54
+ .incbin "baserom.gba", 0x160A54, 0x9
gMapScripts_SSAnne_3F_Corridor:: @ 8160A5D
.byte 0
@@ -177,7 +225,25 @@ gMapScripts_SSAnne_Kitchen:: @ 8160AB2
.byte 0
SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3
- .incbin "baserom.gba", 0x160AB3, 0x86
+ .incbin "baserom.gba", 0x160AB3, 0x9
+
+SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC
+ .incbin "baserom.gba", 0x160ABC, 0x9
+
+SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5
+ .incbin "baserom.gba", 0x160AC5, 0x9
+
+SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE
+ .incbin "baserom.gba", 0x160ACE, 0x50
+
+SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E
+ .incbin "baserom.gba", 0x160B1E, 0x9
+
+SSAnne_Kitchen_EventScript_160B27:: @ 8160B27
+ .incbin "baserom.gba", 0x160B27, 0x9
+
+SSAnne_Kitchen_EventScript_160B30:: @ 8160B30
+ .incbin "baserom.gba", 0x160B30, 0x9
gMapScripts_SSAnne_CaptainsOffice:: @ 8160B39
.byte 0
@@ -213,7 +279,13 @@ gMapScripts_SSAnne_1F_Room3:: @ 8160C1D
.byte 0
SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E
- .incbin "baserom.gba", 0x160C1E, 0x25
+ .incbin "baserom.gba", 0x160C1E, 0x9
+
+SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27
+ .incbin "baserom.gba", 0x160C27, 0x9
+
+SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30
+ .incbin "baserom.gba", 0x160C30, 0x13
gMapScripts_SSAnne_1F_Room4:: @ 8160C43
.byte 0
@@ -252,7 +324,10 @@ gMapScripts_SSAnne_2F_Room3:: @ 8160CDF
.byte 0
SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0
- .incbin "baserom.gba", 0x160CE0, 0x12
+ .incbin "baserom.gba", 0x160CE0, 0x9
+
+SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9
+ .incbin "baserom.gba", 0x160CE9, 0x9
gMapScripts_SSAnne_2F_Room4:: @ 8160CF2
.byte 0
@@ -267,7 +342,10 @@ gMapScripts_SSAnne_2F_Room5:: @ 8160D21
.byte 0
SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22
- .incbin "baserom.gba", 0x160D22, 0x12
+ .incbin "baserom.gba", 0x160D22, 0x9
+
+SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B
+ .incbin "baserom.gba", 0x160D2B, 0x9
gMapScripts_SSAnne_2F_Room6:: @ 8160D34
.byte 0
@@ -282,7 +360,10 @@ gMapScripts_SSAnne_B1F_Room1:: @ 8160D47
.byte 0
SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48
- .incbin "baserom.gba", 0x160D48, 0x2E
+ .incbin "baserom.gba", 0x160D48, 0x17
+
+SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F
+ .incbin "baserom.gba", 0x160D5F, 0x17
gMapScripts_SSAnne_B1F_Room2:: @ 8160D76
.byte 0
@@ -309,7 +390,10 @@ gMapScripts_SSAnne_B1F_Room5:: @ 8160DD5
.byte 0
SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6
- .incbin "baserom.gba", 0x160DD6, 0x1C
+ .incbin "baserom.gba", 0x160DD6, 0x9
+
+SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF
+ .incbin "baserom.gba", 0x160DDF, 0x13
gMapScripts_SSAnne_1F_Room6:: @ 8160DF2
.byte 0
@@ -399,7 +483,28 @@ gMapScripts_VictoryRoad_2F:: @ 8160F92
.byte 0
VictoryRoad_2F_MapScript1_160F98:: @ 8160F98
- .incbin "baserom.gba", 0x160F98, 0x112
+ .incbin "baserom.gba", 0x160F98, 0x3D
+
+VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
+ .incbin "baserom.gba", 0x160FD5, 0x31
+
+VictoryRoad_2F_EventScript_161006:: @ 8161006
+ .incbin "baserom.gba", 0x161006, 0x31
+
+VictoryRoad_2F_EventScript_161037:: @ 8161037
+ .incbin "baserom.gba", 0x161037, 0x17
+
+VictoryRoad_2F_EventScript_16104E:: @ 816104E
+ .incbin "baserom.gba", 0x16104E, 0x17
+
+VictoryRoad_2F_EventScript_161065:: @ 8161065
+ .incbin "baserom.gba", 0x161065, 0x17
+
+VictoryRoad_2F_EventScript_16107C:: @ 816107C
+ .incbin "baserom.gba", 0x16107C, 0x17
+
+VictoryRoad_2F_EventScript_161093:: @ 8161093
+ .incbin "baserom.gba", 0x161093, 0x17
gMapScripts_VictoryRoad_3F:: @ 81610AA
map_script 1, VictoryRoad_3F_MapScript1_1610B0
@@ -438,7 +543,22 @@ RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0
.incbin "baserom.gba", 0x1611A0, 0xA
RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA
- .incbin "baserom.gba", 0x1611AA, 0xF7
+ .incbin "baserom.gba", 0x1611AA, 0x4
+
+RocketHideout_B1F_EventScript_1611AE:: @ 81611AE
+ .incbin "baserom.gba", 0x1611AE, 0x17
+
+RocketHideout_B1F_EventScript_1611C5:: @ 81611C5
+ .incbin "baserom.gba", 0x1611C5, 0x17
+
+RocketHideout_B1F_EventScript_1611DC:: @ 81611DC
+ .incbin "baserom.gba", 0x1611DC, 0x17
+
+RocketHideout_B1F_EventScript_1611F3:: @ 81611F3
+ .incbin "baserom.gba", 0x1611F3, 0x17
+
+RocketHideout_B1F_EventScript_16120A:: @ 816120A
+ .incbin "baserom.gba", 0x16120A, 0x97
gMapScripts_RocketHideout_B2F:: @ 81612A1
.byte 0
@@ -450,7 +570,10 @@ gMapScripts_RocketHideout_B3F:: @ 81612B9
.byte 0
RocketHideout_B3F_EventScript_1612BA:: @ 81612BA
- .incbin "baserom.gba", 0x1612BA, 0x2E
+ .incbin "baserom.gba", 0x1612BA, 0x17
+
+RocketHideout_B3F_EventScript_1612D1:: @ 81612D1
+ .incbin "baserom.gba", 0x1612D1, 0x17
gMapScripts_RocketHideout_B4F:: @ 81612E8
map_script 1, RocketHideout_B4F_MapScript1_1612EE
@@ -501,7 +624,25 @@ gMapScripts_SilphCo_2F:: @ 8161641
.byte 0
SilphCo_2F_MapScript1_161647:: @ 8161647
- .incbin "baserom.gba", 0x161647, 0x7E
+ .incbin "baserom.gba", 0x161647, 0x13
+
+SilphCo_2F_EventScript_16165A:: @ 816165A
+ .incbin "baserom.gba", 0x16165A, 0x6
+
+SilphCo_2F_EventScript_161660:: @ 8161660
+ .incbin "baserom.gba", 0x161660, 0x9
+
+SilphCo_2F_EventScript_161669:: @ 8161669
+ .incbin "baserom.gba", 0x161669, 0x17
+
+SilphCo_2F_EventScript_161680:: @ 8161680
+ .incbin "baserom.gba", 0x161680, 0x17
+
+SilphCo_2F_EventScript_161697:: @ 8161697
+ .incbin "baserom.gba", 0x161697, 0x17
+
+SilphCo_2F_EventScript_1616AE:: @ 81616AE
+ .incbin "baserom.gba", 0x1616AE, 0x17
gMapScripts_SilphCo_3F:: @ 81616C5
map_script 1, SilphCo_3F_MapScript1_1616CB
@@ -527,7 +668,22 @@ gMapScripts_SilphCo_4F:: @ 8161736
.byte 0
SilphCo_4F_MapScript1_16173C:: @ 816173C
- .incbin "baserom.gba", 0x16173C, 0x82
+ .incbin "baserom.gba", 0x16173C, 0x13
+
+SilphCo_4F_EventScript_16174F:: @ 816174F
+ .incbin "baserom.gba", 0x16174F, 0x21
+
+SilphCo_4F_EventScript_161770:: @ 8161770
+ .incbin "baserom.gba", 0x161770, 0x9
+
+SilphCo_4F_EventScript_161779:: @ 8161779
+ .incbin "baserom.gba", 0x161779, 0x17
+
+SilphCo_4F_EventScript_161790:: @ 8161790
+ .incbin "baserom.gba", 0x161790, 0x17
+
+SilphCo_4F_EventScript_1617A7:: @ 81617A7
+ .incbin "baserom.gba", 0x1617A7, 0x17
gMapScripts_SilphCo_5F:: @ 81617BE
map_script 1, SilphCo_5F_MapScript1_1617C4
@@ -568,7 +724,34 @@ gMapScripts_SilphCo_6F:: @ 8161881
.byte 0
SilphCo_6F_MapScript1_161887:: @ 8161887
- .incbin "baserom.gba", 0x161887, 0xFD
+ .incbin "baserom.gba", 0x161887, 0xA
+
+SilphCo_6F_EventScript_161891:: @ 8161891
+ .incbin "baserom.gba", 0x161891, 0x21
+
+SilphCo_6F_EventScript_1618B2:: @ 81618B2
+ .incbin "baserom.gba", 0x1618B2, 0x21
+
+SilphCo_6F_EventScript_1618D3:: @ 81618D3
+ .incbin "baserom.gba", 0x1618D3, 0x21
+
+SilphCo_6F_EventScript_1618F4:: @ 81618F4
+ .incbin "baserom.gba", 0x1618F4, 0x21
+
+SilphCo_6F_EventScript_161915:: @ 8161915
+ .incbin "baserom.gba", 0x161915, 0x21
+
+SilphCo_6F_EventScript_161936:: @ 8161936
+ .incbin "baserom.gba", 0x161936, 0x9
+
+SilphCo_6F_EventScript_16193F:: @ 816193F
+ .incbin "baserom.gba", 0x16193F, 0x17
+
+SilphCo_6F_EventScript_161956:: @ 8161956
+ .incbin "baserom.gba", 0x161956, 0x17
+
+SilphCo_6F_EventScript_16196D:: @ 816196D
+ .incbin "baserom.gba", 0x16196D, 0x17
gMapScripts_SilphCo_7F:: @ 8161984
map_script 1, SilphCo_7F_MapScript1_16198F
@@ -619,7 +802,22 @@ gMapScripts_SilphCo_8F:: @ 8161C5F
.byte 0
SilphCo_8F_MapScript1_161C65:: @ 8161C65
- .incbin "baserom.gba", 0x161C65, 0x79
+ .incbin "baserom.gba", 0x161C65, 0xA
+
+SilphCo_8F_EventScript_161C6F:: @ 8161C6F
+ .incbin "baserom.gba", 0x161C6F, 0x21
+
+SilphCo_8F_EventScript_161C90:: @ 8161C90
+ .incbin "baserom.gba", 0x161C90, 0x9
+
+SilphCo_8F_EventScript_161C99:: @ 8161C99
+ .incbin "baserom.gba", 0x161C99, 0x17
+
+SilphCo_8F_EventScript_161CB0:: @ 8161CB0
+ .incbin "baserom.gba", 0x161CB0, 0x17
+
+SilphCo_8F_EventScript_161CC7:: @ 8161CC7
+ .incbin "baserom.gba", 0x161CC7, 0x17
gMapScripts_SilphCo_9F:: @ 8161CDE
map_script 1, SilphCo_9F_MapScript1_161CE4
@@ -648,7 +846,19 @@ gMapScripts_SilphCo_10F:: @ 8161D86
.byte 0
SilphCo_10F_MapScript1_161D8C:: @ 8161D8C
- .incbin "baserom.gba", 0x161D8C, 0x62
+ .incbin "baserom.gba", 0x161D8C, 0xA
+
+SilphCo_10F_EventScript_161D96:: @ 8161D96
+ .incbin "baserom.gba", 0x161D96, 0x21
+
+SilphCo_10F_EventScript_161DB7:: @ 8161DB7
+ .incbin "baserom.gba", 0x161DB7, 0x9
+
+SilphCo_10F_EventScript_161DC0:: @ 8161DC0
+ .incbin "baserom.gba", 0x161DC0, 0x17
+
+SilphCo_10F_EventScript_161DD7:: @ 8161DD7
+ .incbin "baserom.gba", 0x161DD7, 0x17
gMapScripts_SilphCo_11F:: @ 8161DEE
map_script 1, SilphCo_11F_MapScript1_161DF4
@@ -709,7 +919,19 @@ gMapScripts_PokemonMansion_2F:: @ 8162254
.byte 0
PokemonMansion_2F_MapScript1_16225A:: @ 816225A
- .incbin "baserom.gba", 0x16225A, 0x47
+ .incbin "baserom.gba", 0x16225A, 0xA
+
+PokemonMansion_2F_EventScript_162264:: @ 8162264
+ .incbin "baserom.gba", 0x162264, 0x14
+
+PokemonMansion_2F_EventScript_162278:: @ 8162278
+ .incbin "baserom.gba", 0x162278, 0x9
+
+PokemonMansion_2F_EventScript_162281:: @ 8162281
+ .incbin "baserom.gba", 0x162281, 0x9
+
+PokemonMansion_2F_EventScript_16228A:: @ 816228A
+ .incbin "baserom.gba", 0x16228A, 0x17
gMapScripts_PokemonMansion_3F:: @ 81622A1
map_script 1, PokemonMansion_3F_MapScript1_1622A7
@@ -735,7 +957,19 @@ gMapScripts_PokemonMansion_B1F:: @ 81622FC
.byte 0
PokemonMansion_B1F_MapScript1_162302:: @ 8162302
- .incbin "baserom.gba", 0x162302, 0x55
+ .incbin "baserom.gba", 0x162302, 0xA
+
+PokemonMansion_B1F_EventScript_16230C:: @ 816230C
+ .incbin "baserom.gba", 0x16230C, 0x14
+
+PokemonMansion_B1F_EventScript_162320:: @ 8162320
+ .incbin "baserom.gba", 0x162320, 0x9
+
+PokemonMansion_B1F_EventScript_162329:: @ 8162329
+ .incbin "baserom.gba", 0x162329, 0x17
+
+PokemonMansion_B1F_EventScript_162340:: @ 8162340
+ .incbin "baserom.gba", 0x162340, 0x17
gMapScripts_SafariZone_Center:: @ 8162357
map_script 3, SafariZone_Center_MapScript1_16235D
@@ -757,7 +991,13 @@ gMapScripts_SafariZone_East:: @ 816237C
.byte 0
SafariZone_East_EventScript_16237D:: @ 816237D
- .incbin "baserom.gba", 0x16237D, 0x1B
+ .incbin "baserom.gba", 0x16237D, 0x9
+
+SafariZone_East_EventScript_162386:: @ 8162386
+ .incbin "baserom.gba", 0x162386, 0x9
+
+SafariZone_East_EventScript_16238F:: @ 816238F
+ .incbin "baserom.gba", 0x16238F, 0x9
gMapScripts_SafariZone_North:: @ 8162398
.byte 0
@@ -781,7 +1021,16 @@ gMapScripts_SafariZone_West:: @ 81623C6
.byte 0
SafariZone_West_EventScript_1623C7:: @ 81623C7
- .incbin "baserom.gba", 0x1623C7, 0x24
+ .incbin "baserom.gba", 0x1623C7, 0x9
+
+SafariZone_West_EventScript_1623D0:: @ 81623D0
+ .incbin "baserom.gba", 0x1623D0, 0x9
+
+SafariZone_West_EventScript_1623D9:: @ 81623D9
+ .incbin "baserom.gba", 0x1623D9, 0x9
+
+SafariZone_West_EventScript_1623E2:: @ 81623E2
+ .incbin "baserom.gba", 0x1623E2, 0x9
gMapScripts_SafariZone_Building1:: @ 81623EB
.byte 0
@@ -796,7 +1045,13 @@ gMapScripts_SafariZone_Building2:: @ 81623FE
.byte 0
SafariZone_Building2_EventScript_1623FF:: @ 81623FF
- .incbin "baserom.gba", 0x1623FF, 0x1B
+ .incbin "baserom.gba", 0x1623FF, 0x9
+
+SafariZone_Building2_EventScript_162408:: @ 8162408
+ .incbin "baserom.gba", 0x162408, 0x9
+
+SafariZone_Building2_EventScript_162411:: @ 8162411
+ .incbin "baserom.gba", 0x162411, 0x9
gMapScripts_SafariZone_Building3:: @ 816241A
.byte 0
@@ -814,7 +1069,13 @@ gMapScripts_SafariZone_Building4:: @ 8162436
.byte 0
SafariZone_Building4_EventScript_162437:: @ 8162437
- .incbin "baserom.gba", 0x162437, 0x1B
+ .incbin "baserom.gba", 0x162437, 0x9
+
+SafariZone_Building4_EventScript_162440:: @ 8162440
+ .incbin "baserom.gba", 0x162440, 0x9
+
+SafariZone_Building4_EventScript_162449:: @ 8162449
+ .incbin "baserom.gba", 0x162449, 0x9
gMapScripts_SafariZone_SecretHouse:: @ 8162452
.byte 0
@@ -841,7 +1102,10 @@ CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9
.incbin "baserom.gba", 0x1624C9, 0x1E
CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7
- .incbin "baserom.gba", 0x1624E7, 0x85
+ .incbin "baserom.gba", 0x1624E7, 0xE
+
+CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
+ .incbin "baserom.gba", 0x1624F5, 0x77
gMapScripts_PokemonLeague_LoreleisRoom:: @ 816256C
map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586
@@ -886,7 +1150,10 @@ PokemonLeague_BrunosRoom_MapScript3_1626C6:: @ 81626C6
.incbin "baserom.gba", 0x1626C6, 0xF
PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5
- .incbin "baserom.gba", 0x1626D5, 0x13B
+ .incbin "baserom.gba", 0x1626D5, 0x17
+
+PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
+ .incbin "baserom.gba", 0x1626EC, 0x124
gMapScripts_PokemonLeague_AgathasRoom:: @ 8162810
map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825
@@ -927,7 +1194,10 @@ PokemonLeague_LancesRoom_MapScript3_16296E:: @ 816296E
.incbin "baserom.gba", 0x16296E, 0xF
PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D
- .incbin "baserom.gba", 0x16297D, 0x165
+ .incbin "baserom.gba", 0x16297D, 0x97
+
+PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
+ .incbin "baserom.gba", 0x162A14, 0xCE
gMapScripts_PokemonLeague_ChampionsRoom:: @ 8162AE2
map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D
@@ -990,7 +1260,28 @@ gMapScripts_RockTunnel_B1F:: @ 8162E8A
.byte 0
RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B
- .incbin "baserom.gba", 0x162E8B, 0xB8
+ .incbin "baserom.gba", 0x162E8B, 0x17
+
+RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2
+ .incbin "baserom.gba", 0x162EA2, 0x17
+
+RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9
+ .incbin "baserom.gba", 0x162EB9, 0x17
+
+RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0
+ .incbin "baserom.gba", 0x162ED0, 0x17
+
+RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7
+ .incbin "baserom.gba", 0x162EE7, 0x17
+
+RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE
+ .incbin "baserom.gba", 0x162EFE, 0x17
+
+RockTunnel_B1F_EventScript_162F15:: @ 8162F15
+ .incbin "baserom.gba", 0x162F15, 0x17
+
+RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C
+ .incbin "baserom.gba", 0x162F2C, 0x17
gMapScripts_SeafoamIslands_1F:: @ 8162F43
map_script 3, SeafoamIslands_1F_MapScript1_162F49
@@ -1056,7 +1347,22 @@ gMapScripts_PokemonTower_1F:: @ 8163235
.byte 0
PokemonTower_1F_MapScript1_16323B:: @ 816323B
- .incbin "baserom.gba", 0x16323B, 0x4A
+ .incbin "baserom.gba", 0x16323B, 0x4
+
+PokemonTower_1F_EventScript_16323F:: @ 816323F
+ .incbin "baserom.gba", 0x16323F, 0x9
+
+PokemonTower_1F_EventScript_163248:: @ 8163248
+ .incbin "baserom.gba", 0x163248, 0x9
+
+PokemonTower_1F_EventScript_163251:: @ 8163251
+ .incbin "baserom.gba", 0x163251, 0x9
+
+PokemonTower_1F_EventScript_16325A:: @ 816325A
+ .incbin "baserom.gba", 0x16325A, 0x22
+
+PokemonTower_1F_EventScript_16327C:: @ 816327C
+ .incbin "baserom.gba", 0x16327C, 0x9
gMapScripts_PokemonTower_2F:: @ 8163285
.byte 0
@@ -1074,7 +1380,13 @@ gMapScripts_PokemonTower_3F:: @ 81633A6
.byte 0
PokemonTower_3F_EventScript_1633A7:: @ 81633A7
- .incbin "baserom.gba", 0x1633A7, 0x45
+ .incbin "baserom.gba", 0x1633A7, 0x17
+
+PokemonTower_3F_EventScript_1633BE:: @ 81633BE
+ .incbin "baserom.gba", 0x1633BE, 0x17
+
+PokemonTower_3F_EventScript_1633D5:: @ 81633D5
+ .incbin "baserom.gba", 0x1633D5, 0x17
gMapScripts_PokemonTower_4F:: @ 81633EC
.byte 0
@@ -1092,7 +1404,25 @@ gMapScripts_PokemonTower_5F:: @ 8163432
.byte 0
PokemonTower_5F_EventScript_163433:: @ 8163433
- .incbin "baserom.gba", 0x163433, 0x84
+ .incbin "baserom.gba", 0x163433, 0x9
+
+PokemonTower_5F_EventScript_16343C:: @ 816343C
+ .incbin "baserom.gba", 0x16343C, 0x17
+
+PokemonTower_5F_EventScript_163453:: @ 8163453
+ .incbin "baserom.gba", 0x163453, 0x8
+
+PokemonTower_5F_EventScript_16345B:: @ 816345B
+ .incbin "baserom.gba", 0x16345B, 0x17
+
+PokemonTower_5F_EventScript_163472:: @ 8163472
+ .incbin "baserom.gba", 0x163472, 0x17
+
+PokemonTower_5F_EventScript_163489:: @ 8163489
+ .incbin "baserom.gba", 0x163489, 0x17
+
+PokemonTower_5F_EventScript_1634A0:: @ 81634A0
+ .incbin "baserom.gba", 0x1634A0, 0x17
gMapScripts_PokemonTower_6F:: @ 81634B7
.byte 0
@@ -1113,7 +1443,16 @@ gMapScripts_PokemonTower_7F:: @ 8163559
.byte 0
PokemonTower_7F_EventScript_16355A:: @ 816355A
- .incbin "baserom.gba", 0x16355A, 0x20A
+ .incbin "baserom.gba", 0x16355A, 0x2C
+
+PokemonTower_7F_EventScript_163586:: @ 8163586
+ .incbin "baserom.gba", 0x163586, 0xB7
+
+PokemonTower_7F_EventScript_16363D:: @ 816363D
+ .incbin "baserom.gba", 0x16363D, 0x99
+
+PokemonTower_7F_EventScript_1636D6:: @ 81636D6
+ .incbin "baserom.gba", 0x1636D6, 0x8E
gMapScripts_PowerPlant:: @ 8163764
map_script 5, PowerPlant_MapScript1_16376F
@@ -1139,7 +1478,34 @@ gMapScripts_MtEmber_RubyPath_B4F:: @ 81638EB
.byte 0
MtEmber_RubyPath_B4F_EventScript_1638EC:: @ 81638EC
- .incbin "baserom.gba", 0x1638EC, 0x5A
+ .incbin "baserom.gba", 0x1638EC, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_1638F5:: @ 81638F5
+ .incbin "baserom.gba", 0x1638F5, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_1638FE:: @ 81638FE
+ .incbin "baserom.gba", 0x1638FE, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_163907:: @ 8163907
+ .incbin "baserom.gba", 0x163907, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_163910:: @ 8163910
+ .incbin "baserom.gba", 0x163910, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_163919:: @ 8163919
+ .incbin "baserom.gba", 0x163919, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_163922:: @ 8163922
+ .incbin "baserom.gba", 0x163922, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_16392B:: @ 816392B
+ .incbin "baserom.gba", 0x16392B, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_163934:: @ 8163934
+ .incbin "baserom.gba", 0x163934, 0x9
+
+MtEmber_RubyPath_B4F_EventScript_16393D:: @ 816393D
+ .incbin "baserom.gba", 0x16393D, 0x9
gMapScripts_MtEmber_Exterior:: @ 8163946
map_script 3, MtEmber_Exterior_MapScript1_163951
@@ -1212,6 +1578,7 @@ gMapScripts_MtEmber_RubyPath_B3F:: @ 8163C48
.byte 0
MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49
+MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49
.incbin "baserom.gba", 0x163C49, 0x26
gMapScripts_MtEmber_RubyPath_B1F_Stairs:: @ 8163C6F
@@ -1283,17 +1650,50 @@ SSAnne_CaptainsOffice4_MapScript2_163F39:: @ 8163F39
.incbin "baserom.gba", 0x163F39, 0x4
SSAnne_CaptainsOffice4_MapScript1_163F3D:: @ 8163F3D
- .incbin "baserom.gba", 0x163F3D, 0x245
+ .incbin "baserom.gba", 0x163F3D, 0x1D
+
+SSAnne_CaptainsOffice4_EventScript_163F5A:: @ 8163F5A
+ .incbin "baserom.gba", 0x163F5A, 0x1E
+
+SSAnne_CaptainsOffice4_EventScript_163F78:: @ 8163F78
+ .incbin "baserom.gba", 0x163F78, 0x9
+
+SSAnne_CaptainsOffice4_EventScript_163F81:: @ 8163F81
+ .incbin "baserom.gba", 0x163F81, 0x12
+
+SSAnne_CaptainsOffice4_EventScript_163F93:: @ 8163F93
+ .incbin "baserom.gba", 0x163F93, 0x53
+
+SSAnne_CaptainsOffice4_EventScript_163FE6:: @ 8163FE6
+ .incbin "baserom.gba", 0x163FE6, 0x17
+
+SSAnne_CaptainsOffice4_EventScript_163FFD:: @ 8163FFD
+ .incbin "baserom.gba", 0x163FFD, 0x17
+
+SSAnne_CaptainsOffice4_EventScript_164014:: @ 8164014
+ .incbin "baserom.gba", 0x164014, 0x5C
+
+SSAnne_CaptainsOffice4_EventScript_164070:: @ 8164070
+ .incbin "baserom.gba", 0x164070, 0x17
+
+SSAnne_CaptainsOffice4_EventScript_164087:: @ 8164087
+ .incbin "baserom.gba", 0x164087, 0xFB
gMapScripts_SSAnne_CaptainsOffice5:: @ 8164182
map_script 3, SSAnne_CaptainsOffice5_MapScript1_164188
.byte 0
SSAnne_CaptainsOffice5_MapScript1_164188:: @ 8164188
- .incbin "baserom.gba", 0x164188, 0xD
+ .incbin "baserom.gba", 0x164188, 0x4
+
+SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C
+ .incbin "baserom.gba", 0x16418C, 0x9
SSAnne_CaptainsOffice9_EventScript_164195:: @ 8164195
- .incbin "baserom.gba", 0x164195, 0x12
+ .incbin "baserom.gba", 0x164195, 0x9
+
+SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E
+ .incbin "baserom.gba", 0x16419E, 0x9
SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7
.incbin "baserom.gba", 0x1641A7, 0x9
@@ -1314,7 +1714,10 @@ gMapScripts_SixIsland_DottedHole_SapphireRoom:: @ 81641B4
.byte 0
SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
- .incbin "baserom.gba", 0x1641B5, 0x3A4
+ .incbin "baserom.gba", 0x1641B5, 0x26A
+
+SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
+ .incbin "baserom.gba", 0x16441F, 0x13A
gMapScripts_SSAnne_1F_Room11:: @ 8164559
map_script 3, SSAnne_1F_Room11_MapScript1_16455F
@@ -1383,30 +1786,50 @@ SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8
+SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8
.incbin "baserom.gba", 0x1646C8, 0x6
SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE
+SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE
.incbin "baserom.gba", 0x1646CE, 0x6
SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4
+SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4
.incbin "baserom.gba", 0x1646D4, 0x6
SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA
+SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA
.incbin "baserom.gba", 0x1646DA, 0x6
SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0
+SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0
.incbin "baserom.gba", 0x1646E0, 0x6
gMapScripts_SevenIsland_TrainerTower_2F:: @ 81646E6
@@ -1659,7 +2082,28 @@ gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey:: @ 8164DCC
.byte 0
SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
- .incbin "baserom.gba", 0x164DD2, 0x1CC
+ .incbin "baserom.gba", 0x164DD2, 0x67
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
+ .incbin "baserom.gba", 0x164E39, 0x23
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
+ .incbin "baserom.gba", 0x164E5C, 0x23
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
+ .incbin "baserom.gba", 0x164E7F, 0x23
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
+ .incbin "baserom.gba", 0x164EA2, 0x23
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
+ .incbin "baserom.gba", 0x164EC5, 0x23
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
+ .incbin "baserom.gba", 0x164EE8, 0x23
+
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
+ .incbin "baserom.gba", 0x164F0B, 0x93
gMapScripts_NavelRock_1F:: @ 8164F9E
.byte 0
@@ -1673,7 +2117,10 @@ NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA
.incbin "baserom.gba", 0x164FAA, 0x33
NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD
- .incbin "baserom.gba", 0x164FDD, 0x10A
+ .incbin "baserom.gba", 0x164FDD, 0x1E
+
+NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
+ .incbin "baserom.gba", 0x164FFB, 0xEC
gMapScripts_NavelRock_Base:: @ 81650E7
map_script 3, NavelRock_Base_MapScript1_1650F2
@@ -1762,7 +2209,25 @@ gMapScripts_OneIsland_KindleRoad_EmberSpa:: @ 816535B
.byte 0
OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C
- .incbin "baserom.gba", 0x16535C, 0x8A
+ .incbin "baserom.gba", 0x16535C, 0x9
+
+OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365
+ .incbin "baserom.gba", 0x165365, 0x9
+
+OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E
+ .incbin "baserom.gba", 0x16536E, 0x9
+
+OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377
+ .incbin "baserom.gba", 0x165377, 0x9
+
+OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380
+ .incbin "baserom.gba", 0x165380, 0x19
+
+OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399
+ .incbin "baserom.gba", 0x165399, 0x36
+
+OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF
+ .incbin "baserom.gba", 0x1653CF, 0x17
gMapScripts_BirthIsland_Harbor:: @ 81653E6
.byte 0
@@ -1822,7 +2287,52 @@ gMapScripts_ViridianCity:: @ 81658D3
.byte 0
ViridianCity_MapScript1_1658D9:: @ 81658D9
- .incbin "baserom.gba", 0x1658D9, 0x2B5
+ .incbin "baserom.gba", 0x1658D9, 0x94
+
+ViridianCity_EventScript_16596D:: @ 816596D
+ .incbin "baserom.gba", 0x16596D, 0x27
+
+ViridianCity_EventScript_165994:: @ 8165994
+ .incbin "baserom.gba", 0x165994, 0x9
+
+ViridianCity_EventScript_16599D:: @ 816599D
+ .incbin "baserom.gba", 0x16599D, 0x9
+
+ViridianCity_EventScript_1659A6:: @ 81659A6
+ .incbin "baserom.gba", 0x1659A6, 0x9
+
+ViridianCity_EventScript_1659AF:: @ 81659AF
+ .incbin "baserom.gba", 0x1659AF, 0x9
+
+ViridianCity_EventScript_1659B8:: @ 81659B8
+ .incbin "baserom.gba", 0x1659B8, 0x9
+
+ViridianCity_EventScript_1659C1:: @ 81659C1
+ .incbin "baserom.gba", 0x1659C1, 0x9
+
+ViridianCity_EventScript_1659CA:: @ 81659CA
+ .incbin "baserom.gba", 0x1659CA, 0x2C
+
+ViridianCity_EventScript_1659F6:: @ 81659F6
+ .incbin "baserom.gba", 0x1659F6, 0x99
+
+ViridianCity_EventScript_165A8F:: @ 8165A8F
+ .incbin "baserom.gba", 0x165A8F, 0x35
+
+ViridianCity_EventScript_165AC4:: @ 8165AC4
+ .incbin "baserom.gba", 0x165AC4, 0x2C
+
+ViridianCity_EventScript_165AF0:: @ 8165AF0
+ .incbin "baserom.gba", 0x165AF0, 0x6
+
+ViridianCity_EventScript_165AF6:: @ 8165AF6
+ .incbin "baserom.gba", 0x165AF6, 0x1A
+
+ViridianCity_EventScript_165B10:: @ 8165B10
+ .incbin "baserom.gba", 0x165B10, 0x1E
+
+ViridianCity_EventScript_165B2E:: @ 8165B2E
+ .incbin "baserom.gba", 0x165B2E, 0x60
gMapScripts_PewterCity:: @ 8165B8E
map_script 3, PewterCity_MapScript1_165B94
@@ -1890,7 +2400,61 @@ gMapScripts_CeruleanCity:: @ 8166471
.byte 0
CeruleanCity_MapScript1_166477:: @ 8166477
- .incbin "baserom.gba", 0x166477, 0x3F4
+ .incbin "baserom.gba", 0x166477, 0x23
+
+CeruleanCity_EventScript_16649A:: @ 816649A
+ .incbin "baserom.gba", 0x16649A, 0xC
+
+CeruleanCity_EventScript_1664A6:: @ 81664A6
+ .incbin "baserom.gba", 0x1664A6, 0x13
+
+CeruleanCity_EventScript_1664B9:: @ 81664B9
+ .incbin "baserom.gba", 0x1664B9, 0x14A
+
+CeruleanCity_EventScript_166603:: @ 8166603
+ .incbin "baserom.gba", 0x166603, 0x80
+
+CeruleanCity_EventScript_166683:: @ 8166683
+ .incbin "baserom.gba", 0x166683, 0x20
+
+CeruleanCity_EventScript_1666A3:: @ 81666A3
+ .incbin "baserom.gba", 0x1666A3, 0x44
+
+CeruleanCity_EventScript_1666E7:: @ 81666E7
+ .incbin "baserom.gba", 0x1666E7, 0x17
+
+CeruleanCity_EventScript_1666FE:: @ 81666FE
+ .incbin "baserom.gba", 0x1666FE, 0x1F
+
+CeruleanCity_EventScript_16671D:: @ 816671D
+ .incbin "baserom.gba", 0x16671D, 0x9
+
+CeruleanCity_EventScript_166726:: @ 8166726
+ .incbin "baserom.gba", 0x166726, 0x9
+
+CeruleanCity_EventScript_16672F:: @ 816672F
+ .incbin "baserom.gba", 0x16672F, 0x9
+
+CeruleanCity_EventScript_166738:: @ 8166738
+ .incbin "baserom.gba", 0x166738, 0x17
+
+CeruleanCity_EventScript_16674F:: @ 816674F
+ .incbin "baserom.gba", 0x16674F, 0x8E
+
+CeruleanCity_EventScript_1667DD:: @ 81667DD
+ .incbin "baserom.gba", 0x1667DD, 0x5B
+
+CeruleanCity_EventScript_166838:: @ 8166838
+ .incbin "baserom.gba", 0x166838, 0x9
+
+CeruleanCity_EventScript_166841:: @ 8166841
+ .incbin "baserom.gba", 0x166841, 0x9
+
+CeruleanCity_EventScript_16684A:: @ 816684A
+ .incbin "baserom.gba", 0x16684A, 0x9
+
+CeruleanCity_EventScript_166853:: @ 8166853
+ .incbin "baserom.gba", 0x166853, 0x18
gMapScripts_LavenderTown:: @ 816686B
map_script 3, LavenderTown_MapScript1_166871
@@ -1929,7 +2493,52 @@ VermilionCity_MapScript2_1668E7:: @ 81668E7
.incbin "baserom.gba", 0x1668E7, 0x1F
VermilionCity_MapScript1_166906:: @ 8166906
- .incbin "baserom.gba", 0x166906, 0x389
+ .incbin "baserom.gba", 0x166906, 0x11
+
+VermilionCity_EventScript_166917:: @ 8166917
+ .incbin "baserom.gba", 0x166917, 0x9
+
+VermilionCity_EventScript_166920:: @ 8166920
+ .incbin "baserom.gba", 0x166920, 0x21
+
+VermilionCity_EventScript_166941:: @ 8166941
+ .incbin "baserom.gba", 0x166941, 0x249
+
+VermilionCity_EventScript_166B8A:: @ 8166B8A
+ .incbin "baserom.gba", 0x166B8A, 0x7
+
+VermilionCity_EventScript_166B91:: @ 8166B91
+ .incbin "baserom.gba", 0x166B91, 0x7
+
+VermilionCity_EventScript_166B98:: @ 8166B98
+ .incbin "baserom.gba", 0x166B98, 0x7F
+
+VermilionCity_EventScript_166C17:: @ 8166C17
+ .incbin "baserom.gba", 0x166C17, 0x9
+
+VermilionCity_EventScript_166C20:: @ 8166C20
+ .incbin "baserom.gba", 0x166C20, 0xF
+
+VermilionCity_EventScript_166C2F:: @ 8166C2F
+ .incbin "baserom.gba", 0x166C2F, 0x9
+
+VermilionCity_EventScript_166C38:: @ 8166C38
+ .incbin "baserom.gba", 0x166C38, 0x1B
+
+VermilionCity_EventScript_166C53:: @ 8166C53
+ .incbin "baserom.gba", 0x166C53, 0x9
+
+VermilionCity_EventScript_166C5C:: @ 8166C5C
+ .incbin "baserom.gba", 0x166C5C, 0x9
+
+VermilionCity_EventScript_166C65:: @ 8166C65
+ .incbin "baserom.gba", 0x166C65, 0x9
+
+VermilionCity_EventScript_166C6E:: @ 8166C6E
+ .incbin "baserom.gba", 0x166C6E, 0x18
+
+VermilionCity_EventScript_166C86:: @ 8166C86
+ .incbin "baserom.gba", 0x166C86, 0x9
gMapScripts_CeladonCity:: @ 8166C8F
map_script 3, CeladonCity_MapScript1_166C95
@@ -2000,7 +2609,55 @@ gMapScripts_FuchsiaCity:: @ 8166D75
.byte 0
FuchsiaCity_MapScript1_166D7B:: @ 8166D7B
- .incbin "baserom.gba", 0x166D7B, 0x15B
+ .incbin "baserom.gba", 0x166D7B, 0x22
+
+FuchsiaCity_EventScript_166D9D:: @ 8166D9D
+ .incbin "baserom.gba", 0x166D9D, 0x9
+
+FuchsiaCity_EventScript_166DA6:: @ 8166DA6
+ .incbin "baserom.gba", 0x166DA6, 0x9
+
+FuchsiaCity_EventScript_166DAF:: @ 8166DAF
+ .incbin "baserom.gba", 0x166DAF, 0x9
+
+FuchsiaCity_EventScript_166DB8:: @ 8166DB8
+ .incbin "baserom.gba", 0x166DB8, 0x9
+
+FuchsiaCity_EventScript_166DC1:: @ 8166DC1
+ .incbin "baserom.gba", 0x166DC1, 0x19
+
+FuchsiaCity_EventScript_166DDA:: @ 8166DDA
+ .incbin "baserom.gba", 0x166DDA, 0x9
+
+FuchsiaCity_EventScript_166DE3:: @ 8166DE3
+ .incbin "baserom.gba", 0x166DE3, 0x9
+
+FuchsiaCity_EventScript_166DEC:: @ 8166DEC
+ .incbin "baserom.gba", 0x166DEC, 0x9
+
+FuchsiaCity_EventScript_166DF5:: @ 8166DF5
+ .incbin "baserom.gba", 0x166DF5, 0x12
+
+FuchsiaCity_EventScript_166E07:: @ 8166E07
+ .incbin "baserom.gba", 0x166E07, 0x18
+
+FuchsiaCity_EventScript_166E1F:: @ 8166E1F
+ .incbin "baserom.gba", 0x166E1F, 0x19
+
+FuchsiaCity_EventScript_166E38:: @ 8166E38
+ .incbin "baserom.gba", 0x166E38, 0x19
+
+FuchsiaCity_EventScript_166E51:: @ 8166E51
+ .incbin "baserom.gba", 0x166E51, 0x19
+
+FuchsiaCity_EventScript_166E6A:: @ 8166E6A
+ .incbin "baserom.gba", 0x166E6A, 0x19
+
+FuchsiaCity_EventScript_166E83:: @ 8166E83
+ .incbin "baserom.gba", 0x166E83, 0x19
+
+FuchsiaCity_EventScript_166E9C:: @ 8166E9C
+ .incbin "baserom.gba", 0x166E9C, 0x3A
gMapScripts_CinnabarIsland:: @ 8166ED6
map_script 3, CinnabarIsland_MapScript1_166EE1
@@ -2149,7 +2806,37 @@ gMapScripts_TwoIsland:: @ 8167564
.byte 0
TwoIsland_MapScript1_16756A:: @ 816756A
- .incbin "baserom.gba", 0x16756A, 0x243
+ .incbin "baserom.gba", 0x16756A, 0xA5
+
+TwoIsland_EventScript_16760F:: @ 816760F
+ .incbin "baserom.gba", 0x16760F, 0x13D
+
+TwoIsland_EventScript_16774C:: @ 816774C
+ .incbin "baserom.gba", 0x16774C, 0x9
+
+TwoIsland_EventScript_167755:: @ 8167755
+ .incbin "baserom.gba", 0x167755, 0x9
+
+TwoIsland_EventScript_16775E:: @ 816775E
+ .incbin "baserom.gba", 0x16775E, 0x19
+
+TwoIsland_EventScript_167777:: @ 8167777
+ .incbin "baserom.gba", 0x167777, 0x9
+
+TwoIsland_EventScript_167780:: @ 8167780
+ .incbin "baserom.gba", 0x167780, 0x9
+
+TwoIsland_EventScript_167789:: @ 8167789
+ .incbin "baserom.gba", 0x167789, 0x9
+
+TwoIsland_EventScript_167792:: @ 8167792
+ .incbin "baserom.gba", 0x167792, 0x9
+
+TwoIsland_EventScript_16779B:: @ 816779B
+ .incbin "baserom.gba", 0x16779B, 0x9
+
+TwoIsland_EventScript_1677A4:: @ 81677A4
+ .incbin "baserom.gba", 0x1677A4, 0x9
gMapScripts_ThreeIsland:: @ 81677AD
map_script 3, ThreeIsland_MapScript1_1677B3
@@ -2209,7 +2896,25 @@ FourIsland_MapScript1_167CB9:: @ 8167CB9
.incbin "baserom.gba", 0x167CB9, 0x29
FourIsland_MapScript2_167CE2:: @ 8167CE2
- .incbin "baserom.gba", 0x167CE2, 0x1AC
+ .incbin "baserom.gba", 0x167CE2, 0x73
+
+FourIsland_EventScript_167D55:: @ 8167D55
+ .incbin "baserom.gba", 0x167D55, 0xD9
+
+FourIsland_EventScript_167E2E:: @ 8167E2E
+ .incbin "baserom.gba", 0x167E2E, 0x2C
+
+FourIsland_EventScript_167E5A:: @ 8167E5A
+ .incbin "baserom.gba", 0x167E5A, 0x19
+
+FourIsland_EventScript_167E73:: @ 8167E73
+ .incbin "baserom.gba", 0x167E73, 0x9
+
+FourIsland_EventScript_167E7C:: @ 8167E7C
+ .incbin "baserom.gba", 0x167E7C, 0x9
+
+FourIsland_EventScript_167E85:: @ 8167E85
+ .incbin "baserom.gba", 0x167E85, 0x9
gMapScripts_FiveIsland:: @ 8167E8E
map_script 3, FiveIsland_MapScript1_167E94
@@ -2232,7 +2937,16 @@ gMapScripts_SevenIsland:: @ 8167EB3
.byte 0
SevenIsland_MapScript1_167EB9:: @ 8167EB9
- .incbin "baserom.gba", 0x167EB9, 0x1F
+ .incbin "baserom.gba", 0x167EB9, 0x4
+
+SevenIsland_EventScript_167EBD:: @ 8167EBD
+ .incbin "baserom.gba", 0x167EBD, 0x9
+
+SevenIsland_EventScript_167EC6:: @ 8167EC6
+ .incbin "baserom.gba", 0x167EC6, 0x9
+
+SevenIsland_EventScript_167ECF:: @ 8167ECF
+ .incbin "baserom.gba", 0x167ECF, 0x9
gMapScripts_SixIsland:: @ 8167ED8
map_script 3, SixIsland_MapScript1_167EDE
@@ -2254,7 +2968,13 @@ gMapScripts_Route1:: @ 8167EFD
.byte 0
Route1_EventScript_167EFE:: @ 8167EFE
- .incbin "baserom.gba", 0x167EFE, 0x66
+ .incbin "baserom.gba", 0x167EFE, 0x54
+
+Route1_EventScript_167F52:: @ 8167F52
+ .incbin "baserom.gba", 0x167F52, 0x9
+
+Route1_EventScript_167F5B:: @ 8167F5B
+ .incbin "baserom.gba", 0x167F5B, 0x9
gMapScripts_Route2:: @ 8167F64
.byte 0
@@ -2269,7 +2989,10 @@ gMapScripts_Route3:: @ 8167F77
.byte 0
Route3_EventScript_167F78:: @ 8167F78
- .incbin "baserom.gba", 0x167F78, 0x12
+ .incbin "baserom.gba", 0x167F78, 0x9
+
+Route3_EventScript_167F81:: @ 8167F81
+ .incbin "baserom.gba", 0x167F81, 0x9
gMapScripts_Route4:: @ 8167F8A
.byte 0
@@ -2357,7 +3080,13 @@ gMapScripts_Route13:: @ 81680B5
.byte 0
Route13_EventScript_1680B6:: @ 81680B6
- .incbin "baserom.gba", 0x1680B6, 0x1B
+ .incbin "baserom.gba", 0x1680B6, 0x9
+
+Route13_EventScript_1680BF:: @ 81680BF
+ .incbin "baserom.gba", 0x1680BF, 0x9
+
+Route13_EventScript_1680C8:: @ 81680C8
+ .incbin "baserom.gba", 0x1680C8, 0x9
gMapScripts_Route14:: @ 81680D1
.byte 0
@@ -2399,7 +3128,22 @@ gMapScripts_Route17:: @ 81681BF
.byte 0
Route17_EventScript_1681C0:: @ 81681C0
- .incbin "baserom.gba", 0x1681C0, 0x36
+ .incbin "baserom.gba", 0x1681C0, 0x9
+
+Route17_EventScript_1681C9:: @ 81681C9
+ .incbin "baserom.gba", 0x1681C9, 0x9
+
+Route17_EventScript_1681D2:: @ 81681D2
+ .incbin "baserom.gba", 0x1681D2, 0x9
+
+Route17_EventScript_1681DB:: @ 81681DB
+ .incbin "baserom.gba", 0x1681DB, 0x9
+
+Route17_EventScript_1681E4:: @ 81681E4
+ .incbin "baserom.gba", 0x1681E4, 0x9
+
+Route17_EventScript_1681ED:: @ 81681ED
+ .incbin "baserom.gba", 0x1681ED, 0x9
gMapScripts_Route18:: @ 81681F6
map_script 3, Route18_MapScript1_168201
@@ -2444,7 +3188,25 @@ gMapScripts_Route22:: @ 816828B
.byte 0
Route22_EventScript_16828C:: @ 816828C
- .incbin "baserom.gba", 0x16828C, 0x25F
+ .incbin "baserom.gba", 0x16828C, 0xC
+
+Route22_EventScript_168298:: @ 8168298
+ .incbin "baserom.gba", 0x168298, 0x13
+
+Route22_EventScript_1682AB:: @ 81682AB
+ .incbin "baserom.gba", 0x1682AB, 0x142
+
+Route22_EventScript_1683ED:: @ 81683ED
+ .incbin "baserom.gba", 0x1683ED, 0xC
+
+Route22_EventScript_1683F9:: @ 81683F9
+ .incbin "baserom.gba", 0x1683F9, 0x13
+
+Route22_EventScript_16840C:: @ 816840C
+ .incbin "baserom.gba", 0x16840C, 0xD6
+
+Route22_EventScript_1684E2:: @ 81684E2
+ .incbin "baserom.gba", 0x1684E2, 0x9
gMapScripts_Route23:: @ 81684EB
map_script 3, Route23_MapScript1_1684F1
@@ -2502,7 +3264,13 @@ gMapScripts_Route24:: @ 816861F
.byte 0
Route24_EventScript_168620:: @ 8168620
- .incbin "baserom.gba", 0x168620, 0x125
+ .incbin "baserom.gba", 0x168620, 0x40
+
+Route24_EventScript_168660:: @ 8168660
+ .incbin "baserom.gba", 0x168660, 0xC
+
+Route24_EventScript_16866C:: @ 816866C
+ .incbin "baserom.gba", 0x16866C, 0xD9
gMapScripts_Route25:: @ 8168745
.byte 0
@@ -2517,7 +3285,10 @@ gMapScripts_OneIsland_KindleRoad:: @ 8168758
.byte 0
OneIsland_KindleRoad_EventScript_168759:: @ 8168759
- .incbin "baserom.gba", 0x168759, 0x12
+ .incbin "baserom.gba", 0x168759, 0x9
+
+OneIsland_KindleRoad_EventScript_168762:: @ 8168762
+ .incbin "baserom.gba", 0x168762, 0x9
gMapScripts_OneIsland_TreasureBeach:: @ 816876B
.byte 0
@@ -2542,7 +3313,16 @@ gMapScripts_ThreeIsland_Port:: @ 8168789
.byte 0
ThreeIsland_Port_MapScript1_16878F:: @ 816878F
- .incbin "baserom.gba", 0x16878F, 0x51
+ .incbin "baserom.gba", 0x16878F, 0x7
+
+ThreeIsland_Port_EventScript_168796:: @ 8168796
+ .incbin "baserom.gba", 0x168796, 0x36
+
+ThreeIsland_Port_EventScript_1687CC:: @ 81687CC
+ .incbin "baserom.gba", 0x1687CC, 0x9
+
+ThreeIsland_Port_EventScript_1687D5:: @ 81687D5
+ .incbin "baserom.gba", 0x1687D5, 0xB
gMapScripts_UnknownMap_03_50:: @ 81687E0
.byte 0
@@ -2599,7 +3379,10 @@ gMapScripts_FiveIsland_MemorialPillar:: @ 81689D2
.byte 0
FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3
- .incbin "baserom.gba", 0x1689D3, 0x142
+ .incbin "baserom.gba", 0x1689D3, 0x75
+
+FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
+ .incbin "baserom.gba", 0x168A48, 0xCD
gMapScripts_SixIsland_OutcastIsland:: @ 8168B15
.byte 0
@@ -2611,7 +3394,10 @@ gMapScripts_SixIsland_GreenPath:: @ 8168B2D
.byte 0
SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E
- .incbin "baserom.gba", 0x168B2E, 0x12
+ .incbin "baserom.gba", 0x168B2E, 0x9
+
+SixIsland_GreenPath_EventScript_168B37:: @ 8168B37
+ .incbin "baserom.gba", 0x168B37, 0x9
gMapScripts_SixIsland_WaterPath:: @ 8168B40
.byte 0
@@ -2627,7 +3413,13 @@ gMapScripts_SixIsland_RuinValley:: @ 8168B53
.byte 0
SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59
- .incbin "baserom.gba", 0x168B59, 0x7C
+ .incbin "baserom.gba", 0x168B59, 0x14
+
+SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D
+ .incbin "baserom.gba", 0x168B6D, 0x27
+
+SixIsland_RuinValley_EventScript_168B94:: @ 8168B94
+ .incbin "baserom.gba", 0x168B94, 0x41
gMapScripts_SevenIsland_TrainerTower:: @ 8168BD5
map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB
@@ -2675,9 +3467,16 @@ PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE
.incbin "baserom.gba", 0x168CAE, 0x10
PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE
- .incbin "baserom.gba", 0x168CBE, 0x26
+ .incbin "baserom.gba", 0x168CBE, 0x14
+
+PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2
+ .incbin "baserom.gba", 0x168CD2, 0x9
+
+PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB
+ .incbin "baserom.gba", 0x168CDB, 0x9
gUnknown_8168CE4:: @ 8168CE4
+PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
.incbin "baserom.gba", 0x168CE4, 0x33
gUnknown_8168D17:: @ 8168D17
@@ -2715,7 +3514,55 @@ PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1
.incbin "baserom.gba", 0x168FE1, 0xF
PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0
- .incbin "baserom.gba", 0x168FF0, 0xEAA
+ .incbin "baserom.gba", 0x168FF0, 0x2D3
+
+PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3
+ .incbin "baserom.gba", 0x1692C3, 0x24
+
+PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7
+ .incbin "baserom.gba", 0x1692E7, 0xC
+
+PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3
+ .incbin "baserom.gba", 0x1692F3, 0xC
+
+PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF
+ .incbin "baserom.gba", 0x1692FF, 0x260
+
+PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F
+ .incbin "baserom.gba", 0x16955F, 0x36
+
+PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
+ .incbin "baserom.gba", 0x169595, 0x616
+
+PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB
+ .incbin "baserom.gba", 0x169BAB, 0x1CD
+
+PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78
+ .incbin "baserom.gba", 0x169D78, 0x36
+
+PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE
+ .incbin "baserom.gba", 0x169DAE, 0x40
+
+PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE
+ .incbin "baserom.gba", 0x169DEE, 0x2C
+
+PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A
+ .incbin "baserom.gba", 0x169E1A, 0x2C
+
+PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46
+ .incbin "baserom.gba", 0x169E46, 0x19
+
+PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F
+ .incbin "baserom.gba", 0x169E5F, 0x9
+
+PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68
+ .incbin "baserom.gba", 0x169E68, 0x9
+
+PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71
+ .incbin "baserom.gba", 0x169E71, 0x9
+
+PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A
+ .incbin "baserom.gba", 0x169E7A, 0x20
gMapScripts_ViridianCity_House1:: @ 8169E9A
.byte 0
@@ -2736,7 +3583,37 @@ gMapScripts_ViridianCity_Gym:: @ 8169EC9
.byte 0
ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
- .incbin "baserom.gba", 0x169ECA, 0x1B2
+ .incbin "baserom.gba", 0x169ECA, 0xB0
+
+ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A
+ .incbin "baserom.gba", 0x169F7A, 0x17
+
+ViridianCity_Gym_EventScript_169F91:: @ 8169F91
+ .incbin "baserom.gba", 0x169F91, 0x17
+
+ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8
+ .incbin "baserom.gba", 0x169FA8, 0x17
+
+ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF
+ .incbin "baserom.gba", 0x169FBF, 0x17
+
+ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6
+ .incbin "baserom.gba", 0x169FD6, 0x17
+
+ViridianCity_Gym_EventScript_169FED:: @ 8169FED
+ .incbin "baserom.gba", 0x169FED, 0x17
+
+ViridianCity_Gym_EventScript_16A004:: @ 816A004
+ .incbin "baserom.gba", 0x16A004, 0x17
+
+ViridianCity_Gym_EventScript_16A01B:: @ 816A01B
+ .incbin "baserom.gba", 0x16A01B, 0x17
+
+ViridianCity_Gym_EventScript_16A032:: @ 816A032
+ .incbin "baserom.gba", 0x16A032, 0x2C
+
+ViridianCity_Gym_EventScript_16A05E:: @ 816A05E
+ .incbin "baserom.gba", 0x16A05E, 0x1E
gMapScripts_ViridianCity_House2:: @ 816A07C
.byte 0
@@ -2762,7 +3639,16 @@ ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE
.incbin "baserom.gba", 0x16A1DE, 0x1D
ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB
- .incbin "baserom.gba", 0x16A1FB, 0xC5
+ .incbin "baserom.gba", 0x16A1FB, 0x6D
+
+ViridianCity_Mart_EventScript_16A268:: @ 816A268
+ .incbin "baserom.gba", 0x16A268, 0x46
+
+ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE
+ .incbin "baserom.gba", 0x16A2AE, 0x9
+
+ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7
+ .incbin "baserom.gba", 0x16A2B7, 0x9
gMapScripts_ViridianCity_PokemonCenter_1F:: @ 816A2C0
map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB
@@ -2831,7 +3717,25 @@ gMapScripts_PewterCity_Museum_2F:: @ 816A552
.byte 0
PewterCity_Museum_2F_EventScript_16A553:: @ 816A553
- .incbin "baserom.gba", 0x16A553, 0x3F
+ .incbin "baserom.gba", 0x16A553, 0x9
+
+PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C
+ .incbin "baserom.gba", 0x16A55C, 0x9
+
+PewterCity_Museum_2F_EventScript_16A565:: @ 816A565
+ .incbin "baserom.gba", 0x16A565, 0x9
+
+PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E
+ .incbin "baserom.gba", 0x16A56E, 0x9
+
+PewterCity_Museum_2F_EventScript_16A577:: @ 816A577
+ .incbin "baserom.gba", 0x16A577, 0x9
+
+PewterCity_Museum_2F_EventScript_16A580:: @ 816A580
+ .incbin "baserom.gba", 0x16A580, 0x9
+
+PewterCity_Museum_2F_EventScript_16A589:: @ 816A589
+ .incbin "baserom.gba", 0x16A589, 0x9
gMapScripts_PewterCity_Gym:: @ 816A592
.byte 0
@@ -2852,7 +3756,13 @@ gMapScripts_PewterCity_Mart:: @ 816A6CD
.byte 0
PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE
- .incbin "baserom.gba", 0x16A6CE, 0x4E
+ .incbin "baserom.gba", 0x16A6CE, 0x9
+
+PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7
+ .incbin "baserom.gba", 0x16A6D7, 0x9
+
+PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0
+ .incbin "baserom.gba", 0x16A6E0, 0x3C
gMapScripts_PewterCity_House1:: @ 816A71C
.byte 0
@@ -2872,7 +3782,25 @@ gMapScripts_PewterCity_PokemonCenter_1F:: @ 816A760
.byte 0
PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B
- .incbin "baserom.gba", 0x16A76B, 0x4A
+ .incbin "baserom.gba", 0x16A76B, 0x4
+
+PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F
+ .incbin "baserom.gba", 0x16A76F, 0x9
+
+PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778
+ .incbin "baserom.gba", 0x16A778, 0x9
+
+PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781
+ .incbin "baserom.gba", 0x16A781, 0x17
+
+PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798
+ .incbin "baserom.gba", 0x16A798, 0x9
+
+PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1
+ .incbin "baserom.gba", 0x16A7A1, 0xB
+
+PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC
+ .incbin "baserom.gba", 0x16A7AC, 0x9
gMapScripts_PewterCity_PokemonCenter_2F:: @ 816A7B5
map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3
@@ -2888,7 +3816,10 @@ gMapScripts_PewterCity_House2:: @ 816A7DC
.byte 0
PewterCity_House2_EventScript_16A7DD:: @ 816A7DD
- .incbin "baserom.gba", 0x16A7DD, 0x12
+ .incbin "baserom.gba", 0x16A7DD, 0x9
+
+PewterCity_House2_EventScript_16A7E6:: @ 816A7E6
+ .incbin "baserom.gba", 0x16A7E6, 0x9
gMapScripts_CeruleanCity_House1:: @ 816A7EF
.byte 0
@@ -2900,7 +3831,13 @@ gMapScripts_CeruleanCity_House2:: @ 816A975
.byte 0
CeruleanCity_House2_EventScript_16A976:: @ 816A976
- .incbin "baserom.gba", 0x16A976, 0x31
+ .incbin "baserom.gba", 0x16A976, 0x1F
+
+CeruleanCity_House2_EventScript_16A995:: @ 816A995
+ .incbin "baserom.gba", 0x16A995, 0x9
+
+CeruleanCity_House2_EventScript_16A99E:: @ 816A99E
+ .incbin "baserom.gba", 0x16A99E, 0x9
gMapScripts_CeruleanCity_House3:: @ 816A9A7
.byte 0
@@ -2917,7 +3854,22 @@ gMapScripts_CeruleanCity_PokemonCenter_1F:: @ 816AA2D
.byte 0
CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38
- .incbin "baserom.gba", 0x16AA38, 0x41
+ .incbin "baserom.gba", 0x16AA38, 0x4
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C
+ .incbin "baserom.gba", 0x16AA3C, 0x9
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45
+ .incbin "baserom.gba", 0x16AA45, 0x9
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E
+ .incbin "baserom.gba", 0x16AA4E, 0x9
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
+ .incbin "baserom.gba", 0x16AA57, 0x19
+
+CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70
+ .incbin "baserom.gba", 0x16AA70, 0x9
gMapScripts_CeruleanCity_PokemonCenter_2F:: @ 816AA79
map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3
@@ -2933,7 +3885,19 @@ gMapScripts_CeruleanCity_Gym:: @ 816AAA0
.byte 0
CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
- .incbin "baserom.gba", 0x16AAA1, 0x11B
+ .incbin "baserom.gba", 0x16AAA1, 0xA3
+
+CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
+ .incbin "baserom.gba", 0x16AB44, 0x17
+
+CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
+ .incbin "baserom.gba", 0x16AB5B, 0x24
+
+CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F
+ .incbin "baserom.gba", 0x16AB7F, 0x1F
+
+CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E
+ .incbin "baserom.gba", 0x16AB9E, 0x1E
gMapScripts_CeruleanCity_BikeShop:: @ 816ABBC
.byte 0
@@ -2948,13 +3912,20 @@ CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
.incbin "baserom.gba", 0x16AC75, 0x1F
CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94
+CeruleanCity_EventScript_16AC94:: @ 816AC94
.incbin "baserom.gba", 0x16AC94, 0x9
gMapScripts_CeruleanCity_Mart:: @ 816AC9D
.byte 0
CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E
- .incbin "baserom.gba", 0x16AC9E, 0x50
+ .incbin "baserom.gba", 0x16AC9E, 0x9
+
+CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7
+ .incbin "baserom.gba", 0x16ACA7, 0x9
+
+CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
+ .incbin "baserom.gba", 0x16ACB0, 0x3E
gMapScripts_CeruleanCity_House4:: @ 816ACEE
.byte 0
@@ -2966,7 +3937,10 @@ gMapScripts_CeruleanCity_House5:: @ 816AE4F
.byte 0
CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
- .incbin "baserom.gba", 0x16AE50, 0x29F
+ .incbin "baserom.gba", 0x16AE50, 0x28A
+
+CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA
+ .incbin "baserom.gba", 0x16B0DA, 0x15
gMapScripts_LavenderTown_PokemonCenter_1F:: @ 816B0EF
map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA
@@ -3029,7 +4003,10 @@ gMapScripts_LavenderTown_House1:: @ 816B232
.byte 0
LavenderTown_House1_EventScript_16B233:: @ 816B233
- .incbin "baserom.gba", 0x16B233, 0x32
+ .incbin "baserom.gba", 0x16B233, 0x1F
+
+LavenderTown_House1_EventScript_16B252:: @ 816B252
+ .incbin "baserom.gba", 0x16B252, 0x13
gMapScripts_LavenderTown_House2:: @ 816B265
.byte 0
@@ -3041,7 +4018,16 @@ gMapScripts_LavenderTown_Mart:: @ 816B34F
.byte 0
LavenderTown_Mart_EventScript_16B350:: @ 816B350
- .incbin "baserom.gba", 0x16B350, 0x56
+ .incbin "baserom.gba", 0x16B350, 0x9
+
+LavenderTown_Mart_EventScript_16B359:: @ 816B359
+ .incbin "baserom.gba", 0x16B359, 0x9
+
+LavenderTown_Mart_EventScript_16B362:: @ 816B362
+ .incbin "baserom.gba", 0x16B362, 0x9
+
+LavenderTown_Mart_EventScript_16B36B:: @ 816B36B
+ .incbin "baserom.gba", 0x16B36B, 0x3B
gMapScripts_VermilionCity_House1:: @ 816B3A6
.byte 0
@@ -3055,7 +4041,19 @@ gMapScripts_VermilionCity_PokemonCenter_1F:: @ 816B424
.byte 0
VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F
- .incbin "baserom.gba", 0x16B42F, 0x28
+ .incbin "baserom.gba", 0x16B42F, 0x4
+
+VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433
+ .incbin "baserom.gba", 0x16B433, 0x9
+
+VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C
+ .incbin "baserom.gba", 0x16B43C, 0x9
+
+VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445
+ .incbin "baserom.gba", 0x16B445, 0x9
+
+VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E
+ .incbin "baserom.gba", 0x16B44E, 0x9
gMapScripts_VermilionCity_PokemonCenter_2F:: @ 816B457
map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3
@@ -3071,7 +4069,28 @@ gMapScripts_VermilionCity_PokemonFanClub:: @ 816B47E
.byte 0
VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F
- .incbin "baserom.gba", 0x16B47F, 0x157
+ .incbin "baserom.gba", 0x16B47F, 0x7D
+
+VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC
+ .incbin "baserom.gba", 0x16B4FC, 0x2C
+
+VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528
+ .incbin "baserom.gba", 0x16B528, 0x3B
+
+VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563
+ .incbin "baserom.gba", 0x16B563, 0x3B
+
+VermilionCity_PokemonFanClub_EventScript_16B59E:: @ 816B59E
+ .incbin "baserom.gba", 0x16B59E, 0x13
+
+VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1
+ .incbin "baserom.gba", 0x16B5B1, 0x13
+
+VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4
+ .incbin "baserom.gba", 0x16B5C4, 0x9
+
+VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD
+ .incbin "baserom.gba", 0x16B5CD, 0x9
gMapScripts_VermilionCity_House2:: @ 816B5D6
.byte 0
@@ -3083,7 +4102,13 @@ gMapScripts_VermilionCity_Mart:: @ 816B653
.byte 0
VermilionCity_Mart_EventScript_16B654:: @ 816B654
- .incbin "baserom.gba", 0x16B654, 0x4A
+ .incbin "baserom.gba", 0x16B654, 0x9
+
+VermilionCity_Mart_EventScript_16B65D:: @ 816B65D
+ .incbin "baserom.gba", 0x16B65D, 0x9
+
+VermilionCity_Mart_EventScript_16B666:: @ 816B666
+ .incbin "baserom.gba", 0x16B666, 0x38
gMapScripts_VermilionCity_Gym:: @ 816B69E
map_script 1, VermilionCity_Gym_MapScript1_16B6A9
@@ -3163,7 +4188,16 @@ gMapScripts_VermilionCity_House3:: @ 816BAA9
.byte 0
VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA
- .incbin "baserom.gba", 0x16BAAA, 0x2E
+ .incbin "baserom.gba", 0x16BAAA, 0x9
+
+VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3
+ .incbin "baserom.gba", 0x16BAB3, 0x9
+
+VermilionCity_House3_EventScript_16BABC:: @ 816BABC
+ .incbin "baserom.gba", 0x16BABC, 0x13
+
+VermilionCity_House3_EventScript_16BACF:: @ 816BACF
+ .incbin "baserom.gba", 0x16BACF, 0x9
gMapScripts_CeladonCity_DepartmentStore_1F:: @ 816BAD8
.byte 0
@@ -3181,7 +4215,19 @@ gMapScripts_CeladonCity_DepartmentStore_2F:: @ 816BAF4
.byte 0
CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5
- .incbin "baserom.gba", 0x16BAF5, 0x8F
+ .incbin "baserom.gba", 0x16BAF5, 0x9
+
+CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE
+ .incbin "baserom.gba", 0x16BAFE, 0x9
+
+CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
+ .incbin "baserom.gba", 0x16BB07, 0x9
+
+CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
+ .incbin "baserom.gba", 0x16BB10, 0x3E
+
+CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
+ .incbin "baserom.gba", 0x16BB4E, 0x36
gMapScripts_CeladonCity_DepartmentStore_3F:: @ 816BB84
.byte 0
@@ -3226,7 +4272,16 @@ gMapScripts_CeladonCity_DepartmentStore_4F:: @ 816BBEE
.byte 0
CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF
- .incbin "baserom.gba", 0x16BBEF, 0x51
+ .incbin "baserom.gba", 0x16BBEF, 0x9
+
+CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8
+ .incbin "baserom.gba", 0x16BBF8, 0x9
+
+CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
+ .incbin "baserom.gba", 0x16BC01, 0x9
+
+CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
+ .incbin "baserom.gba", 0x16BC0A, 0x36
gMapScripts_CeladonCity_DepartmentStore_5F:: @ 816BC40
.byte 0
@@ -3250,7 +4305,16 @@ gMapScripts_CeladonCity_DepartmentStore_Roof:: @ 816BCCC
.byte 0
CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
- .incbin "baserom.gba", 0x16BCCD, 0x485
+ .incbin "baserom.gba", 0x16BCCD, 0x355
+
+CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022
+ .incbin "baserom.gba", 0x16C022, 0x9
+
+CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B
+ .incbin "baserom.gba", 0x16C02B, 0x9
+
+CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034
+ .incbin "baserom.gba", 0x16C034, 0x11E
gMapScripts_CeladonCity_DepartmentStore_Elevator:: @ 816C152
.byte 0
@@ -3262,7 +4326,19 @@ gMapScripts_CeladonCity_Condominiums_1F:: @ 816C320
.byte 0
CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
- .incbin "baserom.gba", 0x16C321, 0xAF
+ .incbin "baserom.gba", 0x16C321, 0x6D
+
+CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E
+ .incbin "baserom.gba", 0x16C38E, 0x13
+
+CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1
+ .incbin "baserom.gba", 0x16C3A1, 0x13
+
+CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4
+ .incbin "baserom.gba", 0x16C3B4, 0x13
+
+CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7
+ .incbin "baserom.gba", 0x16C3C7, 0x9
gMapScripts_CeladonCity_Condominiums_2F:: @ 816C3D0
.byte 0
@@ -3274,7 +4350,28 @@ gMapScripts_CeladonCity_Condominiums_3F:: @ 816C3DA
.byte 0
CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB
- .incbin "baserom.gba", 0x16C3DB, 0x7E
+ .incbin "baserom.gba", 0x16C3DB, 0x9
+
+CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4
+ .incbin "baserom.gba", 0x16C3E4, 0x9
+
+CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED
+ .incbin "baserom.gba", 0x16C3ED, 0x9
+
+CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
+ .incbin "baserom.gba", 0x16C3F6, 0x3F
+
+CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435
+ .incbin "baserom.gba", 0x16C435, 0x9
+
+CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E
+ .incbin "baserom.gba", 0x16C43E, 0x9
+
+CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447
+ .incbin "baserom.gba", 0x16C447, 0x9
+
+CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450
+ .incbin "baserom.gba", 0x16C450, 0x9
gMapScripts_CeladonCity_Condominiums_Roof:: @ 816C459
.byte 0
@@ -3286,7 +4383,16 @@ gMapScripts_CeladonCity_Condominiums_RoofRoom:: @ 816C463
.byte 0
CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464
- .incbin "baserom.gba", 0x16C464, 0x188
+ .incbin "baserom.gba", 0x16C464, 0x9
+
+CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
+ .incbin "baserom.gba", 0x16C46D, 0xAC
+
+CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519
+ .incbin "baserom.gba", 0x16C519, 0x9
+
+CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522
+ .incbin "baserom.gba", 0x16C522, 0xCA
gMapScripts_CeladonCity_PokemonCenter_1F:: @ 816C5EC
map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7
@@ -3431,7 +4537,19 @@ gMapScripts_CeladonCity_GameCorner_PrizeRoom:: @ 816CB75
.byte 0
CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76
- .incbin "baserom.gba", 0x16CB76, 0x4EA
+ .incbin "baserom.gba", 0x16CB76, 0x9
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F
+ .incbin "baserom.gba", 0x16CB7F, 0x9
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
+ .incbin "baserom.gba", 0x16CB88, 0x295
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
+ .incbin "baserom.gba", 0x16CE1D, 0x16B
+
+CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
+ .incbin "baserom.gba", 0x16CF88, 0xD8
gMapScripts_CeladonCity_Gym:: @ 816D060
.byte 0
@@ -3467,7 +4585,19 @@ gMapScripts_CeladonCity_Restaurant:: @ 816D1EA
.byte 0
CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB
- .incbin "baserom.gba", 0x16D1EB, 0x7C
+ .incbin "baserom.gba", 0x16D1EB, 0x9
+
+CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4
+ .incbin "baserom.gba", 0x16D1F4, 0x9
+
+CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
+ .incbin "baserom.gba", 0x16D1FD, 0x58
+
+CeladonCity_Restaurant_EventScript_16D255:: @ 816D255
+ .incbin "baserom.gba", 0x16D255, 0x9
+
+CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E
+ .incbin "baserom.gba", 0x16D25E, 0x9
gMapScripts_CeladonCity_House1:: @ 816D267
.byte 0
@@ -3485,7 +4615,16 @@ gMapScripts_CeladonCity_Hotel:: @ 816D283
.byte 0
CeladonCity_Hotel_EventScript_16D284:: @ 816D284
- .incbin "baserom.gba", 0x16D284, 0x24
+ .incbin "baserom.gba", 0x16D284, 0x9
+
+CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D
+ .incbin "baserom.gba", 0x16D28D, 0x9
+
+CeladonCity_Hotel_EventScript_16D296:: @ 816D296
+ .incbin "baserom.gba", 0x16D296, 0x9
+
+CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F
+ .incbin "baserom.gba", 0x16D29F, 0x9
gMapScripts_FuchsiaCity_SafariZone_Entrance:: @ 816D2A8
map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE
@@ -3510,7 +4649,13 @@ gMapScripts_FuchsiaCity_Mart:: @ 816D4E0
.byte 0
FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1
- .incbin "baserom.gba", 0x16D4E1, 0x47
+ .incbin "baserom.gba", 0x16D4E1, 0x9
+
+FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA
+ .incbin "baserom.gba", 0x16D4EA, 0x9
+
+FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
+ .incbin "baserom.gba", 0x16D4F3, 0x35
gMapScripts_FuchsiaCity_ZooBuilding:: @ 816D528
.byte 0
@@ -3531,7 +4676,31 @@ gMapScripts_FuchsiaCity_Gym:: @ 816D54D
.byte 0
FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E
- .incbin "baserom.gba", 0x16D54E, 0x177
+ .incbin "baserom.gba", 0x16D54E, 0xA3
+
+FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1
+ .incbin "baserom.gba", 0x16D5F1, 0x17
+
+FuchsiaCity_Gym_EventScript_16D608:: @ 816D608
+ .incbin "baserom.gba", 0x16D608, 0x17
+
+FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F
+ .incbin "baserom.gba", 0x16D61F, 0x24
+
+FuchsiaCity_Gym_EventScript_16D643:: @ 816D643
+ .incbin "baserom.gba", 0x16D643, 0x17
+
+FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A
+ .incbin "baserom.gba", 0x16D65A, 0x17
+
+FuchsiaCity_Gym_EventScript_16D671:: @ 816D671
+ .incbin "baserom.gba", 0x16D671, 0x17
+
+FuchsiaCity_Gym_EventScript_16D688:: @ 816D688
+ .incbin "baserom.gba", 0x16D688, 0x1F
+
+FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7
+ .incbin "baserom.gba", 0x16D6A7, 0x1E
gMapScripts_FuchsiaCity_House1:: @ 816D6C5
.byte 0
@@ -3551,7 +4720,19 @@ gMapScripts_FuchsiaCity_PokemonCenter_1F:: @ 816D6F1
.byte 0
FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC
- .incbin "baserom.gba", 0x16D6FC, 0x28
+ .incbin "baserom.gba", 0x16D6FC, 0x4
+
+FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700
+ .incbin "baserom.gba", 0x16D700, 0x9
+
+FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709
+ .incbin "baserom.gba", 0x16D709, 0x9
+
+FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712
+ .incbin "baserom.gba", 0x16D712, 0x9
+
+FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B
+ .incbin "baserom.gba", 0x16D71B, 0x9
gMapScripts_FuchsiaCity_PokemonCenter_2F:: @ 816D724
map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3
@@ -3567,7 +4748,13 @@ gMapScripts_FuchsiaCity_Building1:: @ 816D74B
.byte 0
FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
- .incbin "baserom.gba", 0x16D74C, 0xCA
+ .incbin "baserom.gba", 0x16D74C, 0xB8
+
+FuchsiaCity_Building1_EventScript_16D804:: @ 816D804
+ .incbin "baserom.gba", 0x16D804, 0x9
+
+FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D
+ .incbin "baserom.gba", 0x16D80D, 0x9
gMapScripts_FuchsiaCity_House2:: @ 816D816
.byte 0
@@ -3659,7 +4846,22 @@ gMapScripts_CinnabarIsland_PokemonLab_Entrance:: @ 816E273
.byte 0
CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279
- .incbin "baserom.gba", 0x16E279, 0x3F
+ .incbin "baserom.gba", 0x16E279, 0x12
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B
+ .incbin "baserom.gba", 0x16E28B, 0x9
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294
+ .incbin "baserom.gba", 0x16E294, 0x9
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D
+ .incbin "baserom.gba", 0x16E29D, 0x9
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6
+ .incbin "baserom.gba", 0x16E2A6, 0x9
+
+CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF
+ .incbin "baserom.gba", 0x16E2AF, 0x9
gMapScripts_CinnabarIsland_PokemonLab_Lounge:: @ 816E2B8
.byte 0
@@ -3677,7 +4879,16 @@ gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom:: @ 816E3DE
.byte 0
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF
- .incbin "baserom.gba", 0x16E3DF, 0x21
+ .incbin "baserom.gba", 0x16E3DF, 0x6
+
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5
+ .incbin "baserom.gba", 0x16E3E5, 0x9
+
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE
+ .incbin "baserom.gba", 0x16E3EE, 0x9
+
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7
+ .incbin "baserom.gba", 0x16E3F7, 0x9
gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom:: @ 816E400
.byte 0
@@ -3694,7 +4905,22 @@ gMapScripts_CinnabarIsland_PokemonCenter_1F:: @ 816E8D7
.byte 0
CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2
- .incbin "baserom.gba", 0x16E8E2, 0x106
+ .incbin "baserom.gba", 0x16E8E2, 0x4
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6
+ .incbin "baserom.gba", 0x16E8E6, 0x9
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF
+ .incbin "baserom.gba", 0x16E8EF, 0x9
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8
+ .incbin "baserom.gba", 0x16E8F8, 0x9
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901
+ .incbin "baserom.gba", 0x16E901, 0x9
+
+CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
+ .incbin "baserom.gba", 0x16E90A, 0xDE
gMapScripts_CinnabarIsland_PokemonCenter_2F:: @ 816E9E8
map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3
@@ -3710,7 +4936,13 @@ gMapScripts_CinnabarIsland_Mart:: @ 816EA0F
.byte 0
CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10
- .incbin "baserom.gba", 0x16EA10, 0x4A
+ .incbin "baserom.gba", 0x16EA10, 0x9
+
+CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
+ .incbin "baserom.gba", 0x16EA19, 0x9
+
+CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
+ .incbin "baserom.gba", 0x16EA22, 0x38
gMapScripts_IndigoPlateau_PokemonCenter_1F:: @ 816EA5A
map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65
@@ -3758,7 +4990,19 @@ gMapScripts_SaffronCity_House1_2F:: @ 816EB5C
.byte 0
SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D
- .incbin "baserom.gba", 0x16EB5D, 0x7E
+ .incbin "baserom.gba", 0x16EB5D, 0x13
+
+SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70
+ .incbin "baserom.gba", 0x16EB70, 0xB
+
+SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
+ .incbin "baserom.gba", 0x16EB7B, 0x4E
+
+SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9
+ .incbin "baserom.gba", 0x16EBC9, 0x9
+
+SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2
+ .incbin "baserom.gba", 0x16EBD2, 0x9
gMapScripts_SaffronCity_Dojo:: @ 816EBDB
.byte 0
@@ -3803,7 +5047,34 @@ gMapScripts_SaffronCity_Gym:: @ 816EDD7
.byte 0
SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
- .incbin "baserom.gba", 0x16EDD8, 0x19B
+ .incbin "baserom.gba", 0x16EDD8, 0xB0
+
+SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
+ .incbin "baserom.gba", 0x16EE88, 0x17
+
+SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
+ .incbin "baserom.gba", 0x16EE9F, 0x24
+
+SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3
+ .incbin "baserom.gba", 0x16EEC3, 0x17
+
+SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA
+ .incbin "baserom.gba", 0x16EEDA, 0x17
+
+SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1
+ .incbin "baserom.gba", 0x16EEF1, 0x17
+
+SaffronCity_Gym_EventScript_16EF08:: @ 816EF08
+ .incbin "baserom.gba", 0x16EF08, 0x17
+
+SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
+ .incbin "baserom.gba", 0x16EF1F, 0x17
+
+SaffronCity_Gym_EventScript_16EF36:: @ 816EF36
+ .incbin "baserom.gba", 0x16EF36, 0x1F
+
+SaffronCity_Gym_EventScript_16EF55:: @ 816EF55
+ .incbin "baserom.gba", 0x16EF55, 0x1E
gMapScripts_SaffronCity_House2:: @ 816EF73
.byte 0
@@ -3824,7 +5095,13 @@ gMapScripts_SaffronCity_Mart:: @ 816EFA2
.byte 0
SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3
- .incbin "baserom.gba", 0x16EFA3, 0x49
+ .incbin "baserom.gba", 0x16EFA3, 0x9
+
+SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC
+ .incbin "baserom.gba", 0x16EFAC, 0x9
+
+SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
+ .incbin "baserom.gba", 0x16EFB5, 0x37
gMapScripts_SaffronCity_PokemonCenter_1F:: @ 816EFEC
map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7
@@ -3871,7 +5148,31 @@ SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA
.incbin "baserom.gba", 0x16F0CA, 0x7A
SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144
- .incbin "baserom.gba", 0x16F144, 0x4A1
+ .incbin "baserom.gba", 0x16F144, 0x13D
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
+ .incbin "baserom.gba", 0x16F281, 0x77
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
+ .incbin "baserom.gba", 0x16F2F8, 0x77
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
+ .incbin "baserom.gba", 0x16F36F, 0x77
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
+ .incbin "baserom.gba", 0x16F3E6, 0x77
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
+ .incbin "baserom.gba", 0x16F45D, 0x62
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
+ .incbin "baserom.gba", 0x16F4BF, 0x62
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
+ .incbin "baserom.gba", 0x16F521, 0x62
+
+SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
+ .incbin "baserom.gba", 0x16F583, 0x62
gMapScripts_Route2_ViridianForest_SouthEntrance:: @ 816F5E5
.byte 0
@@ -3886,7 +5187,10 @@ gMapScripts_Route2_House:: @ 816F5F8
.byte 0
Route2_House_EventScript_16F5F9:: @ 816F5F9
- .incbin "baserom.gba", 0x16F5F9, 0x85
+ .incbin "baserom.gba", 0x16F5F9, 0x9
+
+Route2_House_EventScript_16F602:: @ 816F602
+ .incbin "baserom.gba", 0x16F602, 0x7C
gMapScripts_Route2_EastBuilding:: @ 816F67E
.byte 0
@@ -3901,7 +5205,13 @@ gMapScripts_Route2_ViridianForest_NorthEntrance:: @ 816F71D
.byte 0
Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E
- .incbin "baserom.gba", 0x16F71E, 0x1B
+ .incbin "baserom.gba", 0x16F71E, 0x9
+
+Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727
+ .incbin "baserom.gba", 0x16F727, 0x9
+
+Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730
+ .incbin "baserom.gba", 0x16F730, 0x9
gMapScripts_Route4_PokemonCenter_1F:: @ 816F739
map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744
@@ -3946,7 +5256,16 @@ gMapScripts_Route5_SouthEntrance:: @ 816F900
.byte 0
Route5_SouthEntrance_EventScript_16F901:: @ 816F901
- .incbin "baserom.gba", 0x16F901, 0xC5
+ .incbin "baserom.gba", 0x16F901, 0x9
+
+Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A
+ .incbin "baserom.gba", 0x16F90A, 0xC
+
+Route5_SouthEntrance_EventScript_16F916:: @ 816F916
+ .incbin "baserom.gba", 0x16F916, 0xC
+
+Route5_SouthEntrance_EventScript_16F922:: @ 816F922
+ .incbin "baserom.gba", 0x16F922, 0xA4
gMapScripts_Route6_NorthEntrance:: @ 816F9C6
.byte 0
@@ -3985,7 +5304,16 @@ gMapScripts_Route8_WestEntrance:: @ 816FB53
.byte 0
Route8_WestEntrance_EventScript_16FB54:: @ 816FB54
- .incbin "baserom.gba", 0x16FB54, 0xDB
+ .incbin "baserom.gba", 0x16FB54, 0x9
+
+Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D
+ .incbin "baserom.gba", 0x16FB5D, 0xC
+
+Route8_WestEntrance_EventScript_16FB69:: @ 816FB69
+ .incbin "baserom.gba", 0x16FB69, 0xC
+
+Route8_WestEntrance_EventScript_16FB75:: @ 816FB75
+ .incbin "baserom.gba", 0x16FB75, 0xBA
gMapScripts_Route10_PokemonCenter_1F:: @ 816FC2F
map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A
@@ -4033,7 +5361,16 @@ gMapScripts_Route11_EastEntrance_2F:: @ 816FD34
.byte 0
Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35
- .incbin "baserom.gba", 0x16FD35, 0x138
+ .incbin "baserom.gba", 0x16FD35, 0x1E
+
+Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53
+ .incbin "baserom.gba", 0x16FD53, 0x9
+
+Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
+ .incbin "baserom.gba", 0x16FD5C, 0x7C
+
+Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
+ .incbin "baserom.gba", 0x16FDD8, 0x95
gMapScripts_Route12_NorthEntrance_1F:: @ 816FE6D
.byte 0
@@ -4045,7 +5382,13 @@ gMapScripts_Route12_NorthEntrance_2F:: @ 816FE77
.byte 0
Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78
- .incbin "baserom.gba", 0x16FE78, 0x93
+ .incbin "baserom.gba", 0x16FE78, 0x9
+
+Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81
+ .incbin "baserom.gba", 0x16FE81, 0x9
+
+Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A
+ .incbin "baserom.gba", 0x16FE8A, 0x81
gMapScripts_Route12_FishingHouse:: @ 816FF0B
.byte 0
@@ -4078,7 +5421,10 @@ gMapScripts_Route16_House:: @ 817014E
.byte 0
Route16_House_EventScript_17014F:: @ 817014F
- .incbin "baserom.gba", 0x17014F, 0x73
+ .incbin "baserom.gba", 0x17014F, 0x60
+
+Route16_House_EventScript_1701AF:: @ 81701AF
+ .incbin "baserom.gba", 0x1701AF, 0x13
gMapScripts_Route16_NorthEntrance_1F:: @ 81701C2
map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8
@@ -4112,7 +5458,19 @@ gMapScripts_Route16_NorthEntrance_2F:: @ 81702BE
.byte 0
Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF
- .incbin "baserom.gba", 0x1702BF, 0xB9
+ .incbin "baserom.gba", 0x1702BF, 0x9
+
+Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8
+ .incbin "baserom.gba", 0x1702C8, 0x9
+
+Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1
+ .incbin "baserom.gba", 0x1702D1, 0x9
+
+Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA
+ .incbin "baserom.gba", 0x1702DA, 0x9
+
+Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
+ .incbin "baserom.gba", 0x1702E3, 0x95
gMapScripts_Route18_EastEntrance_1F:: @ 8170378
map_script 3, Route18_EastEntrance_1F_MapScript1_17037E
@@ -4143,7 +5501,13 @@ gMapScripts_Route18_EastEntrance_2F:: @ 817046B
.byte 0
Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C
- .incbin "baserom.gba", 0x17046C, 0x8E
+ .incbin "baserom.gba", 0x17046C, 0x9
+
+Route18_EastEntrance_2F_EventScript_170475:: @ 8170475
+ .incbin "baserom.gba", 0x170475, 0x9
+
+Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
+ .incbin "baserom.gba", 0x17047E, 0x7C
gMapScripts_UnusedHouse_27_00:: @ 81704FA
.byte 0
@@ -4152,7 +5516,10 @@ gMapScripts_Route22_NorthEntrance:: @ 81704FB
.byte 0
Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC
- .incbin "baserom.gba", 0x1704FC, 0x26
+ .incbin "baserom.gba", 0x1704FC, 0x11
+
+Route22_NorthEntrance_EventScript_17050D:: @ 817050D
+ .incbin "baserom.gba", 0x17050D, 0x15
gMapScripts_UnusedHouse_29_00:: @ 8170522
.byte 0
@@ -4162,7 +5529,13 @@ gMapScripts_Route25_SeaCottage:: @ 8170523
.byte 0
Route25_SeaCottage_MapScript1_170529:: @ 8170529
- .incbin "baserom.gba", 0x170529, 0x361
+ .incbin "baserom.gba", 0x170529, 0x22
+
+Route25_SeaCottage_EventScript_17054B:: @ 817054B
+ .incbin "baserom.gba", 0x17054B, 0x192
+
+Route25_SeaCottage_EventScript_1706DD:: @ 81706DD
+ .incbin "baserom.gba", 0x1706DD, 0x1AD
gMapScripts_SevenIsland_House_Room1:: @ 817088A
map_script 3, SevenIsland_House_Room1_MapScript1_170895
@@ -4213,7 +5586,19 @@ gMapScripts_SevenIsland_PokemonCenter_1F:: @ 8170B89
.byte 0
SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94
- .incbin "baserom.gba", 0x170B94, 0x28
+ .incbin "baserom.gba", 0x170B94, 0x4
+
+SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98
+ .incbin "baserom.gba", 0x170B98, 0x9
+
+SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1
+ .incbin "baserom.gba", 0x170BA1, 0x9
+
+SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA
+ .incbin "baserom.gba", 0x170BAA, 0x9
+
+SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3
+ .incbin "baserom.gba", 0x170BB3, 0x9
gMapScripts_SevenIsland_PokemonCenter_2F:: @ 8170BBC
map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3
@@ -4248,7 +5633,40 @@ OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E
.incbin "baserom.gba", 0x170C4E, 0x59
OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7
- .incbin "baserom.gba", 0x170CA7, 0x68D
+ .incbin "baserom.gba", 0x170CA7, 0x1ED
+
+OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
+ .incbin "baserom.gba", 0x170E94, 0x9
+
+OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
+ .incbin "baserom.gba", 0x170E9D, 0x28
+
+OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
+ .incbin "baserom.gba", 0x170EC5, 0x283
+
+OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148
+ .incbin "baserom.gba", 0x171148, 0x9
+
+OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151
+ .incbin "baserom.gba", 0x171151, 0x9
+
+OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
+ .incbin "baserom.gba", 0x17115A, 0x1F
+
+OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
+ .incbin "baserom.gba", 0x171179, 0x31
+
+OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA
+ .incbin "baserom.gba", 0x1711AA, 0xC
+
+OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6
+ .incbin "baserom.gba", 0x1711B6, 0xC
+
+OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2
+ .incbin "baserom.gba", 0x1711C2, 0xC
+
+OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE
+ .incbin "baserom.gba", 0x1711CE, 0x166
gMapScripts_OneIsland_PokemonCenter_2F:: @ 8171334
map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3
@@ -4264,7 +5682,10 @@ gMapScripts_OneIsland_House1:: @ 817135B
.byte 0
OneIsland_House1_EventScript_17135C:: @ 817135C
- .incbin "baserom.gba", 0x17135C, 0x12
+ .incbin "baserom.gba", 0x17135C, 0x9
+
+OneIsland_House1_EventScript_171365:: @ 8171365
+ .incbin "baserom.gba", 0x171365, 0x9
gMapScripts_OneIsland_House2:: @ 817136E
.byte 0
@@ -4281,7 +5702,10 @@ OneIsland_Harbor_MapScript1_171383:: @ 8171383
.incbin "baserom.gba", 0x171383, 0xF
OneIsland_Harbor_MapScript2_171392:: @ 8171392
- .incbin "baserom.gba", 0x171392, 0x3E
+ .incbin "baserom.gba", 0x171392, 0x2B
+
+OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
+ .incbin "baserom.gba", 0x1713BD, 0x13
gMapScripts_TwoIsland_JoyfulGameCorner:: @ 81713D0
map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5
@@ -4351,7 +5775,10 @@ gMapScripts_ThreeIsland_House1:: @ 8171819
.byte 0
ThreeIsland_House1_EventScript_17181A:: @ 817181A
- .incbin "baserom.gba", 0x17181A, 0x18
+ .incbin "baserom.gba", 0x17181A, 0xF
+
+ThreeIsland_House1_EventScript_171829:: @ 8171829
+ .incbin "baserom.gba", 0x171829, 0x9
gMapScripts_ThreeIsland_PokemonCenter_1F:: @ 8171832
map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D
@@ -4402,7 +5829,10 @@ gMapScripts_ThreeIsland_House2:: @ 81718DF
.byte 0
ThreeIsland_House2_EventScript_1718E0:: @ 81718E0
- .incbin "baserom.gba", 0x1718E0, 0x22
+ .incbin "baserom.gba", 0x1718E0, 0x19
+
+ThreeIsland_House2_EventScript_1718F9:: @ 81718F9
+ .incbin "baserom.gba", 0x1718F9, 0x9
gMapScripts_ThreeIsland_House3:: @ 8171902
.byte 0
@@ -4414,7 +5844,10 @@ gMapScripts_ThreeIsland_House4:: @ 817190C
.byte 0
ThreeIsland_House4_EventScript_17190D:: @ 817190D
- .incbin "baserom.gba", 0x17190D, 0x12
+ .incbin "baserom.gba", 0x17190D, 0x9
+
+ThreeIsland_House4_EventScript_171916:: @ 8171916
+ .incbin "baserom.gba", 0x171916, 0x9
gMapScripts_ThreeIsland_House5:: @ 817191F
.byte 0
@@ -4469,7 +5902,13 @@ gMapScripts_FourIsland_LoreleisHouse:: @ 8171C4E
.byte 0
FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54
- .incbin "baserom.gba", 0x171C54, 0x44
+ .incbin "baserom.gba", 0x171C54, 0x4
+
+FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58
+ .incbin "baserom.gba", 0x171C58, 0x35
+
+FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D
+ .incbin "baserom.gba", 0x171C8D, 0xB
gMapScripts_FourIsland_Harbor:: @ 8171C98
.byte 0
@@ -4495,7 +5934,16 @@ gMapScripts_FiveIsland_PokemonCenter_1F:: @ 8171CF1
.byte 0
FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC
- .incbin "baserom.gba", 0x171CFC, 0x1F
+ .incbin "baserom.gba", 0x171CFC, 0x4
+
+FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00
+ .incbin "baserom.gba", 0x171D00, 0x9
+
+FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09
+ .incbin "baserom.gba", 0x171D09, 0x9
+
+FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12
+ .incbin "baserom.gba", 0x171D12, 0x9
gMapScripts_FiveIsland_PokemonCenter_2F:: @ 8171D1B
map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3
@@ -4841,13 +6289,25 @@ gUnknown_81A7ADB:: @ 81A7ADB
.incbin "baserom.gba", 0x1A7ADB, 0x5
gUnknown_81A7AE0:: @ 81A7AE0
- .incbin "baserom.gba", 0x1A7AE0, 0xE6F
+ .incbin "baserom.gba", 0x1A7AE0, 0xE3B
+
+SilphCo_2F_EventScript_1A891B:: @ 81A891B
+ .incbin "baserom.gba", 0x1A891B, 0x1A
+
+SilphCo_2F_EventScript_1A8935:: @ 81A8935
+ .incbin "baserom.gba", 0x1A8935, 0x1A
SilphCo_3F_EventScript_1A894F:: @ 81A894F
.incbin "baserom.gba", 0x1A894F, 0x1A
SilphCo_3F_EventScript_1A8969:: @ 81A8969
- .incbin "baserom.gba", 0x1A8969, 0x4E
+ .incbin "baserom.gba", 0x1A8969, 0x1A
+
+SilphCo_4F_EventScript_1A8983:: @ 81A8983
+ .incbin "baserom.gba", 0x1A8983, 0x1A
+
+SilphCo_4F_EventScript_1A899D:: @ 81A899D
+ .incbin "baserom.gba", 0x1A899D, 0x1A
SilphCo_5F_EventScript_1A89B7:: @ 81A89B7
.incbin "baserom.gba", 0x1A89B7, 0x1A
@@ -4856,7 +6316,10 @@ SilphCo_5F_EventScript_1A89D1:: @ 81A89D1
.incbin "baserom.gba", 0x1A89D1, 0x1A
SilphCo_5F_EventScript_1A89EB:: @ 81A89EB
- .incbin "baserom.gba", 0x1A89EB, 0x34
+ .incbin "baserom.gba", 0x1A89EB, 0x1A
+
+SilphCo_6F_EventScript_1A8A05:: @ 81A8A05
+ .incbin "baserom.gba", 0x1A8A05, 0x1A
SilphCo_7F_EventScript_1A8A1F:: @ 81A8A1F
.incbin "baserom.gba", 0x1A8A1F, 0x1A
@@ -4865,7 +6328,10 @@ SilphCo_7F_EventScript_1A8A39:: @ 81A8A39
.incbin "baserom.gba", 0x1A8A39, 0x1A
SilphCo_7F_EventScript_1A8A53:: @ 81A8A53
- .incbin "baserom.gba", 0x1A8A53, 0x34
+ .incbin "baserom.gba", 0x1A8A53, 0x1A
+
+SilphCo_8F_EventScript_1A8A6D:: @ 81A8A6D
+ .incbin "baserom.gba", 0x1A8A6D, 0x1A
SilphCo_9F_EventScript_1A8A87:: @ 81A8A87
.incbin "baserom.gba", 0x1A8A87, 0x1A
@@ -4877,7 +6343,10 @@ SilphCo_9F_EventScript_1A8ABB:: @ 81A8ABB
.incbin "baserom.gba", 0x1A8ABB, 0x1A
SilphCo_9F_EventScript_1A8AD5:: @ 81A8AD5
- .incbin "baserom.gba", 0x1A8AD5, 0x34
+ .incbin "baserom.gba", 0x1A8AD5, 0x1A
+
+SilphCo_10F_EventScript_1A8AEF:: @ 81A8AEF
+ .incbin "baserom.gba", 0x1A8AEF, 0x1A
SilphCo_11F_EventScript_1A8B09:: @ 81A8B09
.incbin "baserom.gba", 0x1A8B09, 0x1E4
@@ -4893,6 +6362,18 @@ OneIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
PewterCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
SevenIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
VermilionCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+FourIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+SixIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+TwoIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+Route4_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+SaffronCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+CeladonCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+LavenderTown_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
+ViridianCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
.incbin "baserom.gba", 0x1A8CF6, 0x6
CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
@@ -4903,6 +6384,18 @@ OneIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
PewterCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
SevenIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
VermilionCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+FourIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+SixIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+TwoIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+Route4_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+SaffronCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+CeladonCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+LavenderTown_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
+ViridianCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
.incbin "baserom.gba", 0x1A8CFC, 0x6
CeruleanCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
@@ -4913,7 +6406,22 @@ OneIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
PewterCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
SevenIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
VermilionCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
- .incbin "baserom.gba", 0x1A8D02, 0x47
+FourIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+SixIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+ThreeIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+TwoIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+Route4_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+SaffronCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+CeladonCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+LavenderTown_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
+ .incbin "baserom.gba", 0x1A8D02, 0x6
+
+VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
+ .incbin "baserom.gba", 0x1A8D08, 0x41
gUnknown_81A8D49:: @ 81A8D49
.incbin "baserom.gba", 0x1A8D49, 0x4E
@@ -4927,11 +6435,53 @@ gUnknown_81A8DD8:: @ 81A8DD8
gUnknown_81A8DFD:: @ 81A8DFD
.incbin "baserom.gba", 0x1A8DFD, 0x5B
-gStdScript_81A8E58::
- .incbin "baserom.gba", 0x1A8E58, 0x761
+gStdScript_81A8E58:: @ 81A8E58
+ .incbin "baserom.gba", 0x1A8E58, 0x571
+
+Route3_EventScript_1A93C9:: @ 81A93C9
+ .incbin "baserom.gba", 0x1A93C9, 0x3E
+
+Route3_EventScript_1A9407:: @ 81A9407
+ .incbin "baserom.gba", 0x1A9407, 0x3E
+
+Route3_EventScript_1A9445:: @ 81A9445
+ .incbin "baserom.gba", 0x1A9445, 0x3E
+
+Route3_EventScript_1A9483:: @ 81A9483
+ .incbin "baserom.gba", 0x1A9483, 0x3E
+
+Route3_EventScript_1A94C1:: @ 81A94C1
+ .incbin "baserom.gba", 0x1A94C1, 0x3E
+
+Route3_EventScript_1A94FF:: @ 81A94FF
+ .incbin "baserom.gba", 0x1A94FF, 0x3E
+
+Route3_EventScript_1A953D:: @ 81A953D
+ .incbin "baserom.gba", 0x1A953D, 0x3E
+
+Route3_EventScript_1A957B:: @ 81A957B
+ .incbin "baserom.gba", 0x1A957B, 0x3E
Route4_EventScript_1A95B9:: @ 81A95B9
- .incbin "baserom.gba", 0x1A95B9, 0x1B2
+ .incbin "baserom.gba", 0x1A95B9, 0x3E
+
+Route24_EventScript_1A95F7:: @ 81A95F7
+ .incbin "baserom.gba", 0x1A95F7, 0x3E
+
+Route24_EventScript_1A9635:: @ 81A9635
+ .incbin "baserom.gba", 0x1A9635, 0x3E
+
+Route24_EventScript_1A9673:: @ 81A9673
+ .incbin "baserom.gba", 0x1A9673, 0x3E
+
+Route24_EventScript_1A96B1:: @ 81A96B1
+ .incbin "baserom.gba", 0x1A96B1, 0x3E
+
+Route24_EventScript_1A96EF:: @ 81A96EF
+ .incbin "baserom.gba", 0x1A96EF, 0x3E
+
+Route24_EventScript_1A972D:: @ 81A972D
+ .incbin "baserom.gba", 0x1A972D, 0x3E
Route25_EventScript_1A976B:: @ 81A976B
.incbin "baserom.gba", 0x1A976B, 0x3E
@@ -4976,7 +6526,64 @@ Route6_EventScript_1A9A91:: @ 81A9A91
.incbin "baserom.gba", 0x1A9A91, 0x3E
Route6_EventScript_1A9ACF:: @ 81A9ACF
- .incbin "baserom.gba", 0x1A9ACF, 0x4D8
+ .incbin "baserom.gba", 0x1A9ACF, 0x3E
+
+Route11_EventScript_1A9B0D:: @ 81A9B0D
+ .incbin "baserom.gba", 0x1A9B0D, 0x3E
+
+Route11_EventScript_1A9B4B:: @ 81A9B4B
+ .incbin "baserom.gba", 0x1A9B4B, 0x3E
+
+Route11_EventScript_1A9B89:: @ 81A9B89
+ .incbin "baserom.gba", 0x1A9B89, 0x3E
+
+Route11_EventScript_1A9BC7:: @ 81A9BC7
+ .incbin "baserom.gba", 0x1A9BC7, 0x3E
+
+Route11_EventScript_1A9C05:: @ 81A9C05
+ .incbin "baserom.gba", 0x1A9C05, 0x3E
+
+Route11_EventScript_1A9C43:: @ 81A9C43
+ .incbin "baserom.gba", 0x1A9C43, 0x3E
+
+Route11_EventScript_1A9C81:: @ 81A9C81
+ .incbin "baserom.gba", 0x1A9C81, 0x3E
+
+Route11_EventScript_1A9CBF:: @ 81A9CBF
+ .incbin "baserom.gba", 0x1A9CBF, 0x3E
+
+Route11_EventScript_1A9CFD:: @ 81A9CFD
+ .incbin "baserom.gba", 0x1A9CFD, 0x3E
+
+Route11_EventScript_1A9D3B:: @ 81A9D3B
+ .incbin "baserom.gba", 0x1A9D3B, 0x3E
+
+Route9_EventScript_1A9D79:: @ 81A9D79
+ .incbin "baserom.gba", 0x1A9D79, 0x3E
+
+Route9_EventScript_1A9DB7:: @ 81A9DB7
+ .incbin "baserom.gba", 0x1A9DB7, 0x3E
+
+Route9_EventScript_1A9DF5:: @ 81A9DF5
+ .incbin "baserom.gba", 0x1A9DF5, 0x3E
+
+Route9_EventScript_1A9E33:: @ 81A9E33
+ .incbin "baserom.gba", 0x1A9E33, 0x3E
+
+Route9_EventScript_1A9E71:: @ 81A9E71
+ .incbin "baserom.gba", 0x1A9E71, 0x3E
+
+Route9_EventScript_1A9EAF:: @ 81A9EAF
+ .incbin "baserom.gba", 0x1A9EAF, 0x3E
+
+Route9_EventScript_1A9EED:: @ 81A9EED
+ .incbin "baserom.gba", 0x1A9EED, 0x3E
+
+Route9_EventScript_1A9F2B:: @ 81A9F2B
+ .incbin "baserom.gba", 0x1A9F2B, 0x3E
+
+Route9_EventScript_1A9F69:: @ 81A9F69
+ .incbin "baserom.gba", 0x1A9F69, 0x3E
Route10_EventScript_1A9FA7:: @ 81A9FA7
.incbin "baserom.gba", 0x1A9FA7, 0x3E
@@ -5060,7 +6667,37 @@ Route12_EventScript_1AA603:: @ 81AA603
.incbin "baserom.gba", 0x1AA603, 0x46
Route12_EventScript_1AA649:: @ 81AA649
- .incbin "baserom.gba", 0x1AA649, 0x2B2
+ .incbin "baserom.gba", 0x1AA649, 0x46
+
+Route13_EventScript_1AA68F:: @ 81AA68F
+ .incbin "baserom.gba", 0x1AA68F, 0x3E
+
+Route13_EventScript_1AA6CD:: @ 81AA6CD
+ .incbin "baserom.gba", 0x1AA6CD, 0x3E
+
+Route13_EventScript_1AA70B:: @ 81AA70B
+ .incbin "baserom.gba", 0x1AA70B, 0x3E
+
+Route13_EventScript_1AA749:: @ 81AA749
+ .incbin "baserom.gba", 0x1AA749, 0x3E
+
+Route13_EventScript_1AA787:: @ 81AA787
+ .incbin "baserom.gba", 0x1AA787, 0x3E
+
+Route13_EventScript_1AA7C5:: @ 81AA7C5
+ .incbin "baserom.gba", 0x1AA7C5, 0x3E
+
+Route13_EventScript_1AA803:: @ 81AA803
+ .incbin "baserom.gba", 0x1AA803, 0x3E
+
+Route13_EventScript_1AA841:: @ 81AA841
+ .incbin "baserom.gba", 0x1AA841, 0x3E
+
+Route13_EventScript_1AA87F:: @ 81AA87F
+ .incbin "baserom.gba", 0x1AA87F, 0x3E
+
+Route13_EventScript_1AA8BD:: @ 81AA8BD
+ .incbin "baserom.gba", 0x1AA8BD, 0x3E
Route14_EventScript_1AA8FB:: @ 81AA8FB
.incbin "baserom.gba", 0x1AA8FB, 0x3E
@@ -5096,7 +6733,43 @@ Route14_EventScript_1AAB67:: @ 81AAB67
.incbin "baserom.gba", 0x1AAB67, 0x46
Route14_EventScript_1AABAD:: @ 81AABAD
- .incbin "baserom.gba", 0x1AABAD, 0x33E
+ .incbin "baserom.gba", 0x1AABAD, 0x46
+
+Route15_EventScript_1AABF3:: @ 81AABF3
+ .incbin "baserom.gba", 0x1AABF3, 0x3E
+
+Route15_EventScript_1AAC31:: @ 81AAC31
+ .incbin "baserom.gba", 0x1AAC31, 0x3E
+
+Route15_EventScript_1AAC6F:: @ 81AAC6F
+ .incbin "baserom.gba", 0x1AAC6F, 0x3E
+
+Route15_EventScript_1AACAD:: @ 81AACAD
+ .incbin "baserom.gba", 0x1AACAD, 0x3E
+
+Route15_EventScript_1AACEB:: @ 81AACEB
+ .incbin "baserom.gba", 0x1AACEB, 0x3E
+
+Route15_EventScript_1AAD29:: @ 81AAD29
+ .incbin "baserom.gba", 0x1AAD29, 0x3E
+
+Route15_EventScript_1AAD67:: @ 81AAD67
+ .incbin "baserom.gba", 0x1AAD67, 0x3E
+
+Route15_EventScript_1AADA5:: @ 81AADA5
+ .incbin "baserom.gba", 0x1AADA5, 0x3E
+
+Route15_EventScript_1AADE3:: @ 81AADE3
+ .incbin "baserom.gba", 0x1AADE3, 0x3E
+
+Route15_EventScript_1AAE21:: @ 81AAE21
+ .incbin "baserom.gba", 0x1AAE21, 0x3E
+
+Route15_EventScript_1AAE5F:: @ 81AAE5F
+ .incbin "baserom.gba", 0x1AAE5F, 0x46
+
+Route15_EventScript_1AAEA5:: @ 81AAEA5
+ .incbin "baserom.gba", 0x1AAEA5, 0x46
Route16_EventScript_1AAEEB:: @ 81AAEEB
.incbin "baserom.gba", 0x1AAEEB, 0x3E
@@ -5120,7 +6793,37 @@ Route16_EventScript_1AB05F:: @ 81AB05F
.incbin "baserom.gba", 0x1AB05F, 0x46
Route16_EventScript_1AB0A5:: @ 81AB0A5
- .incbin "baserom.gba", 0x1AB0A5, 0x2B2
+ .incbin "baserom.gba", 0x1AB0A5, 0x46
+
+Route17_EventScript_1AB0EB:: @ 81AB0EB
+ .incbin "baserom.gba", 0x1AB0EB, 0x3E
+
+Route17_EventScript_1AB129:: @ 81AB129
+ .incbin "baserom.gba", 0x1AB129, 0x3E
+
+Route17_EventScript_1AB167:: @ 81AB167
+ .incbin "baserom.gba", 0x1AB167, 0x3E
+
+Route17_EventScript_1AB1A5:: @ 81AB1A5
+ .incbin "baserom.gba", 0x1AB1A5, 0x3E
+
+Route17_EventScript_1AB1E3:: @ 81AB1E3
+ .incbin "baserom.gba", 0x1AB1E3, 0x3E
+
+Route17_EventScript_1AB221:: @ 81AB221
+ .incbin "baserom.gba", 0x1AB221, 0x3E
+
+Route17_EventScript_1AB25F:: @ 81AB25F
+ .incbin "baserom.gba", 0x1AB25F, 0x3E
+
+Route17_EventScript_1AB29D:: @ 81AB29D
+ .incbin "baserom.gba", 0x1AB29D, 0x3E
+
+Route17_EventScript_1AB2DB:: @ 81AB2DB
+ .incbin "baserom.gba", 0x1AB2DB, 0x3E
+
+Route17_EventScript_1AB319:: @ 81AB319
+ .incbin "baserom.gba", 0x1AB319, 0x3E
Route18_EventScript_1AB357:: @ 81AB357
.incbin "baserom.gba", 0x1AB357, 0x3E
@@ -5129,7 +6832,43 @@ Route18_EventScript_1AB395:: @ 81AB395
.incbin "baserom.gba", 0x1AB395, 0x3E
Route18_EventScript_1AB3D3:: @ 81AB3D3
- .incbin "baserom.gba", 0x1AB3D3, 0x336
+ .incbin "baserom.gba", 0x1AB3D3, 0x3E
+
+Route19_EventScript_1AB411:: @ 81AB411
+ .incbin "baserom.gba", 0x1AB411, 0x3E
+
+Route19_EventScript_1AB44F:: @ 81AB44F
+ .incbin "baserom.gba", 0x1AB44F, 0x3E
+
+Route19_EventScript_1AB48D:: @ 81AB48D
+ .incbin "baserom.gba", 0x1AB48D, 0x3E
+
+Route19_EventScript_1AB4CB:: @ 81AB4CB
+ .incbin "baserom.gba", 0x1AB4CB, 0x3E
+
+Route19_EventScript_1AB509:: @ 81AB509
+ .incbin "baserom.gba", 0x1AB509, 0x3E
+
+Route19_EventScript_1AB547:: @ 81AB547
+ .incbin "baserom.gba", 0x1AB547, 0x3E
+
+Route19_EventScript_1AB585:: @ 81AB585
+ .incbin "baserom.gba", 0x1AB585, 0x3E
+
+Route19_EventScript_1AB5C3:: @ 81AB5C3
+ .incbin "baserom.gba", 0x1AB5C3, 0x3E
+
+Route19_EventScript_1AB601:: @ 81AB601
+ .incbin "baserom.gba", 0x1AB601, 0x3E
+
+Route19_EventScript_1AB63F:: @ 81AB63F
+ .incbin "baserom.gba", 0x1AB63F, 0x3E
+
+Route19_EventScript_1AB67D:: @ 81AB67D
+ .incbin "baserom.gba", 0x1AB67D, 0x46
+
+Route19_EventScript_1AB6C3:: @ 81AB6C3
+ .incbin "baserom.gba", 0x1AB6C3, 0x46
Route20_EventScript_1AB709:: @ 81AB709
.incbin "baserom.gba", 0x1AB709, 0x3E
@@ -5159,13 +6898,22 @@ Route20_EventScript_1AB8F9:: @ 81AB8F9
.incbin "baserom.gba", 0x1AB8F9, 0x3E
Route20_EventScript_1AB937:: @ 81AB937
- .incbin "baserom.gba", 0x1AB937, 0x7C
+ .incbin "baserom.gba", 0x1AB937, 0x3E
+
+Route21_North_EventScript_1AB975:: @ 81AB975
+ .incbin "baserom.gba", 0x1AB975, 0x3E
Route21_South_EventScript_1AB9B3:: @ 81AB9B3
- .incbin "baserom.gba", 0x1AB9B3, 0x7C
+ .incbin "baserom.gba", 0x1AB9B3, 0x3E
+
+Route21_North_EventScript_1AB9F1:: @ 81AB9F1
+ .incbin "baserom.gba", 0x1AB9F1, 0x3E
Route21_South_EventScript_1ABA2F:: @ 81ABA2F
- .incbin "baserom.gba", 0x1ABA2F, 0x7C
+ .incbin "baserom.gba", 0x1ABA2F, 0x3E
+
+Route21_North_EventScript_1ABA6D:: @ 81ABA6D
+ .incbin "baserom.gba", 0x1ABA6D, 0x3E
Route21_South_EventScript_1ABAAB:: @ 81ABAAB
.incbin "baserom.gba", 0x1ABAAB, 0x3E
@@ -5174,7 +6922,52 @@ Route21_South_EventScript_1ABAE9:: @ 81ABAE9
.incbin "baserom.gba", 0x1ABAE9, 0x3E
Route21_South_EventScript_1ABB27:: @ 81ABB27
- .incbin "baserom.gba", 0x1ABB27, 0x400
+ .incbin "baserom.gba", 0x1ABB27, 0x3E
+
+Route21_North_EventScript_1ABB65:: @ 81ABB65
+ .incbin "baserom.gba", 0x1ABB65, 0x46
+
+Route21_North_EventScript_1ABBAB:: @ 81ABBAB
+ .incbin "baserom.gba", 0x1ABBAB, 0x46
+
+OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1
+ .incbin "baserom.gba", 0x1ABBF1, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F
+ .incbin "baserom.gba", 0x1ABC2F, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D
+ .incbin "baserom.gba", 0x1ABC6D, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB
+ .incbin "baserom.gba", 0x1ABCAB, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9
+ .incbin "baserom.gba", 0x1ABCE9, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27
+ .incbin "baserom.gba", 0x1ABD27, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65
+ .incbin "baserom.gba", 0x1ABD65, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3
+ .incbin "baserom.gba", 0x1ABDA3, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1
+ .incbin "baserom.gba", 0x1ABDE1, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F
+ .incbin "baserom.gba", 0x1ABE1F, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D
+ .incbin "baserom.gba", 0x1ABE5D, 0x3E
+
+OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B
+ .incbin "baserom.gba", 0x1ABE9B, 0x46
+
+OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1
+ .incbin "baserom.gba", 0x1ABEE1, 0x46
OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27
.incbin "baserom.gba", 0x1ABF27, 0x3E
@@ -5219,7 +7012,19 @@ FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D
.incbin "baserom.gba", 0x1AC25D, 0x3E
FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B
- .incbin "baserom.gba", 0x1AC29B, 0x136
+ .incbin "baserom.gba", 0x1AC29B, 0x3E
+
+FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9
+ .incbin "baserom.gba", 0x1AC2D9, 0x3E
+
+FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317
+ .incbin "baserom.gba", 0x1AC317, 0x3E
+
+FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355
+ .incbin "baserom.gba", 0x1AC355, 0x3E
+
+FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393
+ .incbin "baserom.gba", 0x1AC393, 0x3E
SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1
.incbin "baserom.gba", 0x1AC3D1, 0x3E
@@ -5234,7 +7039,10 @@ SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B
.incbin "baserom.gba", 0x1AC48B, 0x46
SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1
- .incbin "baserom.gba", 0x1AC4D1, 0x84
+ .incbin "baserom.gba", 0x1AC4D1, 0x46
+
+SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517
+ .incbin "baserom.gba", 0x1AC517, 0x3E
SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555
.incbin "baserom.gba", 0x1AC555, 0x3E
@@ -5255,13 +7063,46 @@ SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693
.incbin "baserom.gba", 0x1AC693, 0x46
SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9
- .incbin "baserom.gba", 0x1AC6D9, 0x174
+ .incbin "baserom.gba", 0x1AC6D9, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717
+ .incbin "baserom.gba", 0x1AC717, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755
+ .incbin "baserom.gba", 0x1AC755, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793
+ .incbin "baserom.gba", 0x1AC793, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1
+ .incbin "baserom.gba", 0x1AC7D1, 0x3E
+
+SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F
+ .incbin "baserom.gba", 0x1AC80F, 0x3E
SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D
.incbin "baserom.gba", 0x1AC84D, 0x3E
SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B
- .incbin "baserom.gba", 0x1AC88B, 0x1C2
+ .incbin "baserom.gba", 0x1AC88B, 0x3E
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9
+ .incbin "baserom.gba", 0x1AC8C9, 0x3E
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907
+ .incbin "baserom.gba", 0x1AC907, 0x46
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D
+ .incbin "baserom.gba", 0x1AC94D, 0x46
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993
+ .incbin "baserom.gba", 0x1AC993, 0x3E
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1
+ .incbin "baserom.gba", 0x1AC9D1, 0x3E
+
+SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F
+ .incbin "baserom.gba", 0x1ACA0F, 0x3E
SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D
.incbin "baserom.gba", 0x1ACA4D, 0x3E
@@ -5285,7 +7126,19 @@ SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1
.incbin "baserom.gba", 0x1ACBC1, 0x46
SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07
- .incbin "baserom.gba", 0x1ACC07, 0x15E
+ .incbin "baserom.gba", 0x1ACC07, 0x46
+
+SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D
+ .incbin "baserom.gba", 0x1ACC4D, 0x3E
+
+SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B
+ .incbin "baserom.gba", 0x1ACC8B, 0x3E
+
+SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9
+ .incbin "baserom.gba", 0x1ACCC9, 0x3E
+
+SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07
+ .incbin "baserom.gba", 0x1ACD07, 0x5E
ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65
.incbin "baserom.gba", 0x1ACD65, 0x6B
@@ -5306,10 +7159,19 @@ Route20_EventScript_1ACE36:: @ 81ACE36
.incbin "baserom.gba", 0x1ACE36, 0x19
Route25_EventScript_1ACE4F:: @ 81ACE4F
- .incbin "baserom.gba", 0x1ACE4F, 0x4E
+ .incbin "baserom.gba", 0x1ACE4F, 0x19
+
+CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68
+ .incbin "baserom.gba", 0x1ACE68, 0x1B
+
+VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83
+ .incbin "baserom.gba", 0x1ACE83, 0x1A
CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D
- .incbin "baserom.gba", 0x1ACE9D, 0x36
+ .incbin "baserom.gba", 0x1ACE9D, 0x1B
+
+FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8
+ .incbin "baserom.gba", 0x1ACEB8, 0x1B
SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3
.incbin "baserom.gba", 0x1ACED3, 0x19
@@ -5324,19 +7186,31 @@ FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
.incbin "baserom.gba", 0x1ACF2C, 0x1A
FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46
- .incbin "baserom.gba", 0x1ACF46, 0x4F
+ .incbin "baserom.gba", 0x1ACF46, 0x19
+
+FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F
+ .incbin "baserom.gba", 0x1ACF5F, 0x1B
+
+SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A
+ .incbin "baserom.gba", 0x1ACF7A, 0x1B
SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95
.incbin "baserom.gba", 0x1ACF95, 0x19
IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE
- .incbin "baserom.gba", 0x1ACFAE, 0x41
+ .incbin "baserom.gba", 0x1ACFAE, 0x26
+
+SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4
+ .incbin "baserom.gba", 0x1ACFD4, 0x1B
SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF
.incbin "baserom.gba", 0x1ACFEF, 0x4B
SaffronCity_Duplicate_EventScript_1AD03A:: @ 81AD03A
- .incbin "baserom.gba", 0x1AD03A, 0x32
+ .incbin "baserom.gba", 0x1AD03A, 0x19
+
+CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053
+ .incbin "baserom.gba", 0x1AD053, 0x19
IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C
.incbin "baserom.gba", 0x1AD06C, 0x1B
@@ -5345,15 +7219,24 @@ IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087
.incbin "baserom.gba", 0x1AD087, 0x19
LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0
- .incbin "baserom.gba", 0x1AD0A0, 0x34
+ .incbin "baserom.gba", 0x1AD0A0, 0x19
+
+CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9
+ .incbin "baserom.gba", 0x1AD0B9, 0x1B
SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4
- .incbin "baserom.gba", 0x1AD0D4, 0x32
+ .incbin "baserom.gba", 0x1AD0D4, 0x19
+
+SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED
+ .incbin "baserom.gba", 0x1AD0ED, 0x19
.include "data/text/fame_checker.inc"
CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
- .incbin "baserom.gba", 0x1B2867, 0x5B5
+ .incbin "baserom.gba", 0x1B2867, 0xD1
+
+FourIsland_House2_EventScript_1B2938:: @ 81B2938
+ .incbin "baserom.gba", 0x1B2938, 0x4E4
gUnknown_81B2E1C:: @ 81B2E1C
.string "How do I do this?$"
@@ -5405,6 +7288,18 @@ OneIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
PewterCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
SevenIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
VermilionCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+FourIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+SixIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+TwoIsland_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+Route10_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+Route10_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+Route4_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+SaffronCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+CeladonCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+LavenderTown_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
+ViridianCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2
.incbin "baserom.gba", 0x1BB1D2, 0x1B
CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
@@ -5483,21 +7378,27 @@ UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF
.incbin "baserom.gba", 0x1BB8CF, 0xC
gUnknown_81BB8DB:: @ 81BB8DB
+UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
.incbin "baserom.gba", 0x1BB8DB, 0x1D
gUnknown_81BB8F8:: @ 81BB8F8
+UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
.incbin "baserom.gba", 0x1BB8F8, 0x1D
gUnknown_81BB915:: @ 81BB915
+UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
.incbin "baserom.gba", 0x1BB915, 0x1D
gUnknown_81BB932:: @ 81BB932
+UnknownMap_00_03_EventScript_1BB932:: @ 81BB932
.incbin "baserom.gba", 0x1BB932, 0x1E
gUnknown_81BB950:: @ 81BB950
+UnknownMap_00_01_EventScript_1BB950:: @ 81BB950
.incbin "baserom.gba", 0x1BB950, 0xC
gUnknown_81BB95C:: @ 81BB95C
+UnknownMap_00_01_EventScript_1BB95C:: @ 81BB95C
.incbin "baserom.gba", 0x1BB95C, 0x24
gUnknown_81BB980:: @ 81BB980
@@ -5514,7 +7415,10 @@ gUnknown_81BB9A3:: @ 81BB9A3
.incbin "baserom.gba", 0x1BB9A3, 0xC
UnknownMap_00_00_EventScript_1BB9AF:: @ 81BB9AF
- .incbin "baserom.gba", 0x1BB9AF, 0x24
+ .incbin "baserom.gba", 0x1BB9AF, 0x12
+
+UnknownMap_00_01_EventScript_1BB9C1:: @ 81BB9C1
+ .incbin "baserom.gba", 0x1BB9C1, 0x12
UnknownMap_00_02_EventScript_1BB9D3:: @ 81BB9D3
.incbin "baserom.gba", 0x1BB9D3, 0x1
@@ -5584,6 +7488,14 @@ Route8_EventScript_1BDF13:: @ 81BDF13
ThreeIsland_BerryForest_EventScript_1BDF13:: @ 81BDF13
ThreeIsland_BondBridge_EventScript_1BDF13:: @ 81BDF13
ThreeIsland_EventScript_1BDF13:: @ 81BDF13
+Route9_EventScript_1BDF13:: @ 81BDF13
+Route13_EventScript_1BDF13:: @ 81BDF13
+TwoIsland_EventScript_1BDF13:: @ 81BDF13
+FuchsiaCity_EventScript_1BDF13:: @ 81BDF13
+VermilionCity_EventScript_1BDF13:: @ 81BDF13
+VermilionCity_EventScript_1BDF13:: @ 81BDF13
+CeruleanCity_EventScript_1BDF13:: @ 81BDF13
+ViridianCity_EventScript_1BDF13:: @ 81BDF13
.incbin "baserom.gba", 0x1BDF13, 0x58
gUnknown_81BDF6B:: @ 81BDF6B
@@ -5596,6 +7508,15 @@ MtEmber_RubyPath_B2F_EventScript_1BE00C:: @ 81BE00C
MtEmber_SummitPath_2F_EventScript_1BE00C:: @ 81BE00C
SSAnne_Kitchen3_EventScript_1BE00C:: @ 81BE00C
SevenIsland_SevaultCanyon_EventScript_1BE00C:: @ 81BE00C
+FourIsland_EventScript_1BE00C:: @ 81BE00C
+OneIsland_KindleRoad_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B3F_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B1F_EventScript_1BE00C:: @ 81BE00C
+MtEmber_RubyPath_B1F_EventScript_1BE00C:: @ 81BE00C
+RockTunnel_B1F_EventScript_1BE00C:: @ 81BE00C
+CeruleanCave_B1F_EventScript_1BE00C:: @ 81BE00C
+CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C
.incbin "baserom.gba", 0x1BE00C, 0x58
gUnknown_81BE064:: @ 81BE064
@@ -5609,6 +7530,14 @@ SeafoamIslands_B2F_EventScript_1BE11D:: @ 81BE11D
SevenIsland_SevaultCanyon_EventScript_1BE11D:: @ 81BE11D
VictoryRoad_1F_EventScript_1BE11D:: @ 81BE11D
VictoryRoad_3F_EventScript_1BE11D:: @ 81BE11D
+SixIsland_RuinValley_EventScript_1BE11D:: @ 81BE11D
+FuchsiaCity_Building1_EventScript_1BE11D:: @ 81BE11D
+SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D:: @ 81BE11D
+MtEmber_RubyPath_B3F_EventScript_1BE11D:: @ 81BE11D
+SeafoamIslands_B3F_EventScript_1BE11D:: @ 81BE11D
+SeafoamIslands_B3F_EventScript_1BE11D:: @ 81BE11D
+SeafoamIslands_B1F_EventScript_1BE11D:: @ 81BE11D
+VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D
.incbin "baserom.gba", 0x1BE11D, 0x51
gUnknown_81BE16E:: @ 81BE16E
@@ -5627,7 +7556,16 @@ Route2_EventScript_1BE58E:: @ 81BE58E
.incbin "baserom.gba", 0x1BE58E, 0xD
Route2_EventScript_1BE59B:: @ 81BE59B
- .incbin "baserom.gba", 0x1BE59B, 0x34
+ .incbin "baserom.gba", 0x1BE59B, 0xD
+
+ViridianForest_EventScript_1BE5A8:: @ 81BE5A8
+ .incbin "baserom.gba", 0x1BE5A8, 0xD
+
+ViridianForest_EventScript_1BE5B5:: @ 81BE5B5
+ .incbin "baserom.gba", 0x1BE5B5, 0xD
+
+ViridianForest_EventScript_1BE5C2:: @ 81BE5C2
+ .incbin "baserom.gba", 0x1BE5C2, 0xD
MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF
.incbin "baserom.gba", 0x1BE5CF, 0xD
@@ -5654,7 +7592,10 @@ MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A
.incbin "baserom.gba", 0x1BE62A, 0xD
Route4_EventScript_1BE637:: @ 81BE637
- .incbin "baserom.gba", 0x1BE637, 0x1A
+ .incbin "baserom.gba", 0x1BE637, 0xD
+
+Route24_EventScript_1BE644:: @ 81BE644
+ .incbin "baserom.gba", 0x1BE644, 0xD
Route25_EventScript_1BE651:: @ 81BE651
.incbin "baserom.gba", 0x1BE651, 0xD
@@ -5669,7 +7610,25 @@ SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678
.incbin "baserom.gba", 0x1BE678, 0xD
SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685
- .incbin "baserom.gba", 0x1BE685, 0x5B
+ .incbin "baserom.gba", 0x1BE685, 0xD
+
+SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692
+ .incbin "baserom.gba", 0x1BE692, 0xD
+
+SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F
+ .incbin "baserom.gba", 0x1BE69F, 0xD
+
+SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC
+ .incbin "baserom.gba", 0x1BE6AC, 0xD
+
+Route9_EventScript_1BE6B9:: @ 81BE6B9
+ .incbin "baserom.gba", 0x1BE6B9, 0xD
+
+RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6
+ .incbin "baserom.gba", 0x1BE6C6, 0xD
+
+RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3
+ .incbin "baserom.gba", 0x1BE6D3, 0xD
RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0
.incbin "baserom.gba", 0x1BE6E0, 0xD
@@ -5681,7 +7640,13 @@ RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA
.incbin "baserom.gba", 0x1BE6FA, 0xD
RocketHideout_B2F_EventScript_1BE707:: @ 81BE707
- .incbin "baserom.gba", 0x1BE707, 0x27
+ .incbin "baserom.gba", 0x1BE707, 0xD
+
+RocketHideout_B3F_EventScript_1BE714:: @ 81BE714
+ .incbin "baserom.gba", 0x1BE714, 0xD
+
+RocketHideout_B3F_EventScript_1BE721:: @ 81BE721
+ .incbin "baserom.gba", 0x1BE721, 0xD
RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E
.incbin "baserom.gba", 0x1BE72E, 0xD
@@ -5690,7 +7655,10 @@ RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B
.incbin "baserom.gba", 0x1BE73B, 0xD
RocketHideout_B4F_EventScript_1BE748:: @ 81BE748
- .incbin "baserom.gba", 0x1BE748, 0x1A
+ .incbin "baserom.gba", 0x1BE748, 0xD
+
+PokemonTower_3F_EventScript_1BE755:: @ 81BE755
+ .incbin "baserom.gba", 0x1BE755, 0xD
PokemonTower_4F_EventScript_1BE762:: @ 81BE762
.incbin "baserom.gba", 0x1BE762, 0xD
@@ -5699,7 +7667,10 @@ PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F
.incbin "baserom.gba", 0x1BE76F, 0xD
PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C
- .incbin "baserom.gba", 0x1BE77C, 0x1A
+ .incbin "baserom.gba", 0x1BE77C, 0xD
+
+PokemonTower_5F_EventScript_1BE789:: @ 81BE789
+ .incbin "baserom.gba", 0x1BE789, 0xD
PokemonTower_6F_EventScript_1BE796:: @ 81BE796
.incbin "baserom.gba", 0x1BE796, 0xD
@@ -5711,19 +7682,55 @@ Route12_EventScript_1BE7B0:: @ 81BE7B0
.incbin "baserom.gba", 0x1BE7B0, 0xD
Route12_EventScript_1BE7BD:: @ 81BE7BD
- .incbin "baserom.gba", 0x1BE7BD, 0x1A
+ .incbin "baserom.gba", 0x1BE7BD, 0xD
+
+Route15_EventScript_1BE7CA:: @ 81BE7CA
+ .incbin "baserom.gba", 0x1BE7CA, 0xD
SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7
- .incbin "baserom.gba", 0x1BE7D7, 0x41
+ .incbin "baserom.gba", 0x1BE7D7, 0xD
+
+SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4
+ .incbin "baserom.gba", 0x1BE7E4, 0xD
+
+SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1
+ .incbin "baserom.gba", 0x1BE7F1, 0xD
+
+SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE
+ .incbin "baserom.gba", 0x1BE7FE, 0xD
+
+SafariZone_East_EventScript_1BE80B:: @ 81BE80B
+ .incbin "baserom.gba", 0x1BE80B, 0xD
SafariZone_North_EventScript_1BE818:: @ 81BE818
.incbin "baserom.gba", 0x1BE818, 0xD
SafariZone_North_EventScript_1BE825:: @ 81BE825
- .incbin "baserom.gba", 0x1BE825, 0x41
+ .incbin "baserom.gba", 0x1BE825, 0xD
+
+SafariZone_West_EventScript_1BE832:: @ 81BE832
+ .incbin "baserom.gba", 0x1BE832, 0xD
+
+SafariZone_West_EventScript_1BE83F:: @ 81BE83F
+ .incbin "baserom.gba", 0x1BE83F, 0xD
+
+SafariZone_West_EventScript_1BE84C:: @ 81BE84C
+ .incbin "baserom.gba", 0x1BE84C, 0xD
+
+SafariZone_West_EventScript_1BE859:: @ 81BE859
+ .incbin "baserom.gba", 0x1BE859, 0xD
SilphCo_3F_EventScript_1BE866:: @ 81BE866
- .incbin "baserom.gba", 0x1BE866, 0x34
+ .incbin "baserom.gba", 0x1BE866, 0xD
+
+SilphCo_4F_EventScript_1BE873:: @ 81BE873
+ .incbin "baserom.gba", 0x1BE873, 0xD
+
+SilphCo_4F_EventScript_1BE880:: @ 81BE880
+ .incbin "baserom.gba", 0x1BE880, 0xD
+
+SilphCo_4F_EventScript_1BE88D:: @ 81BE88D
+ .incbin "baserom.gba", 0x1BE88D, 0xD
SilphCo_5F_EventScript_1BE89A:: @ 81BE89A
.incbin "baserom.gba", 0x1BE89A, 0xD
@@ -5732,13 +7739,28 @@ SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7
.incbin "baserom.gba", 0x1BE8A7, 0xD
SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4
- .incbin "baserom.gba", 0x1BE8B4, 0x27
+ .incbin "baserom.gba", 0x1BE8B4, 0xD
+
+SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1
+ .incbin "baserom.gba", 0x1BE8C1, 0xD
+
+SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE
+ .incbin "baserom.gba", 0x1BE8CE, 0xD
SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB
.incbin "baserom.gba", 0x1BE8DB, 0xD
SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8
- .incbin "baserom.gba", 0x1BE8E8, 0x34
+ .incbin "baserom.gba", 0x1BE8E8, 0xD
+
+SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5
+ .incbin "baserom.gba", 0x1BE8F5, 0xD
+
+SilphCo_10F_EventScript_1BE902:: @ 81BE902
+ .incbin "baserom.gba", 0x1BE902, 0xD
+
+SilphCo_10F_EventScript_1BE90F:: @ 81BE90F
+ .incbin "baserom.gba", 0x1BE90F, 0xD
PowerPlant_EventScript_1BE91C:: @ 81BE91C
.incbin "baserom.gba", 0x1BE91C, 0xD
@@ -5759,25 +7781,61 @@ PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D
.incbin "baserom.gba", 0x1BE95D, 0xD
PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A
- .incbin "baserom.gba", 0x1BE96A, 0x1A
+ .incbin "baserom.gba", 0x1BE96A, 0xD
+
+PokemonMansion_2F_EventScript_1BE977:: @ 81BE977
+ .incbin "baserom.gba", 0x1BE977, 0xD
PokemonMansion_3F_EventScript_1BE984:: @ 81BE984
.incbin "baserom.gba", 0x1BE984, 0xD
PokemonMansion_3F_EventScript_1BE991:: @ 81BE991
- .incbin "baserom.gba", 0x1BE991, 0x41
+ .incbin "baserom.gba", 0x1BE991, 0xD
+
+PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E
+ .incbin "baserom.gba", 0x1BE99E, 0xD
+
+PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB
+ .incbin "baserom.gba", 0x1BE9AB, 0xD
+
+PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8
+ .incbin "baserom.gba", 0x1BE9B8, 0xD
+
+PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5
+ .incbin "baserom.gba", 0x1BE9C5, 0xD
VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2
.incbin "baserom.gba", 0x1BE9D2, 0xD
VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF
- .incbin "baserom.gba", 0x1BE9DF, 0x41
+ .incbin "baserom.gba", 0x1BE9DF, 0xD
+
+VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC
+ .incbin "baserom.gba", 0x1BE9EC, 0xD
+
+VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9
+ .incbin "baserom.gba", 0x1BE9F9, 0xD
+
+VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06
+ .incbin "baserom.gba", 0x1BEA06, 0xD
+
+VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13
+ .incbin "baserom.gba", 0x1BEA13, 0xD
VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20
.incbin "baserom.gba", 0x1BEA20, 0xD
VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D
- .incbin "baserom.gba", 0x1BEA2D, 0x34
+ .incbin "baserom.gba", 0x1BEA2D, 0xD
+
+CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A
+ .incbin "baserom.gba", 0x1BEA3A, 0xD
+
+CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47
+ .incbin "baserom.gba", 0x1BEA47, 0xD
+
+CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54
+ .incbin "baserom.gba", 0x1BEA54, 0xD
CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61
.incbin "baserom.gba", 0x1BEA61, 0xD
@@ -5786,16 +7844,37 @@ CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E
.incbin "baserom.gba", 0x1BEA6E, 0xD
CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B
- .incbin "baserom.gba", 0x1BEA7B, 0x41
+ .incbin "baserom.gba", 0x1BEA7B, 0xD
+
+CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88
+ .incbin "baserom.gba", 0x1BEA88, 0xD
+
+CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95
+ .incbin "baserom.gba", 0x1BEA95, 0xD
+
+FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2
+ .incbin "baserom.gba", 0x1BEAA2, 0xD
+
+TwoIsland_EventScript_1BEAAF:: @ 81BEAAF
+ .incbin "baserom.gba", 0x1BEAAF, 0xD
ThreeIsland_EventScript_1BEABC:: @ 81BEABC
- .incbin "baserom.gba", 0x1BEABC, 0x1A
+ .incbin "baserom.gba", 0x1BEABC, 0xD
+
+ViridianForest_EventScript_1BEAC9:: @ 81BEAC9
+ .incbin "baserom.gba", 0x1BEAC9, 0xD
MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6
.incbin "baserom.gba", 0x1BEAD6, 0xD
MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3
- .incbin "baserom.gba", 0x1BEAE3, 0x27
+ .incbin "baserom.gba", 0x1BEAE3, 0xD
+
+Route11_EventScript_1BEAF0:: @ 81BEAF0
+ .incbin "baserom.gba", 0x1BEAF0, 0xD
+
+Route9_EventScript_1BEAFD:: @ 81BEAFD
+ .incbin "baserom.gba", 0x1BEAFD, 0xD
RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A
.incbin "baserom.gba", 0x1BEB0A, 0xD
@@ -5804,34 +7883,88 @@ RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17
.incbin "baserom.gba", 0x1BEB17, 0xD
RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24
- .incbin "baserom.gba", 0x1BEB24, 0x34
+ .incbin "baserom.gba", 0x1BEB24, 0xD
+
+RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31
+ .incbin "baserom.gba", 0x1BEB31, 0xD
+
+RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E
+ .incbin "baserom.gba", 0x1BEB3E, 0xD
+
+SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B
+ .incbin "baserom.gba", 0x1BEB4B, 0xD
SilphCo_11F_EventScript_1BEB58:: @ 81BEB58
.incbin "baserom.gba", 0x1BEB58, 0xD
PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65
- .incbin "baserom.gba", 0x1BEB65, 0x5B
+ .incbin "baserom.gba", 0x1BEB65, 0xD
+
+PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72
+ .incbin "baserom.gba", 0x1BEB72, 0xD
+
+PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F
+ .incbin "baserom.gba", 0x1BEB7F, 0xD
+
+ViridianCity_EventScript_1BEB8C:: @ 81BEB8C
+ .incbin "baserom.gba", 0x1BEB8C, 0xD
+
+Route11_EventScript_1BEB99:: @ 81BEB99
+ .incbin "baserom.gba", 0x1BEB99, 0xD
+
+Route11_EventScript_1BEBA6:: @ 81BEBA6
+ .incbin "baserom.gba", 0x1BEBA6, 0xD
+
+PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3
+ .incbin "baserom.gba", 0x1BEBB3, 0xD
CeladonCity_EventScript_1BEBC0:: @ 81BEBC0
- .incbin "baserom.gba", 0x1BEBC0, 0x1A
+ .incbin "baserom.gba", 0x1BEBC0, 0xD
+
+RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD
+ .incbin "baserom.gba", 0x1BEBCD, 0xD
SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA
.incbin "baserom.gba", 0x1BEBDA, 0xD
SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7
- .incbin "baserom.gba", 0x1BEBE7, 0x27
+ .incbin "baserom.gba", 0x1BEBE7, 0xD
+
+SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4
+ .incbin "baserom.gba", 0x1BEBF4, 0xD
+
+SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01
+ .incbin "baserom.gba", 0x1BEC01, 0xD
SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E
.incbin "baserom.gba", 0x1BEC0E, 0xD
SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B
- .incbin "baserom.gba", 0x1BEC1B, 0x4E
+ .incbin "baserom.gba", 0x1BEC1B, 0xD
+
+FourIsland_EventScript_1BEC28:: @ 81BEC28
+ .incbin "baserom.gba", 0x1BEC28, 0xD
+
+FourIsland_EventScript_1BEC35:: @ 81BEC35
+ .incbin "baserom.gba", 0x1BEC35, 0xD
+
+OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42
+ .incbin "baserom.gba", 0x1BEC42, 0xD
+
+OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F
+ .incbin "baserom.gba", 0x1BEC4F, 0xD
+
+OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C
+ .incbin "baserom.gba", 0x1BEC5C, 0xD
FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69
.incbin "baserom.gba", 0x1BEC69, 0xD
FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76
- .incbin "baserom.gba", 0x1BEC76, 0x1A
+ .incbin "baserom.gba", 0x1BEC76, 0xD
+
+FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83
+ .incbin "baserom.gba", 0x1BEC83, 0xD
SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90
.incbin "baserom.gba", 0x1BEC90, 0xD
@@ -5840,7 +7973,16 @@ SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D
.incbin "baserom.gba", 0x1BEC9D, 0xD
SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA
- .incbin "baserom.gba", 0x1BECAA, 0x34
+ .incbin "baserom.gba", 0x1BECAA, 0xD
+
+SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7
+ .incbin "baserom.gba", 0x1BECB7, 0xD
+
+SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4
+ .incbin "baserom.gba", 0x1BECC4, 0xD
+
+SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1
+ .incbin "baserom.gba", 0x1BECD1, 0xD
SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE
.incbin "baserom.gba", 0x1BECDE, 0xD
@@ -5873,19 +8015,49 @@ FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53
.incbin "baserom.gba", 0x1BED53, 0xD
FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60
- .incbin "baserom.gba", 0x1BED60, 0x5B
+ .incbin "baserom.gba", 0x1BED60, 0xD
+
+SSAnne_CaptainsOffice2_EventScript_1BED6D:: @ 81BED6D
+ .incbin "baserom.gba", 0x1BED6D, 0xD
+
+SSAnne_CaptainsOffice2_EventScript_1BED7A:: @ 81BED7A
+ .incbin "baserom.gba", 0x1BED7A, 0xD
+
+SSAnne_CaptainsOffice4_EventScript_1BED87:: @ 81BED87
+ .incbin "baserom.gba", 0x1BED87, 0xD
+
+SSAnne_CaptainsOffice4_EventScript_1BED94:: @ 81BED94
+ .incbin "baserom.gba", 0x1BED94, 0xD
+
+SSAnne_CaptainsOffice4_EventScript_1BEDA1:: @ 81BEDA1
+ .incbin "baserom.gba", 0x1BEDA1, 0xD
+
+SSAnne_CaptainsOffice4_EventScript_1BEDAE:: @ 81BEDAE
+ .incbin "baserom.gba", 0x1BEDAE, 0xD
FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB
- .incbin "baserom.gba", 0x1BEDBB, 0x1A
+ .incbin "baserom.gba", 0x1BEDBB, 0xD
+
+FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8
+ .incbin "baserom.gba", 0x1BEDC8, 0xD
FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5
- .incbin "baserom.gba", 0x1BEDD5, 0x1A
+ .incbin "baserom.gba", 0x1BEDD5, 0xD
+
+FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2
+ .incbin "baserom.gba", 0x1BEDE2, 0xD
FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF
.incbin "baserom.gba", 0x1BEDEF, 0xD
SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC
- .incbin "baserom.gba", 0x1BEDFC, 0x59C
+ .incbin "baserom.gba", 0x1BEDFC, 0xD
+
+SilphCo_4F_EventScript_1BEE09:: @ 81BEE09
+ .incbin "baserom.gba", 0x1BEE09, 0xD
+
+PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16
+ .incbin "baserom.gba", 0x1BEE16, 0x582
Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398
.incbin "baserom.gba", 0x1BF398, 0x1AE
@@ -5921,7 +8093,13 @@ gUnknown_81C13D6:: @ 81C13D6
.incbin "baserom.gba", 0x1C13D6, 0x53
gUnknown_81C1429:: @ 81C1429
- .incbin "baserom.gba", 0x1C1429, 0x34BD
+ .incbin "baserom.gba", 0x1C1429, 0x3385
+
+VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE
+ .incbin "baserom.gba", 0x1C47AE, 0xD0
+
+RockTunnel_B1F_EventScript_1C487E:: @ 81C487E
+ .incbin "baserom.gba", 0x1C487E, 0x68
MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6
.incbin "baserom.gba", 0x1C48E6, 0x68
@@ -5930,13 +8108,22 @@ Route4_EventScript_1C494E:: @ 81C494E
.incbin "baserom.gba", 0x1C494E, 0x68
Route4_EventScript_1C49B6:: @ 81C49B6
- .incbin "baserom.gba", 0x1C49B6, 0x208
+ .incbin "baserom.gba", 0x1C49B6, 0x138
+
+FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE
+ .incbin "baserom.gba", 0x1C4AEE, 0x68
+
+SevenIsland_EventScript_1C4B56:: @ 81C4B56
+ .incbin "baserom.gba", 0x1C4B56, 0x68
PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE
.incbin "baserom.gba", 0x1C4BBE, 0x1C6
FourIsland_House1_EventScript_1C4D84:: @ 81C4D84
- .incbin "baserom.gba", 0x1C4D84, 0x1D0
+ .incbin "baserom.gba", 0x1C4D84, 0x68
+
+TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
+ .incbin "baserom.gba", 0x1C4DEC, 0x168
SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54
SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54
@@ -5979,18 +8166,30 @@ SevenIsland_TrainerTower_2F_EventScript_1C54AF:: @ 81C54AF
SevenIsland_TrainerTower_4F_EventScript_1C54AF:: @ 81C54AF
SevenIsland_TrainerTower_6F_EventScript_1C54AF:: @ 81C54AF
SevenIsland_TrainerTower_8F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_5F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_7F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_3F_EventScript_1C54AF:: @ 81C54AF
+SevenIsland_TrainerTower_1F_EventScript_1C54AF:: @ 81C54AF
.incbin "baserom.gba", 0x1C54AF, 0x5
SevenIsland_TrainerTower_2F_EventScript_1C54B4:: @ 81C54B4
SevenIsland_TrainerTower_4F_EventScript_1C54B4:: @ 81C54B4
SevenIsland_TrainerTower_6F_EventScript_1C54B4:: @ 81C54B4
SevenIsland_TrainerTower_8F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4
+SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4
.incbin "baserom.gba", 0x1C54B4, 0x36
SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA
SevenIsland_TrainerTower_4F_EventScript_1C54EA:: @ 81C54EA
SevenIsland_TrainerTower_6F_EventScript_1C54EA:: @ 81C54EA
SevenIsland_TrainerTower_8F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA
+SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
.incbin "baserom.gba", 0x1C54EA, 0x71
gUnknown_81C555B:: @ 81C555B