diff options
427 files changed, 1700 insertions, 1700 deletions
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 64fc45727..7e0529a71 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -1,16 +1,16 @@ -gMapScripts_UnknownMap_00_00:: @ 8160478 +UnknownMap_00_00_MapScripts:: @ 8160478 .byte 0 -gMapScripts_UnknownMap_00_01:: @ 8160479 +UnknownMap_00_01_MapScripts:: @ 8160479 .byte 0 -gMapScripts_UnknownMap_00_02:: @ 816047A +UnknownMap_00_02_MapScripts:: @ 816047A .byte 0 -gMapScripts_UnknownMap_00_03:: @ 816047B +UnknownMap_00_03_MapScripts:: @ 816047B .byte 0 -gMapScripts_UnknownMap_00_04:: @ 816047C +UnknownMap_00_04_MapScripts:: @ 816047C map_script 5, UnknownMap_00_04_MapScript1_160487 map_script 3, UnknownMap_00_04_MapScript2_1604BB .byte 0 @@ -48,7 +48,7 @@ UnknownMap_00_04_EventScript_160502:: @ 8160502 UnknownMap_00_04_EventScript_16050C:: @ 816050C .incbin "baserom.gba", 0x16050C, 0x13 -gMapScripts_ViridianForest:: @ 816051F +ViridianForest_MapScripts:: @ 816051F map_script 3, ViridianForest_MapScript1_160525 .byte 0 @@ -94,7 +94,7 @@ ViridianForest_EventScript_1605B6:: @ 81605B6 ViridianForest_EventScript_1605CD:: @ 81605CD .incbin "baserom.gba", 0x1605CD, 0x17 -gMapScripts_MtMoon_1F:: @ 81605E4 +MtMoon_1F_MapScripts:: @ 81605E4 map_script 3, MtMoon_1F_MapScript1_1605EA .byte 0 @@ -125,10 +125,10 @@ MtMoon_1F_EventScript_16066A:: @ 816066A MtMoon_1F_EventScript_160681:: @ 8160681 .incbin "baserom.gba", 0x160681, 0x17 -gMapScripts_MtMoon_B1F:: @ 8160698 +MtMoon_B1F_MapScripts:: @ 8160698 .byte 0 -gMapScripts_MtMoon_B2F:: @ 8160699 +MtMoon_B2F_MapScripts:: @ 8160699 map_script 3, MtMoon_B2F_MapScript1_16069F .byte 0 @@ -159,7 +159,7 @@ MtMoon_B2F_EventScript_160812:: @ 8160812 MtMoon_B2F_EventScript_160829:: @ 8160829 .incbin "baserom.gba", 0x160829, 0x17 -gMapScripts_SSAnne_Exterior:: @ 8160840 +SSAnne_Exterior_MapScripts:: @ 8160840 map_script 3, SSAnne_Exterior_MapScript1_16084B map_script 2, SSAnne_Exterior_MapScript2_16084F .byte 0 @@ -170,7 +170,7 @@ SSAnne_Exterior_MapScript1_16084B:: @ 816084B SSAnne_Exterior_MapScript2_16084F:: @ 816084F .incbin "baserom.gba", 0x16084F, 0x7C -gMapScripts_SSAnne_1F_Corridor:: @ 81608CB +SSAnne_1F_Corridor_MapScripts:: @ 81608CB .byte 0 SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC @@ -179,7 +179,7 @@ SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5 .incbin "baserom.gba", 0x1608D5, 0x9 -gMapScripts_SSAnne_2F_Corridor:: @ 81608DE +SSAnne_2F_Corridor_MapScripts:: @ 81608DE .byte 0 SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF @@ -194,16 +194,16 @@ SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7 SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 .incbin "baserom.gba", 0x160A54, 0x9 -gMapScripts_SSAnne_3F_Corridor:: @ 8160A5D +SSAnne_3F_Corridor_MapScripts:: @ 8160A5D .byte 0 SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E .incbin "baserom.gba", 0x160A5E, 0x9 -gMapScripts_SSAnne_B1F_Corridor:: @ 8160A67 +SSAnne_B1F_Corridor_MapScripts:: @ 8160A67 .byte 0 -gMapScripts_SSAnne_Deck:: @ 8160A68 +SSAnne_Deck_MapScripts:: @ 8160A68 .byte 0 SSAnne_Deck_EventScript_160A69:: @ 8160A69 @@ -221,7 +221,7 @@ SSAnne_Deck_EventScript_160A84:: @ 8160A84 SSAnne_Deck_EventScript_160A9B:: @ 8160A9B .incbin "baserom.gba", 0x160A9B, 0x17 -gMapScripts_SSAnne_Kitchen:: @ 8160AB2 +SSAnne_Kitchen_MapScripts:: @ 8160AB2 .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 @@ -245,7 +245,7 @@ SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 .incbin "baserom.gba", 0x160B30, 0x9 -gMapScripts_SSAnne_CaptainsOffice:: @ 8160B39 +SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 .byte 0 SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A @@ -257,13 +257,13 @@ SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9 SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2 .incbin "baserom.gba", 0x160BD2, 0x9 -gMapScripts_SSAnne_1F_Room1:: @ 8160BDB +SSAnne_1F_Room1_MapScripts:: @ 8160BDB .byte 0 SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC .incbin "baserom.gba", 0x160BDC, 0x9 -gMapScripts_SSAnne_1F_Room2:: @ 8160BE5 +SSAnne_1F_Room2_MapScripts:: @ 8160BE5 .byte 0 SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 @@ -275,7 +275,7 @@ SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 .incbin "baserom.gba", 0x160C06, 0x17 -gMapScripts_SSAnne_1F_Room3:: @ 8160C1D +SSAnne_1F_Room3_MapScripts:: @ 8160C1D .byte 0 SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E @@ -287,31 +287,31 @@ SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27 SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 .incbin "baserom.gba", 0x160C30, 0x13 -gMapScripts_SSAnne_1F_Room4:: @ 8160C43 +SSAnne_1F_Room4_MapScripts:: @ 8160C43 .byte 0 SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 .incbin "baserom.gba", 0x160C44, 0x22 -gMapScripts_SSAnne_1F_Room5:: @ 8160C66 +SSAnne_1F_Room5_MapScripts:: @ 8160C66 .byte 0 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 .incbin "baserom.gba", 0x160C67, 0x17 -gMapScripts_SSAnne_1F_Room7:: @ 8160C7E +SSAnne_1F_Room7_MapScripts:: @ 8160C7E .byte 0 SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F .incbin "baserom.gba", 0x160C7F, 0x17 -gMapScripts_SSAnne_2F_Room1:: @ 8160C96 +SSAnne_2F_Room1_MapScripts:: @ 8160C96 .byte 0 SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97 .incbin "baserom.gba", 0x160C97, 0x19 -gMapScripts_SSAnne_2F_Room2:: @ 8160CB0 +SSAnne_2F_Room2_MapScripts:: @ 8160CB0 .byte 0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 @@ -320,7 +320,7 @@ SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 .incbin "baserom.gba", 0x160CC8, 0x17 -gMapScripts_SSAnne_2F_Room3:: @ 8160CDF +SSAnne_2F_Room3_MapScripts:: @ 8160CDF .byte 0 SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 @@ -329,7 +329,7 @@ SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9 .incbin "baserom.gba", 0x160CE9, 0x9 -gMapScripts_SSAnne_2F_Room4:: @ 8160CF2 +SSAnne_2F_Room4_MapScripts:: @ 8160CF2 .byte 0 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 @@ -338,7 +338,7 @@ SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A .incbin "baserom.gba", 0x160D0A, 0x17 -gMapScripts_SSAnne_2F_Room5:: @ 8160D21 +SSAnne_2F_Room5_MapScripts:: @ 8160D21 .byte 0 SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 @@ -347,7 +347,7 @@ SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B .incbin "baserom.gba", 0x160D2B, 0x9 -gMapScripts_SSAnne_2F_Room6:: @ 8160D34 +SSAnne_2F_Room6_MapScripts:: @ 8160D34 .byte 0 SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 @@ -356,7 +356,7 @@ SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E .incbin "baserom.gba", 0x160D3E, 0x9 -gMapScripts_SSAnne_B1F_Room1:: @ 8160D47 +SSAnne_B1F_Room1_MapScripts:: @ 8160D47 .byte 0 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 @@ -365,19 +365,19 @@ SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F .incbin "baserom.gba", 0x160D5F, 0x17 -gMapScripts_SSAnne_B1F_Room2:: @ 8160D76 +SSAnne_B1F_Room2_MapScripts:: @ 8160D76 .byte 0 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 .incbin "baserom.gba", 0x160D77, 0x17 -gMapScripts_SSAnne_B1F_Room3:: @ 8160D8E +SSAnne_B1F_Room3_MapScripts:: @ 8160D8E .byte 0 SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F .incbin "baserom.gba", 0x160D8F, 0x17 -gMapScripts_SSAnne_B1F_Room4:: @ 8160DA6 +SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 .byte 0 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 @@ -386,7 +386,7 @@ SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE .incbin "baserom.gba", 0x160DBE, 0x17 -gMapScripts_SSAnne_B1F_Room5:: @ 8160DD5 +SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 .byte 0 SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 @@ -395,70 +395,70 @@ SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF .incbin "baserom.gba", 0x160DDF, 0x13 -gMapScripts_SSAnne_1F_Room6:: @ 8160DF2 +SSAnne_1F_Room6_MapScripts:: @ 8160DF2 .byte 0 SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 .incbin "baserom.gba", 0x160DF3, 0x45 -gMapScripts_UndergroundPath_NorthEntrance:: @ 8160E38 +UndergroundPath_NorthEntrance_MapScripts:: @ 8160E38 .byte 0 UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 .incbin "baserom.gba", 0x160E39, 0x7C -gMapScripts_UndergroundPath_NorthSouthTunnel:: @ 8160EB5 +UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 map_script 3, UndergroundPath_NorthSouthTunnel_MapScript1_160EBB .byte 0 UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB .incbin "baserom.gba", 0x160EBB, 0x4 -gMapScripts_UndergroundPath_SouthEntrance:: @ 8160EBF +UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF .byte 0 UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0 .incbin "baserom.gba", 0x160EC0, 0x9 -gMapScripts_UndergroundPath_WestEntrance:: @ 8160EC9 +UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9 .byte 0 UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA .incbin "baserom.gba", 0x160ECA, 0x9 -gMapScripts_UndergroundPath_EastWestTunnel:: @ 8160ED3 +UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 map_script 3, UndergroundPath_EastWestTunnel_MapScript1_160ED9 .byte 0 UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9 .incbin "baserom.gba", 0x160ED9, 0x4 -gMapScripts_UndergroundPath_EastEntrance:: @ 8160EDD +UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD .byte 0 UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE .incbin "baserom.gba", 0x160EDE, 0x9 -gMapScripts_DiglettsCave_NorthEntrance:: @ 8160EE7 +DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7 .byte 0 DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8 .incbin "baserom.gba", 0x160EE8, 0x9 -gMapScripts_DiglettsCave_B1F:: @ 8160EF1 +DiglettsCave_B1F_MapScripts:: @ 8160EF1 map_script 3, DiglettsCave_B1F_MapScript1_160EF7 .byte 0 DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7 .incbin "baserom.gba", 0x160EF7, 0x4 -gMapScripts_DiglettsCave_SouthEntrance:: @ 8160EFB +DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB .byte 0 DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC .incbin "baserom.gba", 0x160EFC, 0x9 -gMapScripts_VictoryRoad_1F:: @ 8160F05 +VictoryRoad_1F_MapScripts:: @ 8160F05 map_script 1, VictoryRoad_1F_MapScript1_160F10 map_script 3, VictoryRoad_1F_MapScript2_160F2F .byte 0 @@ -478,7 +478,7 @@ VictoryRoad_1F_EventScript_160F64:: @ 8160F64 VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B .incbin "baserom.gba", 0x160F7B, 0x17 -gMapScripts_VictoryRoad_2F:: @ 8160F92 +VictoryRoad_2F_MapScripts:: @ 8160F92 map_script 1, VictoryRoad_2F_MapScript1_160F98 .byte 0 @@ -506,7 +506,7 @@ VictoryRoad_2F_EventScript_16107C:: @ 816107C VictoryRoad_2F_EventScript_161093:: @ 8161093 .incbin "baserom.gba", 0x161093, 0x17 -gMapScripts_VictoryRoad_3F:: @ 81610AA +VictoryRoad_3F_MapScripts:: @ 81610AA map_script 1, VictoryRoad_3F_MapScript1_1610B0 .byte 0 @@ -534,7 +534,7 @@ VictoryRoad_3F_EventScript_16115F:: @ 816115F VictoryRoad_3F_EventScript_16117A:: @ 816117A .incbin "baserom.gba", 0x16117A, 0x1B -gMapScripts_RocketHideout_B1F:: @ 8161195 +RocketHideout_B1F_MapScripts:: @ 8161195 map_script 1, RocketHideout_B1F_MapScript1_1611A0 map_script 3, RocketHideout_B1F_MapScript2_1611AA .byte 0 @@ -560,13 +560,13 @@ RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 RocketHideout_B1F_EventScript_16120A:: @ 816120A .incbin "baserom.gba", 0x16120A, 0x97 -gMapScripts_RocketHideout_B2F:: @ 81612A1 +RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 .incbin "baserom.gba", 0x1612A2, 0x17 -gMapScripts_RocketHideout_B3F:: @ 81612B9 +RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA @@ -575,7 +575,7 @@ RocketHideout_B3F_EventScript_1612BA:: @ 81612BA RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 .incbin "baserom.gba", 0x1612D1, 0x17 -gMapScripts_RocketHideout_B4F:: @ 81612E8 +RocketHideout_B4F_MapScripts:: @ 81612E8 map_script 1, RocketHideout_B4F_MapScript1_1612EE .byte 0 @@ -600,13 +600,13 @@ RocketHideout_B4F_EventScript_1613CE:: @ 81613CE RocketHideout_B4F_EventScript_161418:: @ 8161418 .incbin "baserom.gba", 0x161418, 0xC0 -gMapScripts_RocketHideout_Elevator:: @ 81614D8 +RocketHideout_Elevator_MapScripts:: @ 81614D8 .byte 0 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 .incbin "baserom.gba", 0x1614D9, 0x14C -gMapScripts_SilphCo_1F:: @ 8161625 +SilphCo_1F_MapScripts:: @ 8161625 map_script 3, SilphCo_1F_MapScript1_16162B .byte 0 @@ -619,7 +619,7 @@ SilphCo_1F_EventScript_16162F:: @ 816162F SilphCo_1F_EventScript_161638:: @ 8161638 .incbin "baserom.gba", 0x161638, 0x9 -gMapScripts_SilphCo_2F:: @ 8161641 +SilphCo_2F_MapScripts:: @ 8161641 map_script 1, SilphCo_2F_MapScript1_161647 .byte 0 @@ -644,7 +644,7 @@ SilphCo_2F_EventScript_161697:: @ 8161697 SilphCo_2F_EventScript_1616AE:: @ 81616AE .incbin "baserom.gba", 0x1616AE, 0x17 -gMapScripts_SilphCo_3F:: @ 81616C5 +SilphCo_3F_MapScripts:: @ 81616C5 map_script 1, SilphCo_3F_MapScript1_1616CB .byte 0 @@ -663,7 +663,7 @@ SilphCo_3F_EventScript_161708:: @ 8161708 SilphCo_3F_EventScript_16171F:: @ 816171F .incbin "baserom.gba", 0x16171F, 0x17 -gMapScripts_SilphCo_4F:: @ 8161736 +SilphCo_4F_MapScripts:: @ 8161736 map_script 1, SilphCo_4F_MapScript1_16173C .byte 0 @@ -685,7 +685,7 @@ SilphCo_4F_EventScript_161790:: @ 8161790 SilphCo_4F_EventScript_1617A7:: @ 81617A7 .incbin "baserom.gba", 0x1617A7, 0x17 -gMapScripts_SilphCo_5F:: @ 81617BE +SilphCo_5F_MapScripts:: @ 81617BE map_script 1, SilphCo_5F_MapScript1_1617C4 .byte 0 @@ -719,7 +719,7 @@ SilphCo_5F_EventScript_161853:: @ 8161853 SilphCo_5F_EventScript_16186A:: @ 816186A .incbin "baserom.gba", 0x16186A, 0x17 -gMapScripts_SilphCo_6F:: @ 8161881 +SilphCo_6F_MapScripts:: @ 8161881 map_script 1, SilphCo_6F_MapScript1_161887 .byte 0 @@ -753,7 +753,7 @@ SilphCo_6F_EventScript_161956:: @ 8161956 SilphCo_6F_EventScript_16196D:: @ 816196D .incbin "baserom.gba", 0x16196D, 0x17 -gMapScripts_SilphCo_7F:: @ 8161984 +SilphCo_7F_MapScripts:: @ 8161984 map_script 1, SilphCo_7F_MapScript1_16198F map_script 3, SilphCo_7F_MapScript2_1619AB .byte 0 @@ -797,7 +797,7 @@ SilphCo_7F_EventScript_161C31:: @ 8161C31 SilphCo_7F_EventScript_161C48:: @ 8161C48 .incbin "baserom.gba", 0x161C48, 0x17 -gMapScripts_SilphCo_8F:: @ 8161C5F +SilphCo_8F_MapScripts:: @ 8161C5F map_script 1, SilphCo_8F_MapScript1_161C65 .byte 0 @@ -819,7 +819,7 @@ SilphCo_8F_EventScript_161CB0:: @ 8161CB0 SilphCo_8F_EventScript_161CC7:: @ 8161CC7 .incbin "baserom.gba", 0x161CC7, 0x17 -gMapScripts_SilphCo_9F:: @ 8161CDE +SilphCo_9F_MapScripts:: @ 8161CDE map_script 1, SilphCo_9F_MapScript1_161CE4 .byte 0 @@ -841,7 +841,7 @@ SilphCo_9F_EventScript_161D58:: @ 8161D58 SilphCo_9F_EventScript_161D6F:: @ 8161D6F .incbin "baserom.gba", 0x161D6F, 0x17 -gMapScripts_SilphCo_10F:: @ 8161D86 +SilphCo_10F_MapScripts:: @ 8161D86 map_script 1, SilphCo_10F_MapScript1_161D8C .byte 0 @@ -860,7 +860,7 @@ SilphCo_10F_EventScript_161DC0:: @ 8161DC0 SilphCo_10F_EventScript_161DD7:: @ 8161DD7 .incbin "baserom.gba", 0x161DD7, 0x17 -gMapScripts_SilphCo_11F:: @ 8161DEE +SilphCo_11F_MapScripts:: @ 8161DEE map_script 1, SilphCo_11F_MapScript1_161DF4 .byte 0 @@ -888,13 +888,13 @@ SilphCo_11F_EventScript_161F40:: @ 8161F40 SilphCo_11F_EventScript_161F57:: @ 8161F57 .incbin "baserom.gba", 0x161F57, 0x17 -gMapScripts_SilphCo_Elevator:: @ 8161F6E +SilphCo_Elevator_MapScripts:: @ 8161F6E .byte 0 SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F .incbin "baserom.gba", 0x161F6F, 0x28A -gMapScripts_PokemonMansion_1F:: @ 81621F9 +PokemonMansion_1F_MapScripts:: @ 81621F9 map_script 1, PokemonMansion_1F_MapScript1_162204 map_script 3, PokemonMansion_1F_MapScript2_16220E .byte 0 @@ -914,7 +914,7 @@ PokemonMansion_1F_EventScript_162226:: @ 8162226 PokemonMansion_1F_EventScript_16223D:: @ 816223D .incbin "baserom.gba", 0x16223D, 0x17 -gMapScripts_PokemonMansion_2F:: @ 8162254 +PokemonMansion_2F_MapScripts:: @ 8162254 map_script 1, PokemonMansion_2F_MapScript1_16225A .byte 0 @@ -933,7 +933,7 @@ PokemonMansion_2F_EventScript_162281:: @ 8162281 PokemonMansion_2F_EventScript_16228A:: @ 816228A .incbin "baserom.gba", 0x16228A, 0x17 -gMapScripts_PokemonMansion_3F:: @ 81622A1 +PokemonMansion_3F_MapScripts:: @ 81622A1 map_script 1, PokemonMansion_3F_MapScript1_1622A7 .byte 0 @@ -952,7 +952,7 @@ PokemonMansion_3F_EventScript_1622CE:: @ 81622CE PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 .incbin "baserom.gba", 0x1622E5, 0x17 -gMapScripts_PokemonMansion_B1F:: @ 81622FC +PokemonMansion_B1F_MapScripts:: @ 81622FC map_script 1, PokemonMansion_B1F_MapScript1_162302 .byte 0 @@ -971,7 +971,7 @@ PokemonMansion_B1F_EventScript_162329:: @ 8162329 PokemonMansion_B1F_EventScript_162340:: @ 8162340 .incbin "baserom.gba", 0x162340, 0x17 -gMapScripts_SafariZone_Center:: @ 8162357 +SafariZone_Center_MapScripts:: @ 8162357 map_script 3, SafariZone_Center_MapScript1_16235D .byte 0 @@ -987,7 +987,7 @@ SafariZone_Center_EventScript_16236A:: @ 816236A SafariZone_Center_EventScript_162373:: @ 8162373 .incbin "baserom.gba", 0x162373, 0x9 -gMapScripts_SafariZone_East:: @ 816237C +SafariZone_East_MapScripts:: @ 816237C .byte 0 SafariZone_East_EventScript_16237D:: @ 816237D @@ -999,7 +999,7 @@ SafariZone_East_EventScript_162386:: @ 8162386 SafariZone_East_EventScript_16238F:: @ 816238F .incbin "baserom.gba", 0x16238F, 0x9 -gMapScripts_SafariZone_North:: @ 8162398 +SafariZone_North_MapScripts:: @ 8162398 .byte 0 SafariZone_North_EventScript_162399:: @ 8162399 @@ -1017,7 +1017,7 @@ SafariZone_North_EventScript_1623B4:: @ 81623B4 SafariZone_North_EventScript_1623BD:: @ 81623BD .incbin "baserom.gba", 0x1623BD, 0x9 -gMapScripts_SafariZone_West:: @ 81623C6 +SafariZone_West_MapScripts:: @ 81623C6 .byte 0 SafariZone_West_EventScript_1623C7:: @ 81623C7 @@ -1032,7 +1032,7 @@ SafariZone_West_EventScript_1623D9:: @ 81623D9 SafariZone_West_EventScript_1623E2:: @ 81623E2 .incbin "baserom.gba", 0x1623E2, 0x9 -gMapScripts_SafariZone_Building1:: @ 81623EB +SafariZone_Building1_MapScripts:: @ 81623EB .byte 0 SafariZone_Building1_EventScript_1623EC:: @ 81623EC @@ -1041,7 +1041,7 @@ SafariZone_Building1_EventScript_1623EC:: @ 81623EC SafariZone_Building1_EventScript_1623F5:: @ 81623F5 .incbin "baserom.gba", 0x1623F5, 0x9 -gMapScripts_SafariZone_Building2:: @ 81623FE +SafariZone_Building2_MapScripts:: @ 81623FE .byte 0 SafariZone_Building2_EventScript_1623FF:: @ 81623FF @@ -1053,7 +1053,7 @@ SafariZone_Building2_EventScript_162408:: @ 8162408 SafariZone_Building2_EventScript_162411:: @ 8162411 .incbin "baserom.gba", 0x162411, 0x9 -gMapScripts_SafariZone_Building3:: @ 816241A +SafariZone_Building3_MapScripts:: @ 816241A .byte 0 SafariZone_Building3_EventScript_16241B:: @ 816241B @@ -1065,7 +1065,7 @@ SafariZone_Building3_EventScript_162424:: @ 8162424 SafariZone_Building3_EventScript_16242D:: @ 816242D .incbin "baserom.gba", 0x16242D, 0x9 -gMapScripts_SafariZone_Building4:: @ 8162436 +SafariZone_Building4_MapScripts:: @ 8162436 .byte 0 SafariZone_Building4_EventScript_162437:: @ 8162437 @@ -1077,23 +1077,23 @@ SafariZone_Building4_EventScript_162440:: @ 8162440 SafariZone_Building4_EventScript_162449:: @ 8162449 .incbin "baserom.gba", 0x162449, 0x9 -gMapScripts_SafariZone_SecretHouse:: @ 8162452 +SafariZone_SecretHouse_MapScripts:: @ 8162452 .byte 0 SafariZone_SecretHouse_EventScript_162453:: @ 8162453 .incbin "baserom.gba", 0x162453, 0x60 -gMapScripts_CeruleanCave_1F:: @ 81624B3 +CeruleanCave_1F_MapScripts:: @ 81624B3 map_script 3, CeruleanCave_1F_MapScript1_1624B9 .byte 0 CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9 .incbin "baserom.gba", 0x1624B9, 0x4 -gMapScripts_CeruleanCave_2F:: @ 81624BD +CeruleanCave_2F_MapScripts:: @ 81624BD .byte 0 -gMapScripts_CeruleanCave_B1F:: @ 81624BE +CeruleanCave_B1F_MapScripts:: @ 81624BE map_script 5, CeruleanCave_B1F_MapScript1_1624C9 map_script 3, CeruleanCave_B1F_MapScript2_1624E7 .byte 0 @@ -1107,7 +1107,7 @@ CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 .incbin "baserom.gba", 0x1624F5, 0x77 -gMapScripts_PokemonLeague_LoreleisRoom:: @ 816256C +PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586 map_script 1, PokemonLeague_LoreleisRoom_MapScript2_162591 map_script 3, PokemonLeague_LoreleisRoom_MapScript3_1625B2 @@ -1133,7 +1133,7 @@ PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5 PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC .incbin "baserom.gba", 0x1625DC, 0xA9 -gMapScripts_PokemonLeague_BrunosRoom:: @ 8162685 +PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 map_script 5, PokemonLeague_BrunosRoom_MapScript1_16269A map_script 1, PokemonLeague_BrunosRoom_MapScript2_1626A5 map_script 4, PokemonLeague_BrunosRoom_MapScript3_1626C6 @@ -1155,7 +1155,7 @@ PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC .incbin "baserom.gba", 0x1626EC, 0x124 -gMapScripts_PokemonLeague_AgathasRoom:: @ 8162810 +PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825 map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830 map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851 @@ -1177,7 +1177,7 @@ PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 .incbin "baserom.gba", 0x162877, 0xB6 -gMapScripts_PokemonLeague_LancesRoom:: @ 816292D +PokemonLeague_LancesRoom_MapScripts:: @ 816292D map_script 5, PokemonLeague_LancesRoom_MapScript1_162942 map_script 1, PokemonLeague_LancesRoom_MapScript2_16294D map_script 4, PokemonLeague_LancesRoom_MapScript3_16296E @@ -1199,7 +1199,7 @@ PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 .incbin "baserom.gba", 0x162A14, 0xCE -gMapScripts_PokemonLeague_ChampionsRoom:: @ 8162AE2 +PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2 map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C @@ -1214,7 +1214,7 @@ PokemonLeague_ChampionsRoom_MapScript1_162B5D:: @ 8162B5D PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C .incbin "baserom.gba", 0x162B6C, 0x1E0 -gMapScripts_PokemonLeague_HallOfFame:: @ 8162D4C +PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C map_script 2, PokemonLeague_HallOfFame_MapScript1_162D66 map_script 4, PokemonLeague_HallOfFame_MapScript2_162D57 .byte 0 @@ -1225,7 +1225,7 @@ PokemonLeague_HallOfFame_MapScript2_162D57:: @ 8162D57 PokemonLeague_HallOfFame_MapScript1_162D66:: @ 8162D66 .incbin "baserom.gba", 0x162D66, 0x70 -gMapScripts_RockTunnel_1F:: @ 8162DD6 +RockTunnel_1F_MapScripts:: @ 8162DD6 map_script 3, RockTunnel_1F_MapScript1_162DDC .byte 0 @@ -1256,7 +1256,7 @@ RockTunnel_1F_EventScript_162E5C:: @ 8162E5C RockTunnel_1F_EventScript_162E73:: @ 8162E73 .incbin "baserom.gba", 0x162E73, 0x17 -gMapScripts_RockTunnel_B1F:: @ 8162E8A +RockTunnel_B1F_MapScripts:: @ 8162E8A .byte 0 RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B @@ -1283,20 +1283,20 @@ RockTunnel_B1F_EventScript_162F15:: @ 8162F15 RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C .incbin "baserom.gba", 0x162F2C, 0x17 -gMapScripts_SeafoamIslands_1F:: @ 8162F43 +SeafoamIslands_1F_MapScripts:: @ 8162F43 map_script 3, SeafoamIslands_1F_MapScript1_162F49 .byte 0 SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49 .incbin "baserom.gba", 0x162F49, 0x4 -gMapScripts_SeafoamIslands_B1F:: @ 8162F4D +SeafoamIslands_B1F_MapScripts:: @ 8162F4D .byte 0 -gMapScripts_SeafoamIslands_B2F:: @ 8162F4E +SeafoamIslands_B2F_MapScripts:: @ 8162F4E .byte 0 -gMapScripts_SeafoamIslands_B3F:: @ 8162F4F +SeafoamIslands_B3F_MapScripts:: @ 8162F4F map_script 3, SeafoamIslands_B3F_MapScript1_162F5A map_script 2, SeafoamIslands_B3F_MapScript2_162F98 .byte 0 @@ -1307,7 +1307,7 @@ SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 .incbin "baserom.gba", 0x162F98, 0x96 -gMapScripts_SeafoamIslands_B4F:: @ 816302E +SeafoamIslands_B4F_MapScripts:: @ 816302E map_script 3, SeafoamIslands_B4F_MapScript1_163066 map_script 5, SeafoamIslands_B4F_MapScript2_163048 map_script 1, SeafoamIslands_B4F_MapScript3_1630B1 @@ -1342,7 +1342,7 @@ SeafoamIslands_B4F_EventScript_163223:: @ 8163223 SeafoamIslands_B4F_EventScript_16322C:: @ 816322C .incbin "baserom.gba", 0x16322C, 0x9 -gMapScripts_PokemonTower_1F:: @ 8163235 +PokemonTower_1F_MapScripts:: @ 8163235 map_script 3, PokemonTower_1F_MapScript1_16323B .byte 0 @@ -1364,7 +1364,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A PokemonTower_1F_EventScript_16327C:: @ 816327C .incbin "baserom.gba", 0x16327C, 0x9 -gMapScripts_PokemonTower_2F:: @ 8163285 +PokemonTower_2F_MapScripts:: @ 8163285 .byte 0 PokemonTower_2F_EventScript_163286:: @ 8163286 @@ -1376,7 +1376,7 @@ PokemonTower_2F_EventScript_16328F:: @ 816328F PokemonTower_2F_EventScript_16329B:: @ 816329B .incbin "baserom.gba", 0x16329B, 0x10B -gMapScripts_PokemonTower_3F:: @ 81633A6 +PokemonTower_3F_MapScripts:: @ 81633A6 .byte 0 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 @@ -1388,7 +1388,7 @@ PokemonTower_3F_EventScript_1633BE:: @ 81633BE PokemonTower_3F_EventScript_1633D5:: @ 81633D5 .incbin "baserom.gba", 0x1633D5, 0x17 -gMapScripts_PokemonTower_4F:: @ 81633EC +PokemonTower_4F_MapScripts:: @ 81633EC .byte 0 PokemonTower_4F_EventScript_1633ED:: @ 81633ED @@ -1400,7 +1400,7 @@ PokemonTower_4F_EventScript_163404:: @ 8163404 PokemonTower_4F_EventScript_16341B:: @ 816341B .incbin "baserom.gba", 0x16341B, 0x17 -gMapScripts_PokemonTower_5F:: @ 8163432 +PokemonTower_5F_MapScripts:: @ 8163432 .byte 0 PokemonTower_5F_EventScript_163433:: @ 8163433 @@ -1424,7 +1424,7 @@ PokemonTower_5F_EventScript_163489:: @ 8163489 PokemonTower_5F_EventScript_1634A0:: @ 81634A0 .incbin "baserom.gba", 0x1634A0, 0x17 -gMapScripts_PokemonTower_6F:: @ 81634B7 +PokemonTower_6F_MapScripts:: @ 81634B7 .byte 0 PokemonTower_6F_EventScript_1634B8:: @ 81634B8 @@ -1439,7 +1439,7 @@ PokemonTower_6F_EventScript_16352B:: @ 816352B PokemonTower_6F_EventScript_163542:: @ 8163542 .incbin "baserom.gba", 0x163542, 0x17 -gMapScripts_PokemonTower_7F:: @ 8163559 +PokemonTower_7F_MapScripts:: @ 8163559 .byte 0 PokemonTower_7F_EventScript_16355A:: @ 816355A @@ -1454,7 +1454,7 @@ PokemonTower_7F_EventScript_16363D:: @ 816363D PokemonTower_7F_EventScript_1636D6:: @ 81636D6 .incbin "baserom.gba", 0x1636D6, 0x8E -gMapScripts_PowerPlant:: @ 8163764 +PowerPlant_MapScripts:: @ 8163764 map_script 5, PowerPlant_MapScript1_16376F map_script 3, PowerPlant_MapScript2_16378D .byte 0 @@ -1474,7 +1474,7 @@ PowerPlant_EventScript_16382F:: @ 816382F PowerPlant_EventScript_16388D:: @ 816388D .incbin "baserom.gba", 0x16388D, 0x5E -gMapScripts_MtEmber_RubyPath_B4F:: @ 81638EB +MtEmber_RubyPath_B4F_MapScripts:: @ 81638EB .byte 0 MtEmber_RubyPath_B4F_EventScript_1638EC:: @ 81638EC @@ -1507,7 +1507,7 @@ MtEmber_RubyPath_B4F_EventScript_163934:: @ 8163934 MtEmber_RubyPath_B4F_EventScript_16393D:: @ 816393D .incbin "baserom.gba", 0x16393D, 0x9 -gMapScripts_MtEmber_Exterior:: @ 8163946 +MtEmber_Exterior_MapScripts:: @ 8163946 map_script 3, MtEmber_Exterior_MapScript1_163951 map_script 1, MtEmber_Exterior_MapScript2_163969 .byte 0 @@ -1536,16 +1536,16 @@ MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 .incbin "baserom.gba", 0x163AE2, 0x17 -gMapScripts_MtEmber_SummitPath_1F:: @ 8163AF9 +MtEmber_SummitPath_1F_MapScripts:: @ 8163AF9 .byte 0 -gMapScripts_MtEmber_SummitPath_2F:: @ 8163AFA +MtEmber_SummitPath_2F_MapScripts:: @ 8163AFA .byte 0 -gMapScripts_MtEmber_SummitPath_3F:: @ 8163AFB +MtEmber_SummitPath_3F_MapScripts:: @ 8163AFB .byte 0 -gMapScripts_MtEmber_Summit:: @ 8163AFC +MtEmber_Summit_MapScripts:: @ 8163AFC map_script 3, MtEmber_Summit_MapScript1_163B25 map_script 5, MtEmber_Summit_MapScript2_163B07 .byte 0 @@ -1559,35 +1559,35 @@ MtEmber_Summit_MapScript1_163B25:: @ 8163B25 MtEmber_Summit_EventScript_163B33:: @ 8163B33 .incbin "baserom.gba", 0x163B33, 0x77 -gMapScripts_MtEmber_RubyPath_B5F:: @ 8163BAA +MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA .byte 0 MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB .incbin "baserom.gba", 0x163BAB, 0x9A -gMapScripts_SSAnne_Kitchen3:: @ 8163C45 +SSAnne_Kitchen3_MapScripts:: @ 8163C45 .byte 0 -gMapScripts_MtEmber_RubyPath_B1F:: @ 8163C46 +MtEmber_RubyPath_B1F_MapScripts:: @ 8163C46 .byte 0 -gMapScripts_MtEmber_RubyPath_B2F:: @ 8163C47 +MtEmber_RubyPath_B2F_MapScripts:: @ 8163C47 .byte 0 -gMapScripts_MtEmber_RubyPath_B3F:: @ 8163C48 +MtEmber_RubyPath_B3F_MapScripts:: @ 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 +MtEmber_RubyPath_B1F_Stairs_MapScripts:: @ 8163C6F .byte 0 -gMapScripts_MtEmber_RubyPath_B2F_Stairs:: @ 8163C70 +MtEmber_RubyPath_B2F_Stairs_MapScripts:: @ 8163C70 .byte 0 -gMapScripts_ThreeIsland_BerryForest:: @ 8163C71 +ThreeIsland_BerryForest_MapScripts:: @ 8163C71 map_script 3, ThreeIsland_BerryForest_MapScript1_163C77 .byte 0 @@ -1603,14 +1603,14 @@ ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 .incbin "baserom.gba", 0x163D31, 0x9 -gMapScripts_FourIsland_IcefallCave_Entrance:: @ 8163D3A +FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A map_script 3, FourIsland_IcefallCave_Entrance_MapScript1_163D40 .byte 0 FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40 .incbin "baserom.gba", 0x163D40, 0x4 -gMapScripts_FourIsland_IcefallCave_1F:: @ 8163D44 +FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 map_script 5, FourIsland_IcefallCave_1F_MapScript1_163D54 map_script 1, FourIsland_IcefallCave_1F_MapScript2_163D57 map_script 2, FourIsland_IcefallCave_1F_MapScript3_163D5B @@ -1625,10 +1625,10 @@ FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57 FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B .incbin "baserom.gba", 0x163D5B, 0x26 -gMapScripts_SSAnne_CaptainsOffice2:: @ 8163D81 +SSAnne_CaptainsOffice2_MapScripts:: @ 8163D81 .byte 0 -gMapScripts_SSAnne_CaptainsOffice3:: @ 8163D82 +SSAnne_CaptainsOffice3_MapScripts:: @ 8163D82 map_script 3, SSAnne_CaptainsOffice3_MapScript1_163D88 .byte 0 @@ -1641,7 +1641,7 @@ SSAnne_CaptainsOffice3_EventScript_163D98:: @ 8163D98 SSAnne_CaptainsOffice3_EventScript_163F25:: @ 8163F25 .incbin "baserom.gba", 0x163F25, 0x9 -gMapScripts_SSAnne_CaptainsOffice4:: @ 8163F2E +SSAnne_CaptainsOffice4_MapScripts:: @ 8163F2E map_script 1, SSAnne_CaptainsOffice4_MapScript1_163F3D map_script 3, SSAnne_CaptainsOffice4_MapScript2_163F39 .byte 0 @@ -1679,7 +1679,7 @@ SSAnne_CaptainsOffice4_EventScript_164070:: @ 8164070 SSAnne_CaptainsOffice4_EventScript_164087:: @ 8164087 .incbin "baserom.gba", 0x164087, 0xFB -gMapScripts_SSAnne_CaptainsOffice5:: @ 8164182 +SSAnne_CaptainsOffice5_MapScripts:: @ 8164182 map_script 3, SSAnne_CaptainsOffice5_MapScript1_164188 .byte 0 @@ -1698,19 +1698,19 @@ SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 .incbin "baserom.gba", 0x1641A7, 0x9 -gMapScripts_SixIsland_DottedHole_B1F:: @ 81641B0 +SixIsland_DottedHole_B1F_MapScripts:: @ 81641B0 .byte 0 -gMapScripts_SixIsland_DottedHole_B2F:: @ 81641B1 +SixIsland_DottedHole_B2F_MapScripts:: @ 81641B1 .byte 0 -gMapScripts_SixIsland_DottedHole_B3F:: @ 81641B2 +SixIsland_DottedHole_B3F_MapScripts:: @ 81641B2 .byte 0 -gMapScripts_SSAnne_CaptainsOffice9:: @ 81641B3 +SSAnne_CaptainsOffice9_MapScripts:: @ 81641B3 .byte 0 -gMapScripts_SixIsland_DottedHole_SapphireRoom:: @ 81641B4 +SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4 .byte 0 SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 @@ -1719,7 +1719,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F .incbin "baserom.gba", 0x16441F, 0x13A -gMapScripts_SSAnne_1F_Room11:: @ 8164559 +SSAnne_1F_Room11_MapScripts:: @ 8164559 map_script 3, SSAnne_1F_Room11_MapScript1_16455F .byte 0 @@ -1762,21 +1762,21 @@ SSAnne_1F_Room11_EventScript_164676:: @ 8164676 SSAnne_1F_Room11_EventScript_16468D:: @ 816468D .incbin "baserom.gba", 0x16468D, 0x17 -gMapScripts_SSAnne_1F_Room12:: @ 81646A4 +SSAnne_1F_Room12_MapScripts:: @ 81646A4 map_script 3, SSAnne_1F_Room12_MapScript1_1646AA .byte 0 SSAnne_1F_Room12_MapScript1_1646AA:: @ 81646AA .incbin "baserom.gba", 0x1646AA, 0x4 -gMapScripts_NavelRock_Exterior:: @ 81646AE +NavelRock_Exterior_MapScripts:: @ 81646AE map_script 3, NavelRock_Exterior_MapScript1_1646B4 .byte 0 NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4 .incbin "baserom.gba", 0x1646B4, 0x4 -gMapScripts_SevenIsland_TrainerTower_1F:: @ 81646B8 +SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 map_script 5, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 map_script 3, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 map_script 2, SevenIsland_TrainerTower_1F_MapScript3_1C5046 @@ -1832,7 +1832,7 @@ SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0 SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0 .incbin "baserom.gba", 0x1646E0, 0x6 -gMapScripts_SevenIsland_TrainerTower_2F:: @ 81646E6 +SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 map_script 5, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 map_script 3, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 map_script 2, SevenIsland_TrainerTower_2F_MapScript3_1C5046 @@ -1841,7 +1841,7 @@ gMapScripts_SevenIsland_TrainerTower_2F:: @ 81646E6 SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 .incbin "baserom.gba", 0x1646F6, 0x1E -gMapScripts_SevenIsland_TrainerTower_3F:: @ 8164714 +SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 map_script 5, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 map_script 3, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 map_script 2, SevenIsland_TrainerTower_3F_MapScript3_1C5046 @@ -1850,7 +1850,7 @@ gMapScripts_SevenIsland_TrainerTower_3F:: @ 8164714 SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 .incbin "baserom.gba", 0x164724, 0x1E -gMapScripts_SevenIsland_TrainerTower_4F:: @ 8164742 +SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 map_script 5, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 map_script 3, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 map_script 2, SevenIsland_TrainerTower_4F_MapScript3_1C5046 @@ -1859,7 +1859,7 @@ gMapScripts_SevenIsland_TrainerTower_4F:: @ 8164742 SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 .incbin "baserom.gba", 0x164752, 0x1E -gMapScripts_SevenIsland_TrainerTower_5F:: @ 8164770 +SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 map_script 5, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 map_script 3, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 map_script 2, SevenIsland_TrainerTower_5F_MapScript3_1C5046 @@ -1868,7 +1868,7 @@ gMapScripts_SevenIsland_TrainerTower_5F:: @ 8164770 SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 .incbin "baserom.gba", 0x164780, 0x1E -gMapScripts_SevenIsland_TrainerTower_6F:: @ 816479E +SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E map_script 5, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 map_script 3, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 map_script 2, SevenIsland_TrainerTower_6F_MapScript3_1C5046 @@ -1877,7 +1877,7 @@ gMapScripts_SevenIsland_TrainerTower_6F:: @ 816479E SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE .incbin "baserom.gba", 0x1647AE, 0x1E -gMapScripts_SevenIsland_TrainerTower_7F:: @ 81647CC +SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC map_script 5, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 map_script 3, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 map_script 2, SevenIsland_TrainerTower_7F_MapScript3_1C5046 @@ -1886,7 +1886,7 @@ gMapScripts_SevenIsland_TrainerTower_7F:: @ 81647CC SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC .incbin "baserom.gba", 0x1647DC, 0x1E -gMapScripts_SevenIsland_TrainerTower_8F:: @ 81647FA +SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA map_script 5, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 map_script 3, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 map_script 2, SevenIsland_TrainerTower_8F_MapScript3_1C5046 @@ -1895,7 +1895,7 @@ gMapScripts_SevenIsland_TrainerTower_8F:: @ 81647FA SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A .incbin "baserom.gba", 0x16480A, 0x1E -gMapScripts_SevenIsland_TrainerTower_Roof:: @ 8164828 +SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 map_script 5, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 map_script 2, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 .byte 0 @@ -1903,7 +1903,7 @@ gMapScripts_SevenIsland_TrainerTower_Roof:: @ 8164828 SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 .incbin "baserom.gba", 0x164833, 0x6 -gMapScripts_SevenIsland_TrainerTower_Lobby:: @ 8164839 +SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 map_script 5, SevenIsland_TrainerTower_Lobby_MapScript1_164853 map_script 7, SevenIsland_TrainerTower_Lobby_MapScript2_164887 map_script 3, SevenIsland_TrainerTower_Lobby_MapScript3_1648AD @@ -1947,7 +1947,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF .incbin "baserom.gba", 0x164AEF, 0x9 -gMapScripts_SevenIsland_TrainerTower_Elevator:: @ 8164AF8 +SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 map_script 5, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 map_script 2, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 .byte 0 @@ -1955,47 +1955,47 @@ gMapScripts_SevenIsland_TrainerTower_Elevator:: @ 8164AF8 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 .incbin "baserom.gba", 0x164B03, 0xE9 -gMapScripts_FiveIsland_LostCave_Entrance:: @ 8164BEC +FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2 .byte 0 FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2 .incbin "baserom.gba", 0x164BF2, 0x4 -gMapScripts_FiveIsland_LostCave_Room1:: @ 8164BF6 +FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 .byte 0 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 .incbin "baserom.gba", 0x164BF7, 0x17 -gMapScripts_FiveIsland_LostCave_Room2:: @ 8164C0E +FiveIsland_LostCave_Room2_MapScripts:: @ 8164C0E .byte 0 -gMapScripts_FiveIsland_LostCave_Room3:: @ 8164C0F +FiveIsland_LostCave_Room3_MapScripts:: @ 8164C0F .byte 0 -gMapScripts_FiveIsland_LostCave_Room4:: @ 8164C10 +FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 .byte 0 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 .incbin "baserom.gba", 0x164C11, 0x17 -gMapScripts_FiveIsland_LostCave_Room5:: @ 8164C28 +FiveIsland_LostCave_Room5_MapScripts:: @ 8164C28 .byte 0 -gMapScripts_FiveIsland_LostCave_Room6:: @ 8164C29 +FiveIsland_LostCave_Room6_MapScripts:: @ 8164C29 .byte 0 -gMapScripts_FiveIsland_LostCave_Room7:: @ 8164C2A +FiveIsland_LostCave_Room7_MapScripts:: @ 8164C2A .byte 0 -gMapScripts_FiveIsland_LostCave_Room8:: @ 8164C2B +FiveIsland_LostCave_Room8_MapScripts:: @ 8164C2B .byte 0 -gMapScripts_FiveIsland_LostCave_Room9:: @ 8164C2C +FiveIsland_LostCave_Room9_MapScripts:: @ 8164C2C .byte 0 -gMapScripts_FiveIsland_LostCave_Room10:: @ 8164C2D +FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38 map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48 .byte 0 @@ -2006,68 +2006,68 @@ FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48 .incbin "baserom.gba", 0x164C48, 0x83 -gMapScripts_FiveIsland_LostCave_Room11:: @ 8164CCB +FiveIsland_LostCave_Room11_MapScripts:: @ 8164CCB .byte 0 -gMapScripts_FiveIsland_LostCave_Room12:: @ 8164CCC +FiveIsland_LostCave_Room12_MapScripts:: @ 8164CCC .byte 0 -gMapScripts_FiveIsland_LostCave_Room13:: @ 8164CCD +FiveIsland_LostCave_Room13_MapScripts:: @ 8164CCD .byte 0 -gMapScripts_FiveIsland_LostCave_Room14:: @ 8164CCE +FiveIsland_LostCave_Room14_MapScripts:: @ 8164CCE .byte 0 -gMapScripts_SevenIsland_TanobyRuins_MoneanChamber:: @ 8164CCF +SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF map_script 3, SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5 .byte 0 SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5 .incbin "baserom.gba", 0x164CD5, 0x9 -gMapScripts_SevenIsland_TanobyRuins_LiptooChamber:: @ 8164CDE +SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE map_script 3, SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4 .byte 0 SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4:: @ 8164CE4 .incbin "baserom.gba", 0x164CE4, 0x6 -gMapScripts_SevenIsland_TanobyRuins_WeepthChamber:: @ 8164CEA +SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA map_script 3, SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0 .byte 0 SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0:: @ 8164CF0 .incbin "baserom.gba", 0x164CF0, 0x6 -gMapScripts_SevenIsland_TanobyRuins_DilfordChamber:: @ 8164CF6 +SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 map_script 3, SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC .byte 0 SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC:: @ 8164CFC .incbin "baserom.gba", 0x164CFC, 0x6 -gMapScripts_SevenIsland_TanobyRuins_ScufibChamber:: @ 8164D02 +SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 map_script 3, SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08 .byte 0 SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08:: @ 8164D08 .incbin "baserom.gba", 0x164D08, 0x6 -gMapScripts_SevenIsland_TanobyRuins_RixyChamber:: @ 8164D0E +SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E map_script 3, SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14 .byte 0 SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14:: @ 8164D14 .incbin "baserom.gba", 0x164D14, 0x6 -gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber:: @ 8164D1A +SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A map_script 3, SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20 .byte 0 SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20:: @ 8164D20 .incbin "baserom.gba", 0x164D20, 0x6 -gMapScripts_ThreeIsland_DunsparceTunnel:: @ 8164D26 +ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 map_script 3, ThreeIsland_DunsparceTunnel_MapScript1_164D2C .byte 0 @@ -2077,7 +2077,7 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 .incbin "baserom.gba", 0x164D60, 0x6C -gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey:: @ 8164DCC +SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2 .byte 0 @@ -2105,10 +2105,10 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B .incbin "baserom.gba", 0x164F0B, 0x93 -gMapScripts_NavelRock_1F:: @ 8164F9E +NavelRock_1F_MapScripts:: @ 8164F9E .byte 0 -gMapScripts_NavelRock_Summit:: @ 8164F9F +NavelRock_Summit_MapScripts:: @ 8164F9F map_script 3, NavelRock_Summit_MapScript1_164FAA map_script 5, NavelRock_Summit_MapScript2_164FDD .byte 0 @@ -2122,7 +2122,7 @@ NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD NavelRock_Summit_EventScript_164FFB:: @ 8164FFB .incbin "baserom.gba", 0x164FFB, 0xEC -gMapScripts_NavelRock_Base:: @ 81650E7 +NavelRock_Base_MapScripts:: @ 81650E7 map_script 3, NavelRock_Base_MapScript1_1650F2 map_script 5, NavelRock_Base_MapScript2_165116 .byte 0 @@ -2136,58 +2136,58 @@ NavelRock_Base_MapScript2_165116:: @ 8165116 NavelRock_Base_EventScript_165134:: @ 8165134 .incbin "baserom.gba", 0x165134, 0xBE -gMapScripts_NavelRock_SummitPath_2F:: @ 81651F2 +NavelRock_SummitPath_2F_MapScripts:: @ 81651F2 .byte 0 -gMapScripts_NavelRock_SummitPath_3F:: @ 81651F3 +NavelRock_SummitPath_3F_MapScripts:: @ 81651F3 .byte 0 -gMapScripts_NavelRock_SummitPath_4F:: @ 81651F4 +NavelRock_SummitPath_4F_MapScripts:: @ 81651F4 .byte 0 -gMapScripts_NavelRock_SummitPath_5F:: @ 81651F5 +NavelRock_SummitPath_5F_MapScripts:: @ 81651F5 .byte 0 -gMapScripts_NavelRock_BasePath_B1F:: @ 81651F6 +NavelRock_BasePath_B1F_MapScripts:: @ 81651F6 .byte 0 -gMapScripts_NavelRock_BasePath_B2F:: @ 81651F7 +NavelRock_BasePath_B2F_MapScripts:: @ 81651F7 .byte 0 -gMapScripts_NavelRock_BasePath_B3F:: @ 81651F8 +NavelRock_BasePath_B3F_MapScripts:: @ 81651F8 .byte 0 -gMapScripts_NavelRock_BasePath_B4F:: @ 81651F9 +NavelRock_BasePath_B4F_MapScripts:: @ 81651F9 .byte 0 -gMapScripts_NavelRock_BasePath_B5F:: @ 81651FA +NavelRock_BasePath_B5F_MapScripts:: @ 81651FA .byte 0 -gMapScripts_NavelRock_BasePath_B6F:: @ 81651FB +NavelRock_BasePath_B6F_MapScripts:: @ 81651FB .byte 0 -gMapScripts_NavelRock_BasePath_B7F:: @ 81651FC +NavelRock_BasePath_B7F_MapScripts:: @ 81651FC .byte 0 -gMapScripts_NavelRock_BasePath_B8F:: @ 81651FD +NavelRock_BasePath_B8F_MapScripts:: @ 81651FD .byte 0 -gMapScripts_NavelRock_BasePath_B9F:: @ 81651FE +NavelRock_BasePath_B9F_MapScripts:: @ 81651FE .byte 0 -gMapScripts_NavelRock_BasePath_B10F:: @ 81651FF +NavelRock_BasePath_B10F_MapScripts:: @ 81651FF .byte 0 -gMapScripts_NavelRock_BasePath_B11F:: @ 8165200 +NavelRock_BasePath_B11F_MapScripts:: @ 8165200 .byte 0 -gMapScripts_NavelRock_B1F:: @ 8165201 +NavelRock_B1F_MapScripts:: @ 8165201 .byte 0 -gMapScripts_NavelRock_Fork:: @ 8165202 +NavelRock_Fork_MapScripts:: @ 8165202 .byte 0 -gMapScripts_BirthIsland_Exterior:: @ 8165203 +BirthIsland_Exterior_MapScripts:: @ 8165203 map_script 3, BirthIsland_Exterior_MapScript1_165217 map_script 5, BirthIsland_Exterior_MapScript2_165253 map_script 7, BirthIsland_Exterior_MapScript3_165213 @@ -2205,7 +2205,7 @@ BirthIsland_Exterior_MapScript2_165253:: @ 8165253 BirthIsland_Exterior_EventScript_165271:: @ 8165271 .incbin "baserom.gba", 0x165271, 0xEA -gMapScripts_OneIsland_KindleRoad_EmberSpa:: @ 816535B +OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B .byte 0 OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C @@ -2229,19 +2229,19 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF .incbin "baserom.gba", 0x1653CF, 0x17 -gMapScripts_BirthIsland_Harbor:: @ 81653E6 +BirthIsland_Harbor_MapScripts:: @ 81653E6 .byte 0 BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 .incbin "baserom.gba", 0x1653E7, 0x39 -gMapScripts_NavelRock_Harbor:: @ 8165420 +NavelRock_Harbor_MapScripts:: @ 8165420 .byte 0 NavelRock_Harbor_EventScript_165421:: @ 8165421 .incbin "baserom.gba", 0x165421, 0x39 -gMapScripts_PalletTown:: @ 816545A +PalletTown_MapScripts:: @ 816545A map_script 3, PalletTown_MapScript1_165465 map_script 2, PalletTown_MapScript2_1654CE .byte 0 @@ -2282,7 +2282,7 @@ PalletTown_EventScript_16586B:: @ 816586B PalletTown_EventScript_16587B:: @ 816587B .incbin "baserom.gba", 0x16587B, 0x58 -gMapScripts_ViridianCity:: @ 81658D3 +ViridianCity_MapScripts:: @ 81658D3 map_script 3, ViridianCity_MapScript1_1658D9 .byte 0 @@ -2334,7 +2334,7 @@ ViridianCity_EventScript_165B10:: @ 8165B10 ViridianCity_EventScript_165B2E:: @ 8165B2E .incbin "baserom.gba", 0x165B2E, 0x60 -gMapScripts_PewterCity:: @ 8165B8E +PewterCity_MapScripts:: @ 8165B8E map_script 3, PewterCity_MapScript1_165B94 .byte 0 @@ -2395,7 +2395,7 @@ PewterCity_EventScript_1662C4:: @ 81662C4 PewterCity_EventScript_1662D1:: @ 81662D1 .incbin "baserom.gba", 0x1662D1, 0x1A0 -gMapScripts_CeruleanCity:: @ 8166471 +CeruleanCity_MapScripts:: @ 8166471 map_script 3, CeruleanCity_MapScript1_166477 .byte 0 @@ -2456,7 +2456,7 @@ CeruleanCity_EventScript_16684A:: @ 816684A CeruleanCity_EventScript_166853:: @ 8166853 .incbin "baserom.gba", 0x166853, 0x18 -gMapScripts_LavenderTown:: @ 816686B +LavenderTown_MapScripts:: @ 816686B map_script 3, LavenderTown_MapScript1_166871 .byte 0 @@ -2484,7 +2484,7 @@ LavenderTown_EventScript_1668CA:: @ 81668CA LavenderTown_EventScript_1668D3:: @ 81668D3 .incbin "baserom.gba", 0x1668D3, 0x9 -gMapScripts_VermilionCity:: @ 81668DC +VermilionCity_MapScripts:: @ 81668DC map_script 3, VermilionCity_MapScript1_166906 map_script 2, VermilionCity_MapScript2_1668E7 .byte 0 @@ -2540,7 +2540,7 @@ VermilionCity_EventScript_166C6E:: @ 8166C6E VermilionCity_EventScript_166C86:: @ 8166C86 .incbin "baserom.gba", 0x166C86, 0x9 -gMapScripts_CeladonCity:: @ 8166C8F +CeladonCity_MapScripts:: @ 8166C8F map_script 3, CeladonCity_MapScript1_166C95 .byte 0 @@ -2604,7 +2604,7 @@ CeladonCity_EventScript_166D63:: @ 8166D63 CeladonCity_EventScript_166D6C:: @ 8166D6C .incbin "baserom.gba", 0x166D6C, 0x9 -gMapScripts_FuchsiaCity:: @ 8166D75 +FuchsiaCity_MapScripts:: @ 8166D75 map_script 3, FuchsiaCity_MapScript1_166D7B .byte 0 @@ -2659,7 +2659,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 FuchsiaCity_EventScript_166E9C:: @ 8166E9C .incbin "baserom.gba", 0x166E9C, 0x3A -gMapScripts_CinnabarIsland:: @ 8166ED6 +CinnabarIsland_MapScripts:: @ 8166ED6 map_script 3, CinnabarIsland_MapScript1_166EE1 map_script 2, CinnabarIsland_MapScript2_166F6E .byte 0 @@ -2688,7 +2688,7 @@ CinnabarIsland_EventScript_16721A:: @ 816721A CinnabarIsland_EventScript_167223:: @ 8167223 .incbin "baserom.gba", 0x167223, 0x18 -gMapScripts_IndigoPlateau_Exterior:: @ 816723B +IndigoPlateau_Exterior_MapScripts:: @ 816723B map_script 3, IndigoPlateau_Exterior_MapScript1_167246 map_script 2, IndigoPlateau_Exterior_MapScript2_16725A .byte 0 @@ -2699,7 +2699,7 @@ IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A .incbin "baserom.gba", 0x16725A, 0x105 -gMapScripts_SaffronCity_Duplicate:: @ 816735F +SaffronCity_Duplicate_MapScripts:: @ 816735F map_script 3, SaffronCity_Duplicate_MapScript1_167365 .byte 0 @@ -2775,10 +2775,10 @@ SaffronCity_Duplicate_EventScript_167471:: @ 8167471 SaffronCity_Duplicate_EventScript_16747A:: @ 816747A .incbin "baserom.gba", 0x16747A, 0x9 -gMapScripts_SaffronCity:: @ 8167483 +SaffronCity_MapScripts:: @ 8167483 .byte 0 -gMapScripts_OneIsland:: @ 8167484 +OneIsland_MapScripts:: @ 8167484 map_script 3, OneIsland_MapScript1_16748F map_script 2, OneIsland_MapScript2_167493 .byte 0 @@ -2801,7 +2801,7 @@ OneIsland_EventScript_167552:: @ 8167552 OneIsland_EventScript_16755B:: @ 816755B .incbin "baserom.gba", 0x16755B, 0x9 -gMapScripts_TwoIsland:: @ 8167564 +TwoIsland_MapScripts:: @ 8167564 map_script 3, TwoIsland_MapScript1_16756A .byte 0 @@ -2838,7 +2838,7 @@ TwoIsland_EventScript_16779B:: @ 816779B TwoIsland_EventScript_1677A4:: @ 81677A4 .incbin "baserom.gba", 0x1677A4, 0x9 -gMapScripts_ThreeIsland:: @ 81677AD +ThreeIsland_MapScripts:: @ 81677AD map_script 3, ThreeIsland_MapScript1_1677B3 .byte 0 @@ -2887,7 +2887,7 @@ ThreeIsland_EventScript_167C9C:: @ 8167C9C ThreeIsland_EventScript_167CA5:: @ 8167CA5 .incbin "baserom.gba", 0x167CA5, 0x9 -gMapScripts_FourIsland:: @ 8167CAE +FourIsland_MapScripts:: @ 8167CAE map_script 3, FourIsland_MapScript1_167CB9 map_script 2, FourIsland_MapScript2_167CE2 .byte 0 @@ -2916,7 +2916,7 @@ FourIsland_EventScript_167E7C:: @ 8167E7C FourIsland_EventScript_167E85:: @ 8167E85 .incbin "baserom.gba", 0x167E85, 0x9 -gMapScripts_FiveIsland:: @ 8167E8E +FiveIsland_MapScripts:: @ 8167E8E map_script 3, FiveIsland_MapScript1_167E94 .byte 0 @@ -2932,7 +2932,7 @@ FiveIsland_EventScript_167EA1:: @ 8167EA1 FiveIsland_EventScript_167EAA:: @ 8167EAA .incbin "baserom.gba", 0x167EAA, 0x9 -gMapScripts_SevenIsland:: @ 8167EB3 +SevenIsland_MapScripts:: @ 8167EB3 map_script 3, SevenIsland_MapScript1_167EB9 .byte 0 @@ -2948,7 +2948,7 @@ SevenIsland_EventScript_167EC6:: @ 8167EC6 SevenIsland_EventScript_167ECF:: @ 8167ECF .incbin "baserom.gba", 0x167ECF, 0x9 -gMapScripts_SixIsland:: @ 8167ED8 +SixIsland_MapScripts:: @ 8167ED8 map_script 3, SixIsland_MapScript1_167EDE .byte 0 @@ -2964,7 +2964,7 @@ SixIsland_EventScript_167EEB:: @ 8167EEB SixIsland_EventScript_167EF4:: @ 8167EF4 .incbin "baserom.gba", 0x167EF4, 0x9 -gMapScripts_Route1:: @ 8167EFD +Route1_MapScripts:: @ 8167EFD .byte 0 Route1_EventScript_167EFE:: @ 8167EFE @@ -2976,7 +2976,7 @@ Route1_EventScript_167F52:: @ 8167F52 Route1_EventScript_167F5B:: @ 8167F5B .incbin "baserom.gba", 0x167F5B, 0x9 -gMapScripts_Route2:: @ 8167F64 +Route2_MapScripts:: @ 8167F64 .byte 0 Route2_EventScript_167F65:: @ 8167F65 @@ -2985,7 +2985,7 @@ Route2_EventScript_167F65:: @ 8167F65 Route2_EventScript_167F6E:: @ 8167F6E .incbin "baserom.gba", 0x167F6E, 0x9 -gMapScripts_Route3:: @ 8167F77 +Route3_MapScripts:: @ 8167F77 .byte 0 Route3_EventScript_167F78:: @ 8167F78 @@ -2994,7 +2994,7 @@ Route3_EventScript_167F78:: @ 8167F78 Route3_EventScript_167F81:: @ 8167F81 .incbin "baserom.gba", 0x167F81, 0x9 -gMapScripts_Route4:: @ 8167F8A +Route4_MapScripts:: @ 8167F8A .byte 0 Route4_EventScript_167F8B:: @ 8167F8B @@ -3009,37 +3009,37 @@ Route4_EventScript_167F95:: @ 8167F95 Route4_EventScript_167F9E:: @ 8167F9E .incbin "baserom.gba", 0x167F9E, 0x9 -gMapScripts_Route5:: @ 8167FA7 +Route5_MapScripts:: @ 8167FA7 .byte 0 Route5_EventScript_167FA8:: @ 8167FA8 .incbin "baserom.gba", 0x167FA8, 0x9 -gMapScripts_Route6:: @ 8167FB1 +Route6_MapScripts:: @ 8167FB1 .byte 0 Route6_EventScript_167FB2:: @ 8167FB2 .incbin "baserom.gba", 0x167FB2, 0x9 -gMapScripts_Route7:: @ 8167FBB +Route7_MapScripts:: @ 8167FBB .byte 0 Route7_EventScript_167FBC:: @ 8167FBC .incbin "baserom.gba", 0x167FBC, 0x9 -gMapScripts_Route8:: @ 8167FC5 +Route8_MapScripts:: @ 8167FC5 .byte 0 Route8_EventScript_167FC6:: @ 8167FC6 .incbin "baserom.gba", 0x167FC6, 0x9 -gMapScripts_Route9:: @ 8167FCF +Route9_MapScripts:: @ 8167FCF .byte 0 Route9_EventScript_167FD0:: @ 8167FD0 .incbin "baserom.gba", 0x167FD0, 0x9 -gMapScripts_Route10:: @ 8167FD9 +Route10_MapScripts:: @ 8167FD9 .byte 0 Route10_EventScript_167FDA:: @ 8167FDA @@ -3054,13 +3054,13 @@ Route10_EventScript_167FE4:: @ 8167FE4 Route10_EventScript_167FED:: @ 8167FED .incbin "baserom.gba", 0x167FED, 0x9 -gMapScripts_Route11:: @ 8167FF6 +Route11_MapScripts:: @ 8167FF6 .byte 0 Route11_EventScript_167FF7:: @ 8167FF7 .incbin "baserom.gba", 0x167FF7, 0x9 -gMapScripts_Route12:: @ 8168000 +Route12_MapScripts:: @ 8168000 map_script 5, Route12_MapScript1_168006 .byte 0 @@ -3076,7 +3076,7 @@ Route12_EventScript_1680A3:: @ 81680A3 Route12_EventScript_1680AC:: @ 81680AC .incbin "baserom.gba", 0x1680AC, 0x9 -gMapScripts_Route13:: @ 81680B5 +Route13_MapScripts:: @ 81680B5 .byte 0 Route13_EventScript_1680B6:: @ 81680B6 @@ -3088,19 +3088,19 @@ Route13_EventScript_1680BF:: @ 81680BF Route13_EventScript_1680C8:: @ 81680C8 .incbin "baserom.gba", 0x1680C8, 0x9 -gMapScripts_Route14:: @ 81680D1 +Route14_MapScripts:: @ 81680D1 .byte 0 Route14_EventScript_1680D2:: @ 81680D2 .incbin "baserom.gba", 0x1680D2, 0x9 -gMapScripts_Route15:: @ 81680DB +Route15_MapScripts:: @ 81680DB .byte 0 Route15_EventScript_1680DC:: @ 81680DC .incbin "baserom.gba", 0x1680DC, 0x9 -gMapScripts_Route16:: @ 81680E5 +Route16_MapScripts:: @ 81680E5 map_script 5, Route16_MapScript1_1680F5 map_script 3, Route16_MapScript2_168103 map_script 4, Route16_MapScript3_168113 @@ -3124,7 +3124,7 @@ Route16_EventScript_1681AD:: @ 81681AD Route16_EventScript_1681B6:: @ 81681B6 .incbin "baserom.gba", 0x1681B6, 0x9 -gMapScripts_Route17:: @ 81681BF +Route17_MapScripts:: @ 81681BF .byte 0 Route17_EventScript_1681C0:: @ 81681C0 @@ -3145,7 +3145,7 @@ Route17_EventScript_1681E4:: @ 81681E4 Route17_EventScript_1681ED:: @ 81681ED .incbin "baserom.gba", 0x1681ED, 0x9 -gMapScripts_Route18:: @ 81681F6 +Route18_MapScripts:: @ 81681F6 map_script 3, Route18_MapScript1_168201 map_script 4, Route18_MapScript2_168211 .byte 0 @@ -3162,13 +3162,13 @@ Route18_EventScript_16821F:: @ 816821F Route18_EventScript_168228:: @ 8168228 .incbin "baserom.gba", 0x168228, 0x9 -gMapScripts_Route19:: @ 8168231 +Route19_MapScripts:: @ 8168231 .byte 0 Route19_EventScript_168232:: @ 8168232 .incbin "baserom.gba", 0x168232, 0x9 -gMapScripts_Route20:: @ 816823B +Route20_MapScripts:: @ 816823B map_script 3, Route20_MapScript1_168241 .byte 0 @@ -3178,13 +3178,13 @@ Route20_MapScript1_168241:: @ 8168241 Route20_EventScript_168280:: @ 8168280 .incbin "baserom.gba", 0x168280, 0x9 -gMapScripts_Route21_North:: @ 8168289 +Route21_North_MapScripts:: @ 8168289 .byte 0 -gMapScripts_Route21_South:: @ 816828A +Route21_South_MapScripts:: @ 816828A .byte 0 -gMapScripts_Route22:: @ 816828B +Route22_MapScripts:: @ 816828B .byte 0 Route22_EventScript_16828C:: @ 816828C @@ -3208,7 +3208,7 @@ Route22_EventScript_16840C:: @ 816840C Route22_EventScript_1684E2:: @ 81684E2 .incbin "baserom.gba", 0x1684E2, 0x9 -gMapScripts_Route23:: @ 81684EB +Route23_MapScripts:: @ 81684EB map_script 3, Route23_MapScript1_1684F1 .byte 0 @@ -3260,7 +3260,7 @@ Route23_EventScript_168601:: @ 8168601 Route23_EventScript_168616:: @ 8168616 .incbin "baserom.gba", 0x168616, 0x9 -gMapScripts_Route24:: @ 816861F +Route24_MapScripts:: @ 816861F .byte 0 Route24_EventScript_168620:: @ 8168620 @@ -3272,7 +3272,7 @@ Route24_EventScript_168660:: @ 8168660 Route24_EventScript_16866C:: @ 816866C .incbin "baserom.gba", 0x16866C, 0xD9 -gMapScripts_Route25:: @ 8168745 +Route25_MapScripts:: @ 8168745 .byte 0 Route25_EventScript_168746:: @ 8168746 @@ -3281,7 +3281,7 @@ Route25_EventScript_168746:: @ 8168746 Route25_EventScript_16874F:: @ 816874F .incbin "baserom.gba", 0x16874F, 0x9 -gMapScripts_OneIsland_KindleRoad:: @ 8168758 +OneIsland_KindleRoad_MapScripts:: @ 8168758 .byte 0 OneIsland_KindleRoad_EventScript_168759:: @ 8168759 @@ -3290,16 +3290,16 @@ OneIsland_KindleRoad_EventScript_168759:: @ 8168759 OneIsland_KindleRoad_EventScript_168762:: @ 8168762 .incbin "baserom.gba", 0x168762, 0x9 -gMapScripts_OneIsland_TreasureBeach:: @ 816876B +OneIsland_TreasureBeach_MapScripts:: @ 816876B .byte 0 OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C .incbin "baserom.gba", 0x16876C, 0x9 -gMapScripts_TwoIsland_CapeBrink:: @ 8168775 +TwoIsland_CapeBrink_MapScripts:: @ 8168775 .byte 0 -gMapScripts_ThreeIsland_BondBridge:: @ 8168776 +ThreeIsland_BondBridge_MapScripts:: @ 8168776 .byte 0 ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 @@ -3308,7 +3308,7 @@ ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 .incbin "baserom.gba", 0x168780, 0x9 -gMapScripts_ThreeIsland_Port:: @ 8168789 +ThreeIsland_Port_MapScripts:: @ 8168789 map_script 3, ThreeIsland_Port_MapScript1_16878F .byte 0 @@ -3324,19 +3324,19 @@ ThreeIsland_Port_EventScript_1687CC:: @ 81687CC ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 .incbin "baserom.gba", 0x1687D5, 0xB -gMapScripts_UnknownMap_03_50:: @ 81687E0 +UnknownMap_03_50_MapScripts:: @ 81687E0 .byte 0 -gMapScripts_UnknownMap_03_51:: @ 81687E1 +UnknownMap_03_51_MapScripts:: @ 81687E1 .byte 0 -gMapScripts_UnknownMap_03_52:: @ 81687E2 +UnknownMap_03_52_MapScripts:: @ 81687E2 .byte 0 -gMapScripts_UnknownMap_03_53:: @ 81687E3 +UnknownMap_03_53_MapScripts:: @ 81687E3 .byte 0 -gMapScripts_FiveIsland_ResortGorgeous:: @ 81687E4 +FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 map_script 4, FiveIsland_ResortGorgeous_MapScript1_1687EF map_script 2, FiveIsland_ResortGorgeous_MapScript2_1687FE .byte 0 @@ -3350,13 +3350,13 @@ FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 .incbin "baserom.gba", 0x168844, 0x9 -gMapScripts_FiveIsland_WaterLabyrinth:: @ 816884D +FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D .byte 0 FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E .incbin "baserom.gba", 0x16884E, 0xE4 -gMapScripts_FiveIsland_Meadow:: @ 8168932 +FiveIsland_Meadow_MapScripts:: @ 8168932 map_script 1, FiveIsland_Meadow_MapScript1_168938 .byte 0 @@ -3375,7 +3375,7 @@ FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB .incbin "baserom.gba", 0x1689BB, 0x17 -gMapScripts_FiveIsland_MemorialPillar:: @ 81689D2 +FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 .byte 0 FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 @@ -3384,13 +3384,13 @@ FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 .incbin "baserom.gba", 0x168A48, 0xCD -gMapScripts_SixIsland_OutcastIsland:: @ 8168B15 +SixIsland_OutcastIsland_MapScripts:: @ 8168B15 .byte 0 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 .incbin "baserom.gba", 0x168B16, 0x17 -gMapScripts_SixIsland_GreenPath:: @ 8168B2D +SixIsland_GreenPath_MapScripts:: @ 8168B2D .byte 0 SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E @@ -3399,7 +3399,7 @@ SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E SixIsland_GreenPath_EventScript_168B37:: @ 8168B37 .incbin "baserom.gba", 0x168B37, 0x9 -gMapScripts_SixIsland_WaterPath:: @ 8168B40 +SixIsland_WaterPath_MapScripts:: @ 8168B40 .byte 0 SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 @@ -3408,7 +3408,7 @@ SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A .incbin "baserom.gba", 0x168B4A, 0x9 -gMapScripts_SixIsland_RuinValley:: @ 8168B53 +SixIsland_RuinValley_MapScripts:: @ 8168B53 map_script 1, SixIsland_RuinValley_MapScript1_168B59 .byte 0 @@ -3421,7 +3421,7 @@ SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 .incbin "baserom.gba", 0x168B94, 0x41 -gMapScripts_SevenIsland_TrainerTower:: @ 8168BD5 +SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB .byte 0 @@ -3434,22 +3434,22 @@ SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA .incbin "baserom.gba", 0x168BEA, 0x9 -gMapScripts_SevenIsland_SevaultCanyon_Entrance:: @ 8168BF3 +SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 .byte 0 SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4 .incbin "baserom.gba", 0x168BF4, 0x9 -gMapScripts_SevenIsland_SevaultCanyon:: @ 8168BFD +SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD .byte 0 SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE .incbin "baserom.gba", 0x168BFE, 0x9 -gMapScripts_SevenIsland_TanobyRuins:: @ 8168C07 +SevenIsland_TanobyRuins_MapScripts:: @ 8168C07 .byte 0 -gMapScripts_PalletTown_PlayersHouse_1F:: @ 8168C08 +PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 .byte 0 PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 @@ -3458,7 +3458,7 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 .incbin "baserom.gba", 0x168C62, 0x41 -gMapScripts_PalletTown_PlayersHouse_2F:: @ 8168CA3 +PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 map_script 3, PalletTown_PlayersHouse_2F_MapScript1_168CAE map_script 4, PalletTown_PlayersHouse_2F_MapScript2_168CBE .byte 0 @@ -3482,7 +3482,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 gUnknown_8168D17:: @ 8168D17 .incbin "baserom.gba", 0x168D17, 0x10 -gMapScripts_PalletTown_GarysHouse:: @ 8168D27 +PalletTown_GarysHouse_MapScripts:: @ 8168D27 map_script 3, PalletTown_GarysHouse_MapScript1_168D2D .byte 0 @@ -3501,7 +3501,7 @@ PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 .incbin "baserom.gba", 0x168F75, 0x9 -gMapScripts_PalletTown_ProfessorOaksLab:: @ 8168F7E +PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E map_script 3, PalletTown_ProfessorOaksLab_MapScript1_168F8E map_script 4, PalletTown_ProfessorOaksLab_MapScript2_168FE1 map_script 2, PalletTown_ProfessorOaksLab_MapScript3_168FF0 @@ -3564,7 +3564,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A .incbin "baserom.gba", 0x169E7A, 0x20 -gMapScripts_ViridianCity_House1:: @ 8169E9A +ViridianCity_House1_MapScripts:: @ 8169E9A .byte 0 ViridianCity_House1_EventScript_169E9B:: @ 8169E9B @@ -3579,7 +3579,7 @@ ViridianCity_House1_EventScript_169EAD:: @ 8169EAD ViridianCity_House1_EventScript_169EC0:: @ 8169EC0 .incbin "baserom.gba", 0x169EC0, 0x9 -gMapScripts_ViridianCity_Gym:: @ 8169EC9 +ViridianCity_Gym_MapScripts:: @ 8169EC9 .byte 0 ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA @@ -3615,7 +3615,7 @@ ViridianCity_Gym_EventScript_16A032:: @ 816A032 ViridianCity_Gym_EventScript_16A05E:: @ 816A05E .incbin "baserom.gba", 0x16A05E, 0x1E -gMapScripts_ViridianCity_House2:: @ 816A07C +ViridianCity_House2_MapScripts:: @ 816A07C .byte 0 ViridianCity_House2_EventScript_16A07D:: @ 816A07D @@ -3630,7 +3630,7 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB ViridianCity_House2_EventScript_16A11D:: @ 816A11D .incbin "baserom.gba", 0x16A11D, 0xB6 -gMapScripts_ViridianCity_Mart:: @ 816A1D3 +ViridianCity_Mart_MapScripts:: @ 816A1D3 map_script 1, ViridianCity_Mart_MapScript1_16A1DE map_script 2, ViridianCity_Mart_MapScript2_16A1FB .byte 0 @@ -3650,7 +3650,7 @@ ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 .incbin "baserom.gba", 0x16A2B7, 0x9 -gMapScripts_ViridianCity_PokemonCenter_1F:: @ 816A2C0 +ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB map_script 5, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -3670,7 +3670,7 @@ ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1 ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA .incbin "baserom.gba", 0x16A2EA, 0x9 -gMapScripts_ViridianCity_PokemonCenter_2F:: @ 816A2F3 +ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 map_script 2, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 @@ -3680,7 +3680,7 @@ gMapScripts_ViridianCity_PokemonCenter_2F:: @ 816A2F3 ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 .incbin "baserom.gba", 0x16A308, 0x12 -gMapScripts_PewterCity_Museum_1F:: @ 816A31A +PewterCity_Museum_1F_MapScripts:: @ 816A31A .byte 0 PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B @@ -3713,7 +3713,7 @@ PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 .incbin "baserom.gba", 0x16A532, 0x20 -gMapScripts_PewterCity_Museum_2F:: @ 816A552 +PewterCity_Museum_2F_MapScripts:: @ 816A552 .byte 0 PewterCity_Museum_2F_EventScript_16A553:: @ 816A553 @@ -3737,7 +3737,7 @@ PewterCity_Museum_2F_EventScript_16A580:: @ 816A580 PewterCity_Museum_2F_EventScript_16A589:: @ 816A589 .incbin "baserom.gba", 0x16A589, 0x9 -gMapScripts_PewterCity_Gym:: @ 816A592 +PewterCity_Gym_MapScripts:: @ 816A592 .byte 0 PewterCity_Gym_EventScript_16A593:: @ 816A593 @@ -3752,7 +3752,7 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF .incbin "baserom.gba", 0x16A6AF, 0x1E -gMapScripts_PewterCity_Mart:: @ 816A6CD +PewterCity_Mart_MapScripts:: @ 816A6CD .byte 0 PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE @@ -3764,7 +3764,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 .incbin "baserom.gba", 0x16A6E0, 0x3C -gMapScripts_PewterCity_House1:: @ 816A71C +PewterCity_House1_MapScripts:: @ 816A71C .byte 0 PewterCity_House1_EventScript_16A71D:: @ 816A71D @@ -3776,7 +3776,7 @@ PewterCity_House1_EventScript_16A726:: @ 816A726 PewterCity_House1_EventScript_16A736:: @ 816A736 .incbin "baserom.gba", 0x16A736, 0x2A -gMapScripts_PewterCity_PokemonCenter_1F:: @ 816A760 +PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 map_script 3, PewterCity_PokemonCenter_1F_MapScript1_16A76B map_script 5, PewterCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -3802,7 +3802,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC .incbin "baserom.gba", 0x16A7AC, 0x9 -gMapScripts_PewterCity_PokemonCenter_2F:: @ 816A7B5 +PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, PewterCity_PokemonCenter_2F_MapScript3_1BB237 @@ -3812,7 +3812,7 @@ gMapScripts_PewterCity_PokemonCenter_2F:: @ 816A7B5 PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA .incbin "baserom.gba", 0x16A7CA, 0x12 -gMapScripts_PewterCity_House2:: @ 816A7DC +PewterCity_House2_MapScripts:: @ 816A7DC .byte 0 PewterCity_House2_EventScript_16A7DD:: @ 816A7DD @@ -3821,13 +3821,13 @@ PewterCity_House2_EventScript_16A7DD:: @ 816A7DD PewterCity_House2_EventScript_16A7E6:: @ 816A7E6 .incbin "baserom.gba", 0x16A7E6, 0x9 -gMapScripts_CeruleanCity_House1:: @ 816A7EF +CeruleanCity_House1_MapScripts:: @ 816A7EF .byte 0 CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 .incbin "baserom.gba", 0x16A7F0, 0x185 -gMapScripts_CeruleanCity_House2:: @ 816A975 +CeruleanCity_House2_MapScripts:: @ 816A975 .byte 0 CeruleanCity_House2_EventScript_16A976:: @ 816A976 @@ -3839,7 +3839,7 @@ CeruleanCity_House2_EventScript_16A995:: @ 816A995 CeruleanCity_House2_EventScript_16A99E:: @ 816A99E .incbin "baserom.gba", 0x16A99E, 0x9 -gMapScripts_CeruleanCity_House3:: @ 816A9A7 +CeruleanCity_House3_MapScripts:: @ 816A9A7 .byte 0 CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 @@ -3848,7 +3848,7 @@ CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 .incbin "baserom.gba", 0x16A9B1, 0x7C -gMapScripts_CeruleanCity_PokemonCenter_1F:: @ 816AA2D +CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38 map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -3871,7 +3871,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70 .incbin "baserom.gba", 0x16AA70, 0x9 -gMapScripts_CeruleanCity_PokemonCenter_2F:: @ 816AA79 +CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 @@ -3881,7 +3881,7 @@ gMapScripts_CeruleanCity_PokemonCenter_2F:: @ 816AA79 CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E .incbin "baserom.gba", 0x16AA8E, 0x12 -gMapScripts_CeruleanCity_Gym:: @ 816AAA0 +CeruleanCity_Gym_MapScripts:: @ 816AAA0 .byte 0 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 @@ -3899,7 +3899,7 @@ CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E .incbin "baserom.gba", 0x16AB9E, 0x1E -gMapScripts_CeruleanCity_BikeShop:: @ 816ABBC +CeruleanCity_BikeShop_MapScripts:: @ 816ABBC .byte 0 CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD @@ -3915,7 +3915,7 @@ CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94 CeruleanCity_EventScript_16AC94:: @ 816AC94 .incbin "baserom.gba", 0x16AC94, 0x9 -gMapScripts_CeruleanCity_Mart:: @ 816AC9D +CeruleanCity_Mart_MapScripts:: @ 816AC9D .byte 0 CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E @@ -3927,13 +3927,13 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 .incbin "baserom.gba", 0x16ACB0, 0x3E -gMapScripts_CeruleanCity_House4:: @ 816ACEE +CeruleanCity_House4_MapScripts:: @ 816ACEE .byte 0 CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF .incbin "baserom.gba", 0x16ACEF, 0x160 -gMapScripts_CeruleanCity_House5:: @ 816AE4F +CeruleanCity_House5_MapScripts:: @ 816AE4F .byte 0 CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 @@ -3942,7 +3942,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA .incbin "baserom.gba", 0x16B0DA, 0x15 -gMapScripts_LavenderTown_PokemonCenter_1F:: @ 816B0EF +LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA map_script 5, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -3962,7 +3962,7 @@ LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110 LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119 .incbin "baserom.gba", 0x16B119, 0x9 -gMapScripts_LavenderTown_PokemonCenter_2F:: @ 816B122 +LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 map_script 2, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 @@ -3972,7 +3972,7 @@ gMapScripts_LavenderTown_PokemonCenter_2F:: @ 816B122 LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 .incbin "baserom.gba", 0x16B137, 0x12 -gMapScripts_LavenderTown_VolunteerPokemonHouse:: @ 816B149 +LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 .byte 0 LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A @@ -3999,7 +3999,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229 .incbin "baserom.gba", 0x16B229, 0x9 -gMapScripts_LavenderTown_House1:: @ 816B232 +LavenderTown_House1_MapScripts:: @ 816B232 .byte 0 LavenderTown_House1_EventScript_16B233:: @ 816B233 @@ -4008,13 +4008,13 @@ LavenderTown_House1_EventScript_16B233:: @ 816B233 LavenderTown_House1_EventScript_16B252:: @ 816B252 .incbin "baserom.gba", 0x16B252, 0x13 -gMapScripts_LavenderTown_House2:: @ 816B265 +LavenderTown_House2_MapScripts:: @ 816B265 .byte 0 LavenderTown_House2_EventScript_16B266:: @ 816B266 .incbin "baserom.gba", 0x16B266, 0xE9 -gMapScripts_LavenderTown_Mart:: @ 816B34F +LavenderTown_Mart_MapScripts:: @ 816B34F .byte 0 LavenderTown_Mart_EventScript_16B350:: @ 816B350 @@ -4029,13 +4029,13 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B .incbin "baserom.gba", 0x16B36B, 0x3B -gMapScripts_VermilionCity_House1:: @ 816B3A6 +VermilionCity_House1_MapScripts:: @ 816B3A6 .byte 0 VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 .incbin "baserom.gba", 0x16B3A7, 0x7D -gMapScripts_VermilionCity_PokemonCenter_1F:: @ 816B424 +VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 map_script 3, VermilionCity_PokemonCenter_1F_MapScript1_16B42F map_script 5, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -4055,7 +4055,7 @@ VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445 VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E .incbin "baserom.gba", 0x16B44E, 0x9 -gMapScripts_VermilionCity_PokemonCenter_2F:: @ 816B457 +VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 @@ -4065,7 +4065,7 @@ gMapScripts_VermilionCity_PokemonCenter_2F:: @ 816B457 VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C .incbin "baserom.gba", 0x16B46C, 0x12 -gMapScripts_VermilionCity_PokemonFanClub:: @ 816B47E +VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E .byte 0 VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F @@ -4092,13 +4092,13 @@ VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD .incbin "baserom.gba", 0x16B5CD, 0x9 -gMapScripts_VermilionCity_House2:: @ 816B5D6 +VermilionCity_House2_MapScripts:: @ 816B5D6 .byte 0 VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 .incbin "baserom.gba", 0x16B5D7, 0x7C -gMapScripts_VermilionCity_Mart:: @ 816B653 +VermilionCity_Mart_MapScripts:: @ 816B653 .byte 0 VermilionCity_Mart_EventScript_16B654:: @ 816B654 @@ -4110,7 +4110,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D VermilionCity_Mart_EventScript_16B666:: @ 816B666 .incbin "baserom.gba", 0x16B666, 0x38 -gMapScripts_VermilionCity_Gym:: @ 816B69E +VermilionCity_Gym_MapScripts:: @ 816B69E map_script 1, VermilionCity_Gym_MapScript1_16B6A9 map_script 3, VermilionCity_Gym_MapScript2_16B772 .byte 0 @@ -4184,7 +4184,7 @@ VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B .incbin "baserom.gba", 0x16BA8B, 0x1E -gMapScripts_VermilionCity_House3:: @ 816BAA9 +VermilionCity_House3_MapScripts:: @ 816BAA9 .byte 0 VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA @@ -4199,7 +4199,7 @@ VermilionCity_House3_EventScript_16BABC:: @ 816BABC VermilionCity_House3_EventScript_16BACF:: @ 816BACF .incbin "baserom.gba", 0x16BACF, 0x9 -gMapScripts_CeladonCity_DepartmentStore_1F:: @ 816BAD8 +CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 .byte 0 CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 @@ -4211,7 +4211,7 @@ CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB .incbin "baserom.gba", 0x16BAEB, 0x9 -gMapScripts_CeladonCity_DepartmentStore_2F:: @ 816BAF4 +CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 .byte 0 CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 @@ -4229,7 +4229,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E .incbin "baserom.gba", 0x16BB4E, 0x36 -gMapScripts_CeladonCity_DepartmentStore_3F:: @ 816BB84 +CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84 .byte 0 CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85 @@ -4268,7 +4268,7 @@ CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 .incbin "baserom.gba", 0x16BBE5, 0x9 -gMapScripts_CeladonCity_DepartmentStore_4F:: @ 816BBEE +CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE .byte 0 CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF @@ -4283,7 +4283,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A .incbin "baserom.gba", 0x16BC0A, 0x36 -gMapScripts_CeladonCity_DepartmentStore_5F:: @ 816BC40 +CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 .byte 0 CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 @@ -4301,7 +4301,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 .incbin "baserom.gba", 0x16BC96, 0x36 -gMapScripts_CeladonCity_DepartmentStore_Roof:: @ 816BCCC +CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC .byte 0 CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD @@ -4316,13 +4316,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 .incbin "baserom.gba", 0x16C034, 0x11E -gMapScripts_CeladonCity_DepartmentStore_Elevator:: @ 816C152 +CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 .byte 0 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 .incbin "baserom.gba", 0x16C153, 0x1CD -gMapScripts_CeladonCity_Condominiums_1F:: @ 816C320 +CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 .byte 0 CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 @@ -4340,13 +4340,13 @@ CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 .incbin "baserom.gba", 0x16C3C7, 0x9 -gMapScripts_CeladonCity_Condominiums_2F:: @ 816C3D0 +CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 .byte 0 CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 .incbin "baserom.gba", 0x16C3D1, 0x9 -gMapScripts_CeladonCity_Condominiums_3F:: @ 816C3DA +CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA .byte 0 CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB @@ -4373,13 +4373,13 @@ CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 .incbin "baserom.gba", 0x16C450, 0x9 -gMapScripts_CeladonCity_Condominiums_Roof:: @ 816C459 +CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 .byte 0 CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A .incbin "baserom.gba", 0x16C45A, 0x9 -gMapScripts_CeladonCity_Condominiums_RoofRoom:: @ 816C463 +CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 @@ -4394,7 +4394,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 .incbin "baserom.gba", 0x16C522, 0xCA -gMapScripts_CeladonCity_PokemonCenter_1F:: @ 816C5EC +CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7 map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -4414,7 +4414,7 @@ CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 .incbin "baserom.gba", 0x16C616, 0x9 -gMapScripts_CeladonCity_PokemonCenter_2F:: @ 816C61F +CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 @@ -4424,7 +4424,7 @@ gMapScripts_CeladonCity_PokemonCenter_2F:: @ 816C61F CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 .incbin "baserom.gba", 0x16C634, 0x12 -gMapScripts_CeladonCity_GameCorner:: @ 816C646 +CeladonCity_GameCorner_MapScripts:: @ 816C646 map_script 1, CeladonCity_GameCorner_MapScript1_16C64C .byte 0 @@ -4533,7 +4533,7 @@ CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C .incbin "baserom.gba", 0x16CB6C, 0x9 -gMapScripts_CeladonCity_GameCorner_PrizeRoom:: @ 816CB75 +CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 .byte 0 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 @@ -4551,7 +4551,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 .incbin "baserom.gba", 0x16CF88, 0xD8 -gMapScripts_CeladonCity_Gym:: @ 816D060 +CeladonCity_Gym_MapScripts:: @ 816D060 .byte 0 CeladonCity_Gym_EventScript_16D061:: @ 816D061 @@ -4581,7 +4581,7 @@ CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC .incbin "baserom.gba", 0x16D1CC, 0x1E -gMapScripts_CeladonCity_Restaurant:: @ 816D1EA +CeladonCity_Restaurant_MapScripts:: @ 816D1EA .byte 0 CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB @@ -4599,7 +4599,7 @@ CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E .incbin "baserom.gba", 0x16D25E, 0x9 -gMapScripts_CeladonCity_House1:: @ 816D267 +CeladonCity_House1_MapScripts:: @ 816D267 .byte 0 CeladonCity_House1_EventScript_16D268:: @ 816D268 @@ -4611,7 +4611,7 @@ CeladonCity_House1_EventScript_16D271:: @ 816D271 CeladonCity_House1_EventScript_16D27A:: @ 816D27A .incbin "baserom.gba", 0x16D27A, 0x9 -gMapScripts_CeladonCity_Hotel:: @ 816D283 +CeladonCity_Hotel_MapScripts:: @ 816D283 .byte 0 CeladonCity_Hotel_EventScript_16D284:: @ 816D284 @@ -4626,7 +4626,7 @@ CeladonCity_Hotel_EventScript_16D296:: @ 816D296 CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F .incbin "baserom.gba", 0x16D29F, 0x9 -gMapScripts_FuchsiaCity_SafariZone_Entrance:: @ 816D2A8 +FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE .byte 0 @@ -4645,7 +4645,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 .incbin "baserom.gba", 0x16D4B7, 0x29 -gMapScripts_FuchsiaCity_Mart:: @ 816D4E0 +FuchsiaCity_Mart_MapScripts:: @ 816D4E0 .byte 0 FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1 @@ -4657,7 +4657,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 .incbin "baserom.gba", 0x16D4F3, 0x35 -gMapScripts_FuchsiaCity_ZooBuilding:: @ 816D528 +FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528 .byte 0 FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529 @@ -4672,7 +4672,7 @@ FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544 .incbin "baserom.gba", 0x16D544, 0x9 -gMapScripts_FuchsiaCity_Gym:: @ 816D54D +FuchsiaCity_Gym_MapScripts:: @ 816D54D .byte 0 FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E @@ -4702,7 +4702,7 @@ FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 .incbin "baserom.gba", 0x16D6A7, 0x1E -gMapScripts_FuchsiaCity_House1:: @ 816D6C5 +FuchsiaCity_House1_MapScripts:: @ 816D6C5 .byte 0 FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 @@ -4714,7 +4714,7 @@ FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8 .incbin "baserom.gba", 0x16D6E8, 0x9 -gMapScripts_FuchsiaCity_PokemonCenter_1F:: @ 816D6F1 +FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 map_script 3, FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC map_script 5, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -4734,7 +4734,7 @@ FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712 FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B .incbin "baserom.gba", 0x16D71B, 0x9 -gMapScripts_FuchsiaCity_PokemonCenter_2F:: @ 816D724 +FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 @@ -4744,7 +4744,7 @@ gMapScripts_FuchsiaCity_PokemonCenter_2F:: @ 816D724 FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 .incbin "baserom.gba", 0x16D739, 0x12 -gMapScripts_FuchsiaCity_Building1:: @ 816D74B +FuchsiaCity_Building1_MapScripts:: @ 816D74B .byte 0 FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C @@ -4756,19 +4756,19 @@ FuchsiaCity_Building1_EventScript_16D804:: @ 816D804 FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D .incbin "baserom.gba", 0x16D80D, 0x9 -gMapScripts_FuchsiaCity_House2:: @ 816D816 +FuchsiaCity_House2_MapScripts:: @ 816D816 .byte 0 FuchsiaCity_House2_EventScript_16D817:: @ 816D817 .incbin "baserom.gba", 0x16D817, 0x7D -gMapScripts_FuchsiaCity_House3:: @ 816D894 +FuchsiaCity_House3_MapScripts:: @ 816D894 .byte 0 FuchsiaCity_House3_EventScript_16D895:: @ 816D895 .incbin "baserom.gba", 0x16D895, 0xB6 -gMapScripts_CinnabarIsland_Gym:: @ 816D94B +CinnabarIsland_Gym_MapScripts:: @ 816D94B map_script 1, CinnabarIsland_Gym_MapScript1_16D951 .byte 0 @@ -4841,7 +4841,7 @@ CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C .incbin "baserom.gba", 0x16E04C, 0x227 -gMapScripts_CinnabarIsland_PokemonLab_Entrance:: @ 816E273 +CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279 .byte 0 @@ -4863,7 +4863,7 @@ CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6 CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF .incbin "baserom.gba", 0x16E2AF, 0x9 -gMapScripts_CinnabarIsland_PokemonLab_Lounge:: @ 816E2B8 +CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 .byte 0 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9 @@ -4875,7 +4875,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E .incbin "baserom.gba", 0x16E33E, 0xA0 -gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom:: @ 816E3DE +CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE .byte 0 CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF @@ -4890,7 +4890,7 @@ CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7 .incbin "baserom.gba", 0x16E3F7, 0x9 -gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom:: @ 816E400 +CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: @ 816E400 .byte 0 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 @@ -4899,7 +4899,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D .incbin "baserom.gba", 0x16E47D, 0x45A -gMapScripts_CinnabarIsland_PokemonCenter_1F:: @ 816E8D7 +CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2 map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -4922,7 +4922,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A .incbin "baserom.gba", 0x16E90A, 0xDE -gMapScripts_CinnabarIsland_PokemonCenter_2F:: @ 816E9E8 +CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 @@ -4932,7 +4932,7 @@ gMapScripts_CinnabarIsland_PokemonCenter_2F:: @ 816E9E8 CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD .incbin "baserom.gba", 0x16E9FD, 0x12 -gMapScripts_CinnabarIsland_Mart:: @ 816EA0F +CinnabarIsland_Mart_MapScripts:: @ 816EA0F .byte 0 CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10 @@ -4944,7 +4944,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 .incbin "baserom.gba", 0x16EA22, 0x38 -gMapScripts_IndigoPlateau_PokemonCenter_1F:: @ 816EA5A +IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65 map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -4964,7 +4964,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06 .incbin "baserom.gba", 0x16EB06, 0x9 -gMapScripts_IndigoPlateau_PokemonCenter_2F:: @ 816EB0F +IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F map_script 2, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 @@ -4974,7 +4974,7 @@ gMapScripts_IndigoPlateau_PokemonCenter_2F:: @ 816EB0F IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 .incbin "baserom.gba", 0x16EB24, 0x12 -gMapScripts_SaffronCity_House1_1F:: @ 816EB36 +SaffronCity_House1_1F_MapScripts:: @ 816EB36 .byte 0 SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 @@ -4986,7 +4986,7 @@ SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 .incbin "baserom.gba", 0x16EB49, 0x13 -gMapScripts_SaffronCity_House1_2F:: @ 816EB5C +SaffronCity_House1_2F_MapScripts:: @ 816EB5C .byte 0 SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D @@ -5004,7 +5004,7 @@ SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 .incbin "baserom.gba", 0x16EBD2, 0x9 -gMapScripts_SaffronCity_Dojo:: @ 816EBDB +SaffronCity_Dojo_MapScripts:: @ 816EBDB .byte 0 SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC @@ -5043,7 +5043,7 @@ SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 .incbin "baserom.gba", 0x16EDA2, 0x35 -gMapScripts_SaffronCity_Gym:: @ 816EDD7 +SaffronCity_Gym_MapScripts:: @ 816EDD7 .byte 0 SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 @@ -5076,7 +5076,7 @@ SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 .incbin "baserom.gba", 0x16EF55, 0x1E -gMapScripts_SaffronCity_House2:: @ 816EF73 +SaffronCity_House2_MapScripts:: @ 816EF73 .byte 0 SaffronCity_House2_EventScript_16EF74:: @ 816EF74 @@ -5091,7 +5091,7 @@ SaffronCity_House2_EventScript_16EF86:: @ 816EF86 SaffronCity_House2_EventScript_16EF99:: @ 816EF99 .incbin "baserom.gba", 0x16EF99, 0x9 -gMapScripts_SaffronCity_Mart:: @ 816EFA2 +SaffronCity_Mart_MapScripts:: @ 816EFA2 .byte 0 SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 @@ -5103,7 +5103,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 .incbin "baserom.gba", 0x16EFB5, 0x37 -gMapScripts_SaffronCity_PokemonCenter_1F:: @ 816EFEC +SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7 map_script 5, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -5123,7 +5123,7 @@ SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 .incbin "baserom.gba", 0x16F016, 0x21 -gMapScripts_SaffronCity_PokemonCenter_2F:: @ 816F037 +SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 map_script 2, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 @@ -5133,13 +5133,13 @@ gMapScripts_SaffronCity_PokemonCenter_2F:: @ 816F037 SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C .incbin "baserom.gba", 0x16F04C, 0x12 -gMapScripts_SaffronCity_House3:: @ 816F05E +SaffronCity_House3_MapScripts:: @ 816F05E .byte 0 SaffronCity_House3_EventScript_16F05F:: @ 816F05F .incbin "baserom.gba", 0x16F05F, 0x60 -gMapScripts_SaffronCity_PokemonTrainerFanClub:: @ 816F0BF +SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144 .byte 0 @@ -5174,7 +5174,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 .incbin "baserom.gba", 0x16F583, 0x62 -gMapScripts_Route2_ViridianForest_SouthEntrance:: @ 816F5E5 +Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 .byte 0 Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 @@ -5183,7 +5183,7 @@ Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF .incbin "baserom.gba", 0x16F5EF, 0x9 -gMapScripts_Route2_House:: @ 816F5F8 +Route2_House_MapScripts:: @ 816F5F8 .byte 0 Route2_House_EventScript_16F5F9:: @ 816F5F9 @@ -5192,7 +5192,7 @@ Route2_House_EventScript_16F5F9:: @ 816F5F9 Route2_House_EventScript_16F602:: @ 816F602 .incbin "baserom.gba", 0x16F602, 0x7C -gMapScripts_Route2_EastBuilding:: @ 816F67E +Route2_EastBuilding_MapScripts:: @ 816F67E .byte 0 Route2_EastBuilding_EventScript_16F67F:: @ 816F67F @@ -5201,7 +5201,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F Route2_EastBuilding_EventScript_16F714:: @ 816F714 .incbin "baserom.gba", 0x16F714, 0x9 -gMapScripts_Route2_ViridianForest_NorthEntrance:: @ 816F71D +Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D .byte 0 Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E @@ -5213,7 +5213,7 @@ Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727 Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730 .incbin "baserom.gba", 0x16F730, 0x9 -gMapScripts_Route4_PokemonCenter_1F:: @ 816F739 +Route4_PokemonCenter_1F_MapScripts:: @ 816F739 map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -5239,7 +5239,7 @@ Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD .incbin "baserom.gba", 0x16F8CD, 0xB -gMapScripts_Route4_PokemonCenter_2F:: @ 816F8D8 +Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 @@ -5249,10 +5249,10 @@ gMapScripts_Route4_PokemonCenter_2F:: @ 816F8D8 Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED .incbin "baserom.gba", 0x16F8ED, 0x12 -gMapScripts_Route5_PokemonDayCare:: @ 816F8FF +Route5_PokemonDayCare_MapScripts:: @ 816F8FF .byte 0 -gMapScripts_Route5_SouthEntrance:: @ 816F900 +Route5_SouthEntrance_MapScripts:: @ 816F900 .byte 0 Route5_SouthEntrance_EventScript_16F901:: @ 816F901 @@ -5267,7 +5267,7 @@ Route5_SouthEntrance_EventScript_16F916:: @ 816F916 Route5_SouthEntrance_EventScript_16F922:: @ 816F922 .incbin "baserom.gba", 0x16F922, 0xA4 -gMapScripts_Route6_NorthEntrance:: @ 816F9C6 +Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 @@ -5282,10 +5282,10 @@ Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 .incbin "baserom.gba", 0x16F9E8, 0xA4 -gMapScripts_UnknownMap_18_01:: @ 816FA8C +UnknownMap_18_01_MapScripts:: @ 816FA8C .byte 0 -gMapScripts_Route7_EastEntrance:: @ 816FA8D +Route7_EastEntrance_MapScripts:: @ 816FA8D .byte 0 Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E @@ -5300,7 +5300,7 @@ Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF .incbin "baserom.gba", 0x16FAAF, 0xA4 -gMapScripts_Route8_WestEntrance:: @ 816FB53 +Route8_WestEntrance_MapScripts:: @ 816FB53 .byte 0 Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 @@ -5315,7 +5315,7 @@ Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 .incbin "baserom.gba", 0x16FB75, 0xBA -gMapScripts_Route10_PokemonCenter_1F:: @ 816FC2F +Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A map_script 5, Route10_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -5338,7 +5338,7 @@ Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 .incbin "baserom.gba", 0x16FC65, 0x95 -gMapScripts_Route10_PokemonCenter_2F:: @ 816FCFA +Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237 @@ -5348,7 +5348,7 @@ gMapScripts_Route10_PokemonCenter_2F:: @ 816FCFA Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F .incbin "baserom.gba", 0x16FD0F, 0x12 -gMapScripts_Route11_EastEntrance_1F:: @ 816FD21 +Route11_EastEntrance_1F_MapScripts:: @ 816FD21 .byte 0 Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 @@ -5357,7 +5357,7 @@ Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B .incbin "baserom.gba", 0x16FD2B, 0x9 -gMapScripts_Route11_EastEntrance_2F:: @ 816FD34 +Route11_EastEntrance_2F_MapScripts:: @ 816FD34 .byte 0 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 @@ -5372,13 +5372,13 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 .incbin "baserom.gba", 0x16FDD8, 0x95 -gMapScripts_Route12_NorthEntrance_1F:: @ 816FE6D +Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D .byte 0 Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E .incbin "baserom.gba", 0x16FE6E, 0x9 -gMapScripts_Route12_NorthEntrance_2F:: @ 816FE77 +Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 .byte 0 Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 @@ -5390,7 +5390,7 @@ Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A .incbin "baserom.gba", 0x16FE8A, 0x81 -gMapScripts_Route12_FishingHouse:: @ 816FF0B +Route12_FishingHouse_MapScripts:: @ 816FF0B .byte 0 Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C @@ -5399,13 +5399,13 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C Route12_FishingHouse_EventScript_170067:: @ 8170067 .incbin "baserom.gba", 0x170067, 0x21 -gMapScripts_Route15_WestEntrance_1F:: @ 8170088 +Route15_WestEntrance_1F_MapScripts:: @ 8170088 .byte 0 Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 .incbin "baserom.gba", 0x170089, 0x9 -gMapScripts_Route15_WestEntrance_2F:: @ 8170092 +Route15_WestEntrance_2F_MapScripts:: @ 8170092 .byte 0 Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 @@ -5417,7 +5417,7 @@ Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 .incbin "baserom.gba", 0x1700B9, 0x95 -gMapScripts_Route16_House:: @ 817014E +Route16_House_MapScripts:: @ 817014E .byte 0 Route16_House_EventScript_17014F:: @ 817014F @@ -5426,7 +5426,7 @@ Route16_House_EventScript_17014F:: @ 817014F Route16_House_EventScript_1701AF:: @ 81701AF .incbin "baserom.gba", 0x1701AF, 0x13 -gMapScripts_Route16_NorthEntrance_1F:: @ 81701C2 +Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8 .byte 0 @@ -5454,7 +5454,7 @@ Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214 Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 .incbin "baserom.gba", 0x1702B5, 0x9 -gMapScripts_Route16_NorthEntrance_2F:: @ 81702BE +Route16_NorthEntrance_2F_MapScripts:: @ 81702BE .byte 0 Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF @@ -5472,7 +5472,7 @@ Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 .incbin "baserom.gba", 0x1702E3, 0x95 -gMapScripts_Route18_EastEntrance_1F:: @ 8170378 +Route18_EastEntrance_1F_MapScripts:: @ 8170378 map_script 3, Route18_EastEntrance_1F_MapScript1_17037E .byte 0 @@ -5497,7 +5497,7 @@ Route18_EastEntrance_1F_EventScript_1703BE:: @ 81703BE Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA .incbin "baserom.gba", 0x1703CA, 0xA1 -gMapScripts_Route18_EastEntrance_2F:: @ 817046B +Route18_EastEntrance_2F_MapScripts:: @ 817046B .byte 0 Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C @@ -5509,10 +5509,10 @@ Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E .incbin "baserom.gba", 0x17047E, 0x7C -gMapScripts_UnusedHouse_27_00:: @ 81704FA +UnusedHouse_27_00_MapScripts:: @ 81704FA .byte 0 -gMapScripts_Route22_NorthEntrance:: @ 81704FB +Route22_NorthEntrance_MapScripts:: @ 81704FB .byte 0 Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC @@ -5521,10 +5521,10 @@ Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC Route22_NorthEntrance_EventScript_17050D:: @ 817050D .incbin "baserom.gba", 0x17050D, 0x15 -gMapScripts_UnusedHouse_29_00:: @ 8170522 +UnusedHouse_29_00_MapScripts:: @ 8170522 .byte 0 -gMapScripts_Route25_SeaCottage:: @ 8170523 +Route25_SeaCottage_MapScripts:: @ 8170523 map_script 3, Route25_SeaCottage_MapScript1_170529 .byte 0 @@ -5537,7 +5537,7 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B Route25_SeaCottage_EventScript_1706DD:: @ 81706DD .incbin "baserom.gba", 0x1706DD, 0x1AD -gMapScripts_SevenIsland_House_Room1:: @ 817088A +SevenIsland_House_Room1_MapScripts:: @ 817088A map_script 3, SevenIsland_House_Room1_MapScript1_170895 map_script 2, SevenIsland_House_Room1_MapScript2_1708CF .byte 0 @@ -5554,7 +5554,7 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 .incbin "baserom.gba", 0x170A75, 0x9 -gMapScripts_SevenIsland_House_Room2:: @ 8170A7E +SevenIsland_House_Room2_MapScripts:: @ 8170A7E map_script 3, SevenIsland_House_Room2_MapScript1_170A89 map_script 2, SevenIsland_House_Room2_MapScript2_170A8D .byte 0 @@ -5565,7 +5565,7 @@ SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D .incbin "baserom.gba", 0x170A8D, 0xA3 -gMapScripts_SevenIsland_Mart:: @ 8170B30 +SevenIsland_Mart_MapScripts:: @ 8170B30 .byte 0 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 @@ -5580,7 +5580,7 @@ SevenIsland_Mart_EventScript_170B77:: @ 8170B77 SevenIsland_Mart_EventScript_170B80:: @ 8170B80 .incbin "baserom.gba", 0x170B80, 0x9 -gMapScripts_SevenIsland_PokemonCenter_1F:: @ 8170B89 +SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94 map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -5600,7 +5600,7 @@ SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 .incbin "baserom.gba", 0x170BB3, 0x9 -gMapScripts_SevenIsland_PokemonCenter_2F:: @ 8170BBC +SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 @@ -5610,16 +5610,16 @@ gMapScripts_SevenIsland_PokemonCenter_2F:: @ 8170BBC SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 .incbin "baserom.gba", 0x170BD1, 0x12 -gMapScripts_UnusedHouse_31_05:: @ 8170BE3 +UnusedHouse_31_05_MapScripts:: @ 8170BE3 .byte 0 -gMapScripts_SevenIsland_Harbor:: @ 8170BE4 +SevenIsland_Harbor_MapScripts:: @ 8170BE4 .byte 0 SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5 .incbin "baserom.gba", 0x170BE5, 0x13 -gMapScripts_OneIsland_PokemonCenter_1F:: @ 8170BF8 +OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D @@ -5668,7 +5668,7 @@ OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2 OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE .incbin "baserom.gba", 0x1711CE, 0x166 -gMapScripts_OneIsland_PokemonCenter_2F:: @ 8171334 +OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, OneIsland_PokemonCenter_2F_MapScript3_1BB237 @@ -5678,7 +5678,7 @@ gMapScripts_OneIsland_PokemonCenter_2F:: @ 8171334 OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 .incbin "baserom.gba", 0x171349, 0x12 -gMapScripts_OneIsland_House1:: @ 817135B +OneIsland_House1_MapScripts:: @ 817135B .byte 0 OneIsland_House1_EventScript_17135C:: @ 817135C @@ -5687,13 +5687,13 @@ OneIsland_House1_EventScript_17135C:: @ 817135C OneIsland_House1_EventScript_171365:: @ 8171365 .incbin "baserom.gba", 0x171365, 0x9 -gMapScripts_OneIsland_House2:: @ 817136E +OneIsland_House2_MapScripts:: @ 817136E .byte 0 OneIsland_House2_EventScript_17136F:: @ 817136F .incbin "baserom.gba", 0x17136F, 0x9 -gMapScripts_OneIsland_Harbor:: @ 8171378 +OneIsland_Harbor_MapScripts:: @ 8171378 map_script 4, OneIsland_Harbor_MapScript1_171383 map_script 2, OneIsland_Harbor_MapScript2_171392 .byte 0 @@ -5707,7 +5707,7 @@ OneIsland_Harbor_MapScript2_171392:: @ 8171392 OneIsland_Harbor_EventScript_1713BD:: @ 81713BD .incbin "baserom.gba", 0x1713BD, 0x13 -gMapScripts_TwoIsland_JoyfulGameCorner:: @ 81713D0 +TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5 map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404 map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B @@ -5732,13 +5732,13 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F TwoIsland_JoyfulGameCorner_EventScript_17160C:: @ 817160C .incbin "baserom.gba", 0x17160C, 0xC -gMapScripts_TwoIsland_House:: @ 8171618 +TwoIsland_House_MapScripts:: @ 8171618 .byte 0 TwoIsland_House_EventScript_171619:: @ 8171619 .incbin "baserom.gba", 0x171619, 0x19B -gMapScripts_TwoIsland_PokemonCenter_1F:: @ 81717B4 +TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 map_script 3, TwoIsland_PokemonCenter_1F_MapScript1_1717BF map_script 5, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -5755,7 +5755,7 @@ TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5 .incbin "baserom.gba", 0x1717D5, 0x9 -gMapScripts_TwoIsland_PokemonCenter_2F:: @ 81717DE +TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 @@ -5765,13 +5765,13 @@ gMapScripts_TwoIsland_PokemonCenter_2F:: @ 81717DE TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 .incbin "baserom.gba", 0x1717F3, 0x12 -gMapScripts_TwoIsland_Harbor:: @ 8171805 +TwoIsland_Harbor_MapScripts:: @ 8171805 .byte 0 TwoIsland_Harbor_EventScript_171806:: @ 8171806 .incbin "baserom.gba", 0x171806, 0x13 -gMapScripts_ThreeIsland_House1:: @ 8171819 +ThreeIsland_House1_MapScripts:: @ 8171819 .byte 0 ThreeIsland_House1_EventScript_17181A:: @ 817181A @@ -5780,7 +5780,7 @@ ThreeIsland_House1_EventScript_17181A:: @ 817181A ThreeIsland_House1_EventScript_171829:: @ 8171829 .incbin "baserom.gba", 0x171829, 0x9 -gMapScripts_ThreeIsland_PokemonCenter_1F:: @ 8171832 +ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -5800,7 +5800,7 @@ ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C .incbin "baserom.gba", 0x17185C, 0x9 -gMapScripts_ThreeIsland_PokemonCenter_2F:: @ 8171865 +ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 map_script 2, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 @@ -5810,7 +5810,7 @@ gMapScripts_ThreeIsland_PokemonCenter_2F:: @ 8171865 ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A .incbin "baserom.gba", 0x17187A, 0x12 -gMapScripts_ThreeIsland_Mart:: @ 817188C +ThreeIsland_Mart_MapScripts:: @ 817188C .byte 0 ThreeIsland_Mart_EventScript_17188D:: @ 817188D @@ -5825,7 +5825,7 @@ ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 .incbin "baserom.gba", 0x1718D6, 0x9 -gMapScripts_ThreeIsland_House2:: @ 81718DF +ThreeIsland_House2_MapScripts:: @ 81718DF .byte 0 ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 @@ -5834,13 +5834,13 @@ ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 .incbin "baserom.gba", 0x1718F9, 0x9 -gMapScripts_ThreeIsland_House3:: @ 8171902 +ThreeIsland_House3_MapScripts:: @ 8171902 .byte 0 ThreeIsland_House3_EventScript_171903:: @ 8171903 .incbin "baserom.gba", 0x171903, 0x9 -gMapScripts_ThreeIsland_House4:: @ 817190C +ThreeIsland_House4_MapScripts:: @ 817190C .byte 0 ThreeIsland_House4_EventScript_17190D:: @ 817190D @@ -5849,19 +5849,19 @@ ThreeIsland_House4_EventScript_17190D:: @ 817190D ThreeIsland_House4_EventScript_171916:: @ 8171916 .incbin "baserom.gba", 0x171916, 0x9 -gMapScripts_ThreeIsland_House5:: @ 817191F +ThreeIsland_House5_MapScripts:: @ 817191F .byte 0 ThreeIsland_House5_EventScript_171920:: @ 8171920 .incbin "baserom.gba", 0x171920, 0x1F -gMapScripts_FourIsland_PokemonDayCare:: @ 817193F +FourIsland_PokemonDayCare_MapScripts:: @ 817193F .byte 0 FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 .incbin "baserom.gba", 0x171940, 0x2AA -gMapScripts_FourIsland_PokemonCenter_1F:: @ 8171BEA +FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5 map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -5881,7 +5881,7 @@ FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 .incbin "baserom.gba", 0x171C14, 0x9 -gMapScripts_FourIsland_PokemonCenter_2F:: @ 8171C1D +FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D map_script 2, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, FourIsland_PokemonCenter_2F_MapScript3_1BB237 @@ -5891,13 +5891,13 @@ gMapScripts_FourIsland_PokemonCenter_2F:: @ 8171C1D FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 .incbin "baserom.gba", 0x171C32, 0x12 -gMapScripts_FourIsland_House1:: @ 8171C44 +FourIsland_House1_MapScripts:: @ 8171C44 .byte 0 FourIsland_House1_EventScript_171C45:: @ 8171C45 .incbin "baserom.gba", 0x171C45, 0x9 -gMapScripts_FourIsland_LoreleisHouse:: @ 8171C4E +FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54 .byte 0 @@ -5910,16 +5910,16 @@ FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D .incbin "baserom.gba", 0x171C8D, 0xB -gMapScripts_FourIsland_Harbor:: @ 8171C98 +FourIsland_Harbor_MapScripts:: @ 8171C98 .byte 0 FourIsland_Harbor_EventScript_171C99:: @ 8171C99 .incbin "baserom.gba", 0x171C99, 0x13 -gMapScripts_FourIsland_House2:: @ 8171CAC +FourIsland_House2_MapScripts:: @ 8171CAC .byte 0 -gMapScripts_FourIsland_Mart:: @ 8171CAD +FourIsland_Mart_MapScripts:: @ 8171CAD .byte 0 FourIsland_Mart_EventScript_171CAE:: @ 8171CAE @@ -5928,7 +5928,7 @@ FourIsland_Mart_EventScript_171CAE:: @ 8171CAE FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 .incbin "baserom.gba", 0x171CE8, 0x9 -gMapScripts_FiveIsland_PokemonCenter_1F:: @ 8171CF1 +FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 @@ -5945,7 +5945,7 @@ FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 .incbin "baserom.gba", 0x171D12, 0x9 -gMapScripts_FiveIsland_PokemonCenter_2F:: @ 8171D1B +FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 @@ -5955,25 +5955,25 @@ gMapScripts_FiveIsland_PokemonCenter_2F:: @ 8171D1B FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 .incbin "baserom.gba", 0x171D30, 0x12 -gMapScripts_FiveIsland_Harbor:: @ 8171D42 +FiveIsland_Harbor_MapScripts:: @ 8171D42 .byte 0 FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 .incbin "baserom.gba", 0x171D43, 0x13 -gMapScripts_FiveIsland_House1:: @ 8171D56 +FiveIsland_House1_MapScripts:: @ 8171D56 .byte 0 FiveIsland_House1_EventScript_171D57:: @ 8171D57 .incbin "baserom.gba", 0x171D57, 0x9 -gMapScripts_FiveIsland_House2:: @ 8171D60 +FiveIsland_House2_MapScripts:: @ 8171D60 .byte 0 FiveIsland_House2_EventScript_171D61:: @ 8171D61 .incbin "baserom.gba", 0x171D61, 0x9 -gMapScripts_SixIsland_PokemonCenter_1F:: @ 8171D6A +SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D @@ -5994,7 +5994,7 @@ SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 .incbin "baserom.gba", 0x171E17, 0x9 -gMapScripts_SixIsland_PokemonCenter_2F:: @ 8171E20 +SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 map_script 2, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 map_script 4, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED map_script 1, SixIsland_PokemonCenter_2F_MapScript3_1BB237 @@ -6004,19 +6004,19 @@ gMapScripts_SixIsland_PokemonCenter_2F:: @ 8171E20 SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 .incbin "baserom.gba", 0x171E35, 0x12 -gMapScripts_SixIsland_Harbor:: @ 8171E47 +SixIsland_Harbor_MapScripts:: @ 8171E47 .byte 0 SixIsland_Harbor_EventScript_171E48:: @ 8171E48 .incbin "baserom.gba", 0x171E48, 0x13 -gMapScripts_SixIsland_House:: @ 8171E5B +SixIsland_House_MapScripts:: @ 8171E5B .byte 0 SixIsland_House_EventScript_171E5C:: @ 8171E5C .incbin "baserom.gba", 0x171E5C, 0x9 -gMapScripts_SixIsland_Mart:: @ 8171E65 +SixIsland_Mart_MapScripts:: @ 8171E65 .byte 0 SixIsland_Mart_EventScript_171E66:: @ 8171E66 @@ -6025,13 +6025,13 @@ SixIsland_Mart_EventScript_171E66:: @ 8171E66 SixIsland_Mart_EventScript_171EA0:: @ 8171EA0 .incbin "baserom.gba", 0x171EA0, 0x9 -gMapScripts_ThreeIsland_Harbor:: @ 8171EA9 +ThreeIsland_Harbor_MapScripts:: @ 8171EA9 .byte 0 ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA .incbin "baserom.gba", 0x171EAA, 0x13 -gMapScripts_FiveIsland_ResortGorgeous_House:: @ 8171EBD +FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD .byte 0 FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE @@ -6040,10 +6040,10 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 .incbin "baserom.gba", 0x172062, 0x9 -gMapScripts_TwoIsland_CapeBrink_House:: @ 817206B +TwoIsland_CapeBrink_House_MapScripts:: @ 817206B .byte 0 -gMapScripts_SixIsland_WaterPath_House1:: @ 817206C +SixIsland_WaterPath_House1_MapScripts:: @ 817206C .byte 0 SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D @@ -6052,13 +6052,13 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 .incbin "baserom.gba", 0x172157, 0x21 -gMapScripts_SixIsland_WaterPath_House2:: @ 8172178 +SixIsland_WaterPath_House2_MapScripts:: @ 8172178 .byte 0 SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179 .incbin "baserom.gba", 0x172179, 0x9 -gMapScripts_SevenIsland_SevaultCanyon_House:: @ 8172182 +SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 .byte 0 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 diff --git a/data/map_events.s b/data/map_events.s index 1daa10e25..6dd7e88a1 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -14,7 +14,7 @@ UnknownMap_00_00_MapCoordEvents: coord_event 3, 5, 3, 0, 16384, 0, 0, UnknownMap_00_00_EventScript_1BB8C3 coord_event 10, 5, 3, 0, 16384, 0, 0, UnknownMap_00_00_EventScript_1BB8CF -gMapEvents_UnknownMap_00_00:: +UnknownMap_00_00_MapEvents:: map_events UnknownMap_00_00_EventObjects, UnknownMap_00_00_MapWarps, UnknownMap_00_00_MapCoordEvents, 0x0 UnknownMap_00_01_EventObjects: @@ -28,7 +28,7 @@ UnknownMap_00_01_MapCoordEvents: coord_event 4, 5, 3, 0, 16384, 0, 0, UnknownMap_00_01_EventScript_1BB950 coord_event 7, 5, 3, 0, 16384, 0, 0, UnknownMap_00_01_EventScript_1BB95C -gMapEvents_UnknownMap_00_01:: +UnknownMap_00_01_MapEvents:: map_events UnknownMap_00_01_EventObjects, UnknownMap_00_01_MapWarps, UnknownMap_00_01_MapCoordEvents, 0x0 UnknownMap_00_02_EventObjects: @@ -46,7 +46,7 @@ UnknownMap_00_02_MapCoordEvents: coord_event 13, 4, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 coord_event 13, 6, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 -gMapEvents_UnknownMap_00_02:: +UnknownMap_00_02_MapEvents:: map_events UnknownMap_00_02_EventObjects, UnknownMap_00_02_MapWarps, UnknownMap_00_02_MapCoordEvents, 0x0 @@ -62,7 +62,7 @@ UnknownMap_00_03_MapCoordEvents: coord_event 10, 4, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB8F8 coord_event 10, 6, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB932 -gMapEvents_UnknownMap_00_03:: +UnknownMap_00_03_MapEvents:: map_events 0x0, UnknownMap_00_03_MapWarps, UnknownMap_00_03_MapCoordEvents, 0x0 UnknownMap_00_04_EventObjects: @@ -79,7 +79,7 @@ UnknownMap_00_04_EventObjects: UnknownMap_00_04_MapWarps: warp_def 7, 11, 3, 127, 32639 -gMapEvents_UnknownMap_00_04:: +UnknownMap_00_04_MapEvents:: map_events UnknownMap_00_04_EventObjects, UnknownMap_00_04_MapWarps, 0x0, 0x0 ViridianForest_EventObjects: @@ -113,7 +113,7 @@ ViridianForest_MapBGEvents: bg_event 3, 22, 3, 7, 0, 13, 0, 1 bg_event 28, 57, 0, 7, 0, 14, 1, 1 -gMapEvents_ViridianForest:: +ViridianForest_MapEvents:: map_events ViridianForest_EventObjects, ViridianForest_MapWarps, 0x0, ViridianForest_MapBGEvents MtMoon_1F_EventObjects: @@ -141,7 +141,7 @@ MtMoon_1F_MapWarps: MtMoon_1F_MapBGEvents: bg_event 19, 26, 0, 0, 0, MtMoon_1F_EventScript_1605EE -gMapEvents_MtMoon_1F:: +MtMoon_1F_MapEvents:: map_events MtMoon_1F_EventObjects, MtMoon_1F_MapWarps, 0x0, MtMoon_1F_MapBGEvents @@ -163,7 +163,7 @@ MtMoon_B1F_MapBGEvents: bg_event 6, 12, 0, 7, 0, 104, 88, 1 bg_event 25, 34, 0, 7, 0, 104, 89, 1 -gMapEvents_MtMoon_B1F:: +MtMoon_B1F_MapEvents:: map_events 0x0, MtMoon_B1F_MapWarps, 0x0, MtMoon_B1F_MapBGEvents MtMoon_B2F_EventObjects: @@ -192,7 +192,7 @@ MtMoon_B2F_MapBGEvents: bg_event 20, 16, 3, 7, 0, 94, 2, 1 bg_event 39, 11, 3, 7, 0, 34, 3, 1 -gMapEvents_MtMoon_B2F:: +MtMoon_B2F_MapEvents:: map_events MtMoon_B2F_EventObjects, MtMoon_B2F_MapWarps, MtMoon_B2F_MapCoordEvents, MtMoon_B2F_MapBGEvents SSAnne_Exterior_EventObjects: @@ -208,7 +208,7 @@ SSAnne_Exterior_MapWarps: SSAnne_Exterior_MapBGEvents: bg_event 58, 28, 3, 7, 0, 38, 190, 1 -gMapEvents_SSAnne_Exterior:: +SSAnne_Exterior_MapEvents:: map_events SSAnne_Exterior_EventObjects, SSAnne_Exterior_MapWarps, 0x0, SSAnne_Exterior_MapBGEvents SSAnne_1F_Corridor_EventObjects: @@ -230,7 +230,7 @@ SSAnne_1F_Corridor_MapWarps: warp_def 23, 10, 3, 0, 273 warp_def 20, 10, 3, 0, 285 -gMapEvents_SSAnne_1F_Corridor:: +SSAnne_1F_Corridor_MapEvents:: map_events SSAnne_1F_Corridor_EventObjects, SSAnne_1F_Corridor_MapWarps, 0x0, 0x0 SSAnne_2F_Corridor_EventObjects: @@ -253,7 +253,7 @@ SSAnne_2F_Corridor_MapCoordEvents: coord_event 31, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608EB coord_event 32, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608F7 -gMapEvents_SSAnne_2F_Corridor:: +SSAnne_2F_Corridor_MapEvents:: map_events SSAnne_2F_Corridor_EventObjects, SSAnne_2F_Corridor_MapWarps, SSAnne_2F_Corridor_MapCoordEvents, 0x0 SSAnne_3F_Corridor_EventObjects: @@ -264,7 +264,7 @@ SSAnne_3F_Corridor_MapWarps: warp_def 18, 2, 3, 1, 262 warp_def 0, 5, 0, 0, 265 -gMapEvents_SSAnne_3F_Corridor:: +SSAnne_3F_Corridor_MapEvents:: map_events SSAnne_3F_Corridor_EventObjects, SSAnne_3F_Corridor_MapWarps, 0x0, 0x0 @@ -279,7 +279,7 @@ SSAnne_B1F_Corridor_MapWarps: SSAnne_B1F_Corridor_MapBGEvents: bg_event 21, 5, 3, 7, 0, 21, 8, 1 -gMapEvents_SSAnne_B1F_Corridor:: +SSAnne_B1F_Corridor_MapEvents:: map_events 0x0, SSAnne_B1F_Corridor_MapWarps, 0x0, SSAnne_B1F_Corridor_MapBGEvents SSAnne_Deck_EventObjects: @@ -293,7 +293,7 @@ SSAnne_Deck_MapWarps: warp_def 16, 8, 3, 0, 263 warp_def 16, 9, 3, 0, 263 -gMapEvents_SSAnne_Deck:: +SSAnne_Deck_MapEvents:: map_events SSAnne_Deck_EventObjects, SSAnne_Deck_MapWarps, 0x0, 0x0 SSAnne_Kitchen_EventObjects: @@ -314,7 +314,7 @@ SSAnne_Kitchen_MapBGEvents: bg_event 14, 4, 0, 7, 0, 135, 120, 1 bg_event 14, 6, 0, 7, 0, 133, 121, 1 -gMapEvents_SSAnne_Kitchen:: +SSAnne_Kitchen_MapEvents:: map_events SSAnne_Kitchen_EventObjects, SSAnne_Kitchen_MapWarps, 0x0, SSAnne_Kitchen_MapBGEvents SSAnne_CaptainsOffice_EventObjects: @@ -328,7 +328,7 @@ SSAnne_CaptainsOffice_MapBGEvents: bg_event 5, 3, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BC9 bg_event 2, 3, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BD2 -gMapEvents_SSAnne_CaptainsOffice:: +SSAnne_CaptainsOffice_MapEvents:: map_events SSAnne_CaptainsOffice_EventObjects, SSAnne_CaptainsOffice_MapWarps, 0x0, SSAnne_CaptainsOffice_MapBGEvents SSAnne_1F_Room1_EventObjects: @@ -337,7 +337,7 @@ SSAnne_1F_Room1_EventObjects: SSAnne_1F_Room1_MapWarps: warp_def 2, 1, 0, 6, 261 -gMapEvents_SSAnne_1F_Room1:: +SSAnne_1F_Room1_MapEvents:: map_events SSAnne_1F_Room1_EventObjects, SSAnne_1F_Room1_MapWarps, 0x0, 0x0 SSAnne_1F_Room2_EventObjects: @@ -349,7 +349,7 @@ SSAnne_1F_Room2_EventObjects: SSAnne_1F_Room2_MapWarps: warp_def 2, 1, 0, 7, 261 -gMapEvents_SSAnne_1F_Room2:: +SSAnne_1F_Room2_MapEvents:: map_events SSAnne_1F_Room2_EventObjects, SSAnne_1F_Room2_MapWarps, 0x0, 0x0 SSAnne_1F_Room3_EventObjects: @@ -360,7 +360,7 @@ SSAnne_1F_Room3_EventObjects: SSAnne_1F_Room3_MapWarps: warp_def 2, 1, 0, 8, 261 -gMapEvents_SSAnne_1F_Room3:: +SSAnne_1F_Room3_MapEvents:: map_events SSAnne_1F_Room3_EventObjects, SSAnne_1F_Room3_MapWarps, 0x0, 0x0 SSAnne_1F_Room4_EventObjects: @@ -369,7 +369,7 @@ SSAnne_1F_Room4_EventObjects: SSAnne_1F_Room4_MapWarps: warp_def 2, 1, 0, 9, 261 -gMapEvents_SSAnne_1F_Room4:: +SSAnne_1F_Room4_MapEvents:: map_events SSAnne_1F_Room4_EventObjects, SSAnne_1F_Room4_MapWarps, 0x0, 0x0 SSAnne_1F_Room5_EventObjects: @@ -378,7 +378,7 @@ SSAnne_1F_Room5_EventObjects: SSAnne_1F_Room5_MapWarps: warp_def 2, 1, 0, 10, 261 -gMapEvents_SSAnne_1F_Room5:: +SSAnne_1F_Room5_MapEvents:: map_events SSAnne_1F_Room5_EventObjects, SSAnne_1F_Room5_MapWarps, 0x0, 0x0 SSAnne_1F_Room7_EventObjects: @@ -387,7 +387,7 @@ SSAnne_1F_Room7_EventObjects: SSAnne_1F_Room7_MapWarps: warp_def 2, 1, 0, 11, 261 -gMapEvents_SSAnne_1F_Room7:: +SSAnne_1F_Room7_MapEvents:: map_events SSAnne_1F_Room7_EventObjects, SSAnne_1F_Room7_MapWarps, 0x0, 0x0 SSAnne_2F_Room1_EventObjects: @@ -396,7 +396,7 @@ SSAnne_2F_Room1_EventObjects: SSAnne_2F_Room1_MapWarps: warp_def 4, 7, 3, 3, 262 -gMapEvents_SSAnne_2F_Room1:: +SSAnne_2F_Room1_MapEvents:: map_events SSAnne_2F_Room1_EventObjects, SSAnne_2F_Room1_MapWarps, 0x0, 0x0 SSAnne_2F_Room2_EventObjects: @@ -407,7 +407,7 @@ SSAnne_2F_Room2_EventObjects: SSAnne_2F_Room2_MapWarps: warp_def 4, 7, 3, 4, 262 -gMapEvents_SSAnne_2F_Room2:: +SSAnne_2F_Room2_MapEvents:: map_events SSAnne_2F_Room2_EventObjects, SSAnne_2F_Room2_MapWarps, 0x0, 0x0 SSAnne_2F_Room3_EventObjects: @@ -417,7 +417,7 @@ SSAnne_2F_Room3_EventObjects: SSAnne_2F_Room3_MapWarps: warp_def 4, 7, 3, 5, 262 -gMapEvents_SSAnne_2F_Room3:: +SSAnne_2F_Room3_MapEvents:: map_events SSAnne_2F_Room3_EventObjects, SSAnne_2F_Room3_MapWarps, 0x0, 0x0 SSAnne_2F_Room4_EventObjects: @@ -428,7 +428,7 @@ SSAnne_2F_Room4_EventObjects: SSAnne_2F_Room4_MapWarps: warp_def 4, 7, 3, 6, 262 -gMapEvents_SSAnne_2F_Room4:: +SSAnne_2F_Room4_MapEvents:: map_events SSAnne_2F_Room4_EventObjects, SSAnne_2F_Room4_MapWarps, 0x0, 0x0 SSAnne_2F_Room5_EventObjects: @@ -438,7 +438,7 @@ SSAnne_2F_Room5_EventObjects: SSAnne_2F_Room5_MapWarps: warp_def 4, 7, 3, 7, 262 -gMapEvents_SSAnne_2F_Room5:: +SSAnne_2F_Room5_MapEvents:: map_events SSAnne_2F_Room5_EventObjects, SSAnne_2F_Room5_MapWarps, 0x0, 0x0 SSAnne_2F_Room6_EventObjects: @@ -448,7 +448,7 @@ SSAnne_2F_Room6_EventObjects: SSAnne_2F_Room6_MapWarps: warp_def 4, 7, 3, 8, 262 -gMapEvents_SSAnne_2F_Room6:: +SSAnne_2F_Room6_MapEvents:: map_events SSAnne_2F_Room6_EventObjects, SSAnne_2F_Room6_MapWarps, 0x0, 0x0 SSAnne_B1F_Room1_EventObjects: @@ -458,7 +458,7 @@ SSAnne_B1F_Room1_EventObjects: SSAnne_B1F_Room1_MapWarps: warp_def 4, 7, 3, 1, 264 -gMapEvents_SSAnne_B1F_Room1:: +SSAnne_B1F_Room1_MapEvents:: map_events SSAnne_B1F_Room1_EventObjects, SSAnne_B1F_Room1_MapWarps, 0x0, 0x0 SSAnne_B1F_Room2_EventObjects: @@ -468,7 +468,7 @@ SSAnne_B1F_Room2_EventObjects: SSAnne_B1F_Room2_MapWarps: warp_def 4, 7, 3, 2, 264 -gMapEvents_SSAnne_B1F_Room2:: +SSAnne_B1F_Room2_MapEvents:: map_events SSAnne_B1F_Room2_EventObjects, SSAnne_B1F_Room2_MapWarps, 0x0, 0x0 SSAnne_B1F_Room3_EventObjects: @@ -478,7 +478,7 @@ SSAnne_B1F_Room3_EventObjects: SSAnne_B1F_Room3_MapWarps: warp_def 4, 7, 3, 3, 264 -gMapEvents_SSAnne_B1F_Room3:: +SSAnne_B1F_Room3_MapEvents:: map_events SSAnne_B1F_Room3_EventObjects, SSAnne_B1F_Room3_MapWarps, 0x0, 0x0 SSAnne_B1F_Room4_EventObjects: @@ -488,7 +488,7 @@ SSAnne_B1F_Room4_EventObjects: SSAnne_B1F_Room4_MapWarps: warp_def 4, 7, 3, 4, 264 -gMapEvents_SSAnne_B1F_Room4:: +SSAnne_B1F_Room4_MapEvents:: map_events SSAnne_B1F_Room4_EventObjects, SSAnne_B1F_Room4_MapWarps, 0x0, 0x0 SSAnne_B1F_Room5_EventObjects: @@ -499,7 +499,7 @@ SSAnne_B1F_Room5_EventObjects: SSAnne_B1F_Room5_MapWarps: warp_def 4, 7, 3, 5, 264 -gMapEvents_SSAnne_B1F_Room5:: +SSAnne_B1F_Room5_MapEvents:: map_events SSAnne_B1F_Room5_EventObjects, SSAnne_B1F_Room5_MapWarps, 0x0, 0x0 SSAnne_1F_Room6_EventObjects: @@ -508,7 +508,7 @@ SSAnne_1F_Room6_EventObjects: SSAnne_1F_Room6_MapWarps: warp_def 2, 1, 0, 12, 261 -gMapEvents_SSAnne_1F_Room6:: +SSAnne_1F_Room6_MapEvents:: map_events SSAnne_1F_Room6_EventObjects, SSAnne_1F_Room6_MapWarps, 0x0, 0x0 UndergroundPath_NorthEntrance_EventObjects: @@ -520,7 +520,7 @@ UndergroundPath_NorthEntrance_MapWarps: warp_def 7, 8, 3, 0, 791 warp_def 7, 4, 3, 0, 287 -gMapEvents_UndergroundPath_NorthEntrance:: +UndergroundPath_NorthEntrance_MapEvents:: map_events UndergroundPath_NorthEntrance_EventObjects, UndergroundPath_NorthEntrance_MapWarps, 0x0, 0x0 @@ -537,7 +537,7 @@ UndergroundPath_NorthSouthTunnel_MapBGEvents: bg_event 3, 15, 3, 7, 0, 18, 72, 1 bg_event 3, 39, 3, 7, 0, 34, 76, 1 -gMapEvents_UndergroundPath_NorthSouthTunnel:: +UndergroundPath_NorthSouthTunnel_MapEvents:: map_events 0x0, UndergroundPath_NorthSouthTunnel_MapWarps, 0x0, UndergroundPath_NorthSouthTunnel_MapBGEvents UndergroundPath_SouthEntrance_EventObjects: @@ -549,7 +549,7 @@ UndergroundPath_SouthEntrance_MapWarps: warp_def 7, 8, 3, 0, 792 warp_def 7, 4, 3, 1, 287 -gMapEvents_UndergroundPath_SouthEntrance:: +UndergroundPath_SouthEntrance_MapEvents:: map_events UndergroundPath_SouthEntrance_EventObjects, UndergroundPath_SouthEntrance_MapWarps, 0x0, 0x0 UndergroundPath_WestEntrance_EventObjects: @@ -561,7 +561,7 @@ UndergroundPath_WestEntrance_MapWarps: warp_def 7, 8, 3, 0, 793 warp_def 7, 4, 3, 1, 290 -gMapEvents_UndergroundPath_WestEntrance:: +UndergroundPath_WestEntrance_MapEvents:: map_events UndergroundPath_WestEntrance_EventObjects, UndergroundPath_WestEntrance_MapWarps, 0x0, 0x0 @@ -578,7 +578,7 @@ UndergroundPath_EastWestTunnel_MapBGEvents: bg_event 55, 2, 3, 7, 0, 34, 83, 1 bg_event 62, 5, 3, 7, 0, 14, 78, 1 -gMapEvents_UndergroundPath_EastWestTunnel:: +UndergroundPath_EastWestTunnel_MapEvents:: map_events 0x0, UndergroundPath_EastWestTunnel_MapWarps, 0x0, UndergroundPath_EastWestTunnel_MapBGEvents UndergroundPath_EastEntrance_EventObjects: @@ -590,7 +590,7 @@ UndergroundPath_EastEntrance_MapWarps: warp_def 7, 8, 3, 0, 794 warp_def 7, 4, 3, 0, 290 -gMapEvents_UndergroundPath_EastEntrance:: +UndergroundPath_EastEntrance_MapEvents:: map_events UndergroundPath_EastEntrance_EventObjects, UndergroundPath_EastEntrance_MapWarps, 0x0, 0x0 DiglettsCave_NorthEntrance_EventObjects: @@ -600,7 +600,7 @@ DiglettsCave_NorthEntrance_MapWarps: warp_def 6, 4, 3, 0, 293 warp_def 4, 6, 3, 3, 788 -gMapEvents_DiglettsCave_NorthEntrance:: +DiglettsCave_NorthEntrance_MapEvents:: map_events DiglettsCave_NorthEntrance_EventObjects, DiglettsCave_NorthEntrance_MapWarps, 0x0, 0x0 @@ -608,7 +608,7 @@ DiglettsCave_B1F_MapWarps: warp_def 3, 3, 3, 0, 292 warp_def 82, 71, 3, 1, 294 -gMapEvents_DiglettsCave_B1F:: +DiglettsCave_B1F_MapEvents:: map_events 0x0, DiglettsCave_B1F_MapWarps, 0x0, 0x0 DiglettsCave_SouthEntrance_EventObjects: @@ -618,7 +618,7 @@ DiglettsCave_SouthEntrance_MapWarps: warp_def 4, 6, 3, 0, 797 warp_def 6, 4, 3, 1, 293 -gMapEvents_DiglettsCave_SouthEntrance:: +DiglettsCave_SouthEntrance_MapEvents:: map_events DiglettsCave_SouthEntrance_EventObjects, DiglettsCave_SouthEntrance_MapWarps, 0x0, 0x0 VictoryRoad_1F_EventObjects: @@ -641,7 +641,7 @@ VictoryRoad_1F_MapBGEvents: bg_event 12, 12, 0, 7, 0, 2, 37, 1 bg_event 16, 1, 0, 7, 0, 19, 38, 1 -gMapEvents_VictoryRoad_1F:: +VictoryRoad_1F_MapEvents:: map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents VictoryRoad_2F_EventObjects: @@ -674,7 +674,7 @@ VictoryRoad_2F_MapCoordEvents: coord_event 2, 19, 3, 0, 16485, 99, 0, VictoryRoad_2F_EventScript_160FD5 coord_event 14, 19, 3, 0, 16486, 99, 0, VictoryRoad_2F_EventScript_161006 -gMapEvents_VictoryRoad_2F:: +VictoryRoad_2F_MapEvents:: map_events VictoryRoad_2F_EventObjects, VictoryRoad_2F_MapWarps, VictoryRoad_2F_MapCoordEvents, 0x0 VictoryRoad_3F_EventObjects: @@ -701,7 +701,7 @@ VictoryRoad_3F_MapWarps: VictoryRoad_3F_MapCoordEvents: coord_event 7, 7, 3, 0, 16487, 99, 0, VictoryRoad_3F_EventScript_1610CF -gMapEvents_VictoryRoad_3F:: +VictoryRoad_3F_MapEvents:: map_events VictoryRoad_3F_EventObjects, VictoryRoad_3F_MapWarps, VictoryRoad_3F_MapCoordEvents, 0x0 RocketHideout_B1F_EventObjects: @@ -724,7 +724,7 @@ RocketHideout_B1F_MapWarps: RocketHideout_B1F_MapBGEvents: bg_event 16, 17, 0, 7, 0, 69, 11, 1 -gMapEvents_RocketHideout_B1F:: +RocketHideout_B1F_MapEvents:: map_events RocketHideout_B1F_EventObjects, RocketHideout_B1F_MapWarps, 0x0, RocketHideout_B1F_MapBGEvents RocketHideout_B2F_EventObjects: @@ -741,7 +741,7 @@ RocketHideout_B2F_MapWarps: warp_def 28, 16, 0, 1, 302 warp_def 29, 16, 0, 1, 302 -gMapEvents_RocketHideout_B2F:: +RocketHideout_B2F_MapEvents:: map_events RocketHideout_B2F_EventObjects, RocketHideout_B2F_MapWarps, 0x0, 0x0 RocketHideout_B3F_EventObjects: @@ -758,7 +758,7 @@ RocketHideout_B3F_MapWarps: RocketHideout_B3F_MapBGEvents: bg_event 1, 3, 3, 7, 0, 110, 12, 1 -gMapEvents_RocketHideout_B3F:: +RocketHideout_B3F_MapEvents:: map_events RocketHideout_B3F_EventObjects, RocketHideout_B3F_MapWarps, 0x0, RocketHideout_B3F_MapBGEvents RocketHideout_B4F_EventObjects: @@ -781,7 +781,7 @@ RocketHideout_B4F_MapBGEvents: bg_event 22, 6, 3, 7, 0, 8, 13, 1 bg_event 16, 6, 3, 7, 0, 6, 134, 1 -gMapEvents_RocketHideout_B4F:: +RocketHideout_B4F_MapEvents:: map_events RocketHideout_B4F_EventObjects, RocketHideout_B4F_MapWarps, 0x0, RocketHideout_B4F_MapBGEvents @@ -792,7 +792,7 @@ RocketHideout_Elevator_MapWarps: RocketHideout_Elevator_MapBGEvents: bg_event 0, 2, 0, 0, 0, RocketHideout_Elevator_EventScript_1614D9 -gMapEvents_RocketHideout_Elevator:: +RocketHideout_Elevator_MapEvents:: map_events 0x0, RocketHideout_Elevator_MapWarps, 0x0, RocketHideout_Elevator_MapBGEvents SilphCo_1F_EventObjects: @@ -808,7 +808,7 @@ SilphCo_1F_MapWarps: SilphCo_1F_MapBGEvents: bg_event 30, 1, 0, 0, 0, SilphCo_1F_EventScript_161638 -gMapEvents_SilphCo_1F:: +SilphCo_1F_MapEvents:: map_events SilphCo_1F_EventObjects, SilphCo_1F_MapWarps, 0x0, SilphCo_1F_MapBGEvents SilphCo_2F_EventObjects: @@ -839,7 +839,7 @@ SilphCo_2F_MapBGEvents: bg_event 11, 21, 0, 7, 0, 2, 135, 1 bg_event 29, 1, 0, 0, 0, SilphCo_2F_EventScript_161660 -gMapEvents_SilphCo_2F:: +SilphCo_2F_MapEvents:: map_events SilphCo_2F_EventObjects, SilphCo_2F_MapWarps, 0x0, SilphCo_2F_MapBGEvents SilphCo_3F_EventObjects: @@ -872,7 +872,7 @@ SilphCo_3F_MapBGEvents: bg_event 34, 18, 0, 7, 0, 64, 136, 1 bg_event 29, 1, 0, 0, 0, SilphCo_3F_EventScript_1616FF -gMapEvents_SilphCo_3F:: +SilphCo_3F_MapEvents:: map_events SilphCo_3F_EventObjects, SilphCo_3F_MapWarps, 0x0, SilphCo_3F_MapBGEvents SilphCo_4F_EventObjects: @@ -906,7 +906,7 @@ SilphCo_4F_MapBGEvents: bg_event 35, 20, 0, 7, 0, 65, 137, 1 bg_event 29, 1, 0, 0, 0, SilphCo_4F_EventScript_161770 -gMapEvents_SilphCo_4F:: +SilphCo_4F_MapEvents:: map_events SilphCo_4F_EventObjects, SilphCo_4F_MapWarps, 0x0, SilphCo_4F_MapBGEvents SilphCo_5F_EventObjects: @@ -949,7 +949,7 @@ SilphCo_5F_MapBGEvents: bg_event 32, 9, 0, 7, 0, 69, 138, 1 bg_event 29, 1, 0, 0, 0, SilphCo_5F_EventScript_16181C -gMapEvents_SilphCo_5F:: +SilphCo_5F_MapEvents:: map_events SilphCo_5F_EventObjects, SilphCo_5F_MapWarps, 0x0, SilphCo_5F_MapBGEvents SilphCo_6F_EventObjects: @@ -979,7 +979,7 @@ SilphCo_6F_MapBGEvents: bg_event 1, 8, 0, 7, 0, 66, 139, 1 bg_event 25, 1, 0, 0, 0, SilphCo_6F_EventScript_161936 -gMapEvents_SilphCo_6F:: +SilphCo_6F_MapEvents:: map_events SilphCo_6F_EventObjects, SilphCo_6F_MapWarps, 0x0, SilphCo_6F_MapBGEvents SilphCo_7F_EventObjects: @@ -1023,7 +1023,7 @@ SilphCo_7F_MapBGEvents: bg_event 22, 11, 0, 7, 0, 70, 140, 1 bg_event 20, 1, 0, 0, 0, SilphCo_7F_EventScript_161BFA -gMapEvents_SilphCo_7F:: +SilphCo_7F_MapEvents:: map_events SilphCo_7F_EventObjects, SilphCo_7F_MapWarps, SilphCo_7F_MapCoordEvents, SilphCo_7F_MapBGEvents SilphCo_8F_EventObjects: @@ -1051,7 +1051,7 @@ SilphCo_8F_MapBGEvents: bg_event 29, 10, 0, 7, 0, 110, 141, 1 bg_event 27, 1, 0, 0, 0, SilphCo_8F_EventScript_161C90 -gMapEvents_SilphCo_8F:: +SilphCo_8F_MapEvents:: map_events SilphCo_8F_EventObjects, SilphCo_8F_MapWarps, 0x0, SilphCo_8F_MapBGEvents SilphCo_9F_EventObjects: @@ -1088,7 +1088,7 @@ SilphCo_9F_MapBGEvents: bg_event 5, 8, 0, 7, 0, 67, 142, 1 bg_event 17, 1, 0, 0, 0, SilphCo_9F_EventScript_161D38 -gMapEvents_SilphCo_9F:: +SilphCo_9F_MapEvents:: map_events SilphCo_9F_EventObjects, SilphCo_9F_MapWarps, 0x0, SilphCo_9F_MapBGEvents SilphCo_10F_EventObjects: @@ -1115,7 +1115,7 @@ SilphCo_10F_MapBGEvents: bg_event 9, 9, 0, 7, 0, 63, 143, 1 bg_event 7, 1, 0, 0, 0, SilphCo_10F_EventScript_161DB7 -gMapEvents_SilphCo_10F:: +SilphCo_10F_MapEvents:: map_events SilphCo_10F_EventObjects, SilphCo_10F_MapWarps, 0x0, SilphCo_10F_MapBGEvents SilphCo_11F_EventObjects: @@ -1143,7 +1143,7 @@ SilphCo_11F_MapBGEvents: bg_event 10, 18, 0, 7, 0, 24, 144, 1 bg_event 8, 1, 0, 0, 0, SilphCo_11F_EventScript_161F37 -gMapEvents_SilphCo_11F:: +SilphCo_11F_MapEvents:: map_events SilphCo_11F_EventObjects, SilphCo_11F_MapWarps, SilphCo_11F_MapCoordEvents, SilphCo_11F_MapBGEvents @@ -1153,7 +1153,7 @@ SilphCo_Elevator_MapWarps: SilphCo_Elevator_MapBGEvents: bg_event 0, 2, 3, 0, 0, SilphCo_Elevator_EventScript_161F6F -gMapEvents_SilphCo_Elevator:: +SilphCo_Elevator_MapEvents:: map_events 0x0, SilphCo_Elevator_MapWarps, 0x0, SilphCo_Elevator_MapBGEvents PokemonMansion_1F_EventObjects: @@ -1179,7 +1179,7 @@ PokemonMansion_1F_MapBGEvents: bg_event 5, 5, 0, 1, 0, PokemonMansion_1F_EventScript_162212 bg_event 2, 21, 0, 7, 0, 94, 31, 1 -gMapEvents_PokemonMansion_1F:: +PokemonMansion_1F_MapEvents:: map_events PokemonMansion_1F_EventObjects, PokemonMansion_1F_MapWarps, 0x0, PokemonMansion_1F_MapBGEvents PokemonMansion_2F_EventObjects: @@ -1200,7 +1200,7 @@ PokemonMansion_2F_MapBGEvents: bg_event 6, 31, 0, 0, 0, PokemonMansion_2F_EventScript_162281 bg_event 25, 4, 0, 0, 0, PokemonMansion_2F_EventScript_162278 -gMapEvents_PokemonMansion_2F:: +PokemonMansion_2F_MapEvents:: map_events PokemonMansion_2F_EventObjects, PokemonMansion_2F_MapWarps, 0x0, PokemonMansion_2F_MapBGEvents PokemonMansion_3F_EventObjects: @@ -1224,7 +1224,7 @@ PokemonMansion_3F_MapBGEvents: bg_event 12, 5, 0, 1, 0, PokemonMansion_3F_EventScript_1622B1 bg_event 36, 13, 3, 7, 0, 68, 32, 1 -gMapEvents_PokemonMansion_3F:: +PokemonMansion_3F_MapEvents:: map_events PokemonMansion_3F_EventObjects, PokemonMansion_3F_MapWarps, 0x0, PokemonMansion_3F_MapBGEvents PokemonMansion_B1F_EventObjects: @@ -1244,7 +1244,7 @@ PokemonMansion_B1F_MapBGEvents: bg_event 27, 5, 0, 1, 0, PokemonMansion_B1F_EventScript_16230C bg_event 35, 5, 3, 7, 0, 36, 33, 1 -gMapEvents_PokemonMansion_B1F:: +PokemonMansion_B1F_MapEvents:: map_events PokemonMansion_B1F_EventObjects, PokemonMansion_B1F_MapWarps, 0x0, PokemonMansion_B1F_MapBGEvents SafariZone_Center_EventObjects: @@ -1271,7 +1271,7 @@ SafariZone_Center_MapBGEvents: bg_event 27, 15, 3, 7, 0, 98, 22, 1 bg_event 33, 20, 0, 0, 0, SafariZone_Center_EventScript_162373 -gMapEvents_SafariZone_Center:: +SafariZone_Center_MapEvents:: map_events SafariZone_Center_EventObjects, SafariZone_Center_MapWarps, 0x0, SafariZone_Center_MapBGEvents SafariZone_East_EventObjects: @@ -1294,7 +1294,7 @@ SafariZone_East_MapBGEvents: bg_event 43, 15, 0, 0, 0, SafariZone_East_EventScript_16237D bg_event 17, 8, 0, 0, 0, SafariZone_East_EventScript_162386 -gMapEvents_SafariZone_East:: +SafariZone_East_MapEvents:: map_events SafariZone_East_EventObjects, SafariZone_East_MapWarps, 0x0, SafariZone_East_MapBGEvents SafariZone_North_EventObjects: @@ -1324,7 +1324,7 @@ SafariZone_North_MapBGEvents: bg_event 34, 28, 0, 0, 0, SafariZone_North_EventScript_1623BD bg_event 44, 9, 0, 0, 0, SafariZone_North_EventScript_162399 -gMapEvents_SafariZone_North:: +SafariZone_North_MapEvents:: map_events SafariZone_North_EventObjects, SafariZone_North_MapWarps, 0x0, SafariZone_North_MapBGEvents SafariZone_West_EventObjects: @@ -1353,7 +1353,7 @@ SafariZone_West_MapBGEvents: bg_event 22, 19, 0, 0, 0, SafariZone_West_EventScript_1623C7 bg_event 13, 11, 3, 7, 0, 24, 23, 1 -gMapEvents_SafariZone_West:: +SafariZone_West_MapEvents:: map_events SafariZone_West_EventObjects, SafariZone_West_MapWarps, 0x0, SafariZone_West_MapBGEvents SafariZone_Building1_EventObjects: @@ -1365,7 +1365,7 @@ SafariZone_Building1_MapWarps: warp_def 4, 9, 3, 12, 319 warp_def 5, 9, 3, 12, 319 -gMapEvents_SafariZone_Building1:: +SafariZone_Building1_MapEvents:: map_events SafariZone_Building1_EventObjects, SafariZone_Building1_MapWarps, 0x0, 0x0 SafariZone_Building2_EventObjects: @@ -1378,7 +1378,7 @@ SafariZone_Building2_MapWarps: warp_def 4, 9, 3, 6, 320 warp_def 5, 9, 3, 6, 320 -gMapEvents_SafariZone_Building2:: +SafariZone_Building2_MapEvents:: map_events SafariZone_Building2_EventObjects, SafariZone_Building2_MapWarps, 0x0, 0x0 SafariZone_Building3_EventObjects: @@ -1392,7 +1392,7 @@ SafariZone_Building3_MapWarps: warp_def 4, 9, 3, 12, 321 warp_def 5, 9, 3, 12, 321 -gMapEvents_SafariZone_Building3:: +SafariZone_Building3_MapEvents:: map_events SafariZone_Building3_EventObjects, SafariZone_Building3_MapWarps, 0x0, 0x0 SafariZone_Building4_EventObjects: @@ -1405,7 +1405,7 @@ SafariZone_Building4_MapWarps: warp_def 4, 9, 3, 10, 322 warp_def 5, 9, 3, 10, 322 -gMapEvents_SafariZone_Building4:: +SafariZone_Building4_MapEvents:: map_events SafariZone_Building4_EventObjects, SafariZone_Building4_MapWarps, 0x0, 0x0 SafariZone_SecretHouse_EventObjects: @@ -1416,7 +1416,7 @@ SafariZone_SecretHouse_MapWarps: warp_def 4, 9, 3, 9, 322 warp_def 5, 9, 3, 9, 322 -gMapEvents_SafariZone_SecretHouse:: +SafariZone_SecretHouse_MapEvents:: map_events SafariZone_SecretHouse_EventObjects, SafariZone_SecretHouse_MapWarps, 0x0, 0x0 CeruleanCave_1F_EventObjects: @@ -1443,7 +1443,7 @@ CeruleanCave_1F_MapWarps: CeruleanCave_1F_MapBGEvents: bg_event 12, 2, 3, 7, 0, 2, 39, 1 -gMapEvents_CeruleanCave_1F:: +CeruleanCave_1F_MapEvents:: map_events CeruleanCave_1F_EventObjects, CeruleanCave_1F_MapWarps, 0x0, CeruleanCave_1F_MapBGEvents CeruleanCave_2F_EventObjects: @@ -1469,7 +1469,7 @@ CeruleanCave_2F_MapWarps: warp_def 23, 10, 3, 6, 328 warp_def 5, 6, 3, 7, 328 -gMapEvents_CeruleanCave_2F:: +CeruleanCave_2F_MapEvents:: map_events CeruleanCave_2F_EventObjects, CeruleanCave_2F_MapWarps, 0x0, 0x0 CeruleanCave_B1F_EventObjects: @@ -1489,7 +1489,7 @@ CeruleanCave_B1F_EventObjects: CeruleanCave_B1F_MapWarps: warp_def 5, 7, 3, 2, 328 -gMapEvents_CeruleanCave_B1F:: +CeruleanCave_B1F_MapEvents:: map_events CeruleanCave_B1F_EventObjects, CeruleanCave_B1F_MapWarps, 0x0, 0x0 PokemonLeague_LoreleisRoom_EventObjects: @@ -1499,7 +1499,7 @@ PokemonLeague_LoreleisRoom_MapWarps: warp_def 6, 12, 0, 1, 3328 warp_def 6, 2, 0, 0, 332 -gMapEvents_PokemonLeague_LoreleisRoom:: +PokemonLeague_LoreleisRoom_MapEvents:: map_events PokemonLeague_LoreleisRoom_EventObjects, PokemonLeague_LoreleisRoom_MapWarps, 0x0, 0x0 PokemonLeague_BrunosRoom_EventObjects: @@ -1509,7 +1509,7 @@ PokemonLeague_BrunosRoom_MapWarps: warp_def 6, 12, 0, 1, 331 warp_def 6, 2, 0, 0, 333 -gMapEvents_PokemonLeague_BrunosRoom:: +PokemonLeague_BrunosRoom_MapEvents:: map_events PokemonLeague_BrunosRoom_EventObjects, PokemonLeague_BrunosRoom_MapWarps, 0x0, 0x0 PokemonLeague_AgathasRoom_EventObjects: @@ -1519,7 +1519,7 @@ PokemonLeague_AgathasRoom_MapWarps: warp_def 6, 12, 0, 1, 332 warp_def 6, 2, 0, 0, 334 -gMapEvents_PokemonLeague_AgathasRoom:: +PokemonLeague_AgathasRoom_MapEvents:: map_events PokemonLeague_AgathasRoom_EventObjects, PokemonLeague_AgathasRoom_MapWarps, 0x0, 0x0 PokemonLeague_LancesRoom_EventObjects: @@ -1529,7 +1529,7 @@ PokemonLeague_LancesRoom_MapWarps: warp_def 23, 13, 3, 1, 333 warp_def 6, 5, 0, 0, 335 -gMapEvents_PokemonLeague_LancesRoom:: +PokemonLeague_LancesRoom_MapEvents:: map_events PokemonLeague_LancesRoom_EventObjects, PokemonLeague_LancesRoom_MapWarps, 0x0, 0x0 PokemonLeague_ChampionsRoom_EventObjects: @@ -1540,7 +1540,7 @@ PokemonLeague_ChampionsRoom_MapWarps: warp_def 6, 19, 3, 1, 334 warp_def 6, 2, 3, 0, 336 -gMapEvents_PokemonLeague_ChampionsRoom:: +PokemonLeague_ChampionsRoom_MapEvents:: map_events PokemonLeague_ChampionsRoom_EventObjects, PokemonLeague_ChampionsRoom_MapWarps, 0x0, 0x0 PokemonLeague_HallOfFame_EventObjects: @@ -1549,7 +1549,7 @@ PokemonLeague_HallOfFame_EventObjects: PokemonLeague_HallOfFame_MapWarps: warp_def 5, 12, 3, 1, 335 -gMapEvents_PokemonLeague_HallOfFame:: +PokemonLeague_HallOfFame_MapEvents:: map_events PokemonLeague_HallOfFame_EventObjects, PokemonLeague_HallOfFame_MapWarps, 0x0, 0x0 RockTunnel_1F_EventObjects: @@ -1575,7 +1575,7 @@ RockTunnel_1F_MapWarps: RockTunnel_1F_MapBGEvents: bg_event 14, 33, 3, 0, 0, RockTunnel_1F_EventScript_162DE0 -gMapEvents_RockTunnel_1F:: +RockTunnel_1F_MapEvents:: map_events RockTunnel_1F_EventObjects, RockTunnel_1F_MapWarps, 0x0, RockTunnel_1F_MapBGEvents RockTunnel_B1F_EventObjects: @@ -1612,7 +1612,7 @@ RockTunnel_B1F_MapWarps: warp_def 27, 12, 3, 3, 337 warp_def 2, 3, 3, 4, 337 -gMapEvents_RockTunnel_B1F:: +RockTunnel_B1F_MapEvents:: map_events RockTunnel_B1F_EventObjects, RockTunnel_B1F_MapWarps, 0x0, 0x0 SeafoamIslands_1F_EventObjects: @@ -1629,7 +1629,7 @@ SeafoamIslands_1F_MapWarps: warp_def 21, 8, 3, 9, 340 warp_def 30, 8, 3, 10, 340 -gMapEvents_SeafoamIslands_1F:: +SeafoamIslands_1F_MapEvents:: map_events SeafoamIslands_1F_EventObjects, SeafoamIslands_1F_MapWarps, 0x0, 0x0 SeafoamIslands_B1F_EventObjects: @@ -1651,7 +1651,7 @@ SeafoamIslands_B1F_MapWarps: warp_def 21, 8, 3, 5, 339 warp_def 29, 8, 3, 6, 339 -gMapEvents_SeafoamIslands_B1F:: +SeafoamIslands_B1F_MapEvents:: map_events SeafoamIslands_B1F_EventObjects, SeafoamIslands_B1F_MapWarps, 0x0, 0x0 SeafoamIslands_B2F_EventObjects: @@ -1672,7 +1672,7 @@ SeafoamIslands_B2F_MapWarps: warp_def 24, 8, 3, 5, 342 warp_def 27, 8, 3, 6, 342 -gMapEvents_SeafoamIslands_B2F:: +SeafoamIslands_B2F_MapEvents:: map_events SeafoamIslands_B2F_EventObjects, SeafoamIslands_B2F_MapWarps, 0x0, 0x0 SeafoamIslands_B3F_EventObjects: @@ -1697,7 +1697,7 @@ SeafoamIslands_B3F_MapWarps: SeafoamIslands_B3F_MapBGEvents: bg_event 5, 12, 0, 7, 0, 110, 29, 1 -gMapEvents_SeafoamIslands_B3F:: +SeafoamIslands_B3F_MapEvents:: map_events SeafoamIslands_B3F_EventObjects, SeafoamIslands_B3F_MapWarps, 0x0, SeafoamIslands_B3F_MapBGEvents SeafoamIslands_B4F_EventObjects: @@ -1722,7 +1722,7 @@ SeafoamIslands_B4F_MapBGEvents: bg_event 30, 2, 0, 0, 0, SeafoamIslands_B4F_EventScript_16322C bg_event 14, 18, 0, 0, 0, SeafoamIslands_B4F_EventScript_163223 -gMapEvents_SeafoamIslands_B4F:: +SeafoamIslands_B4F_MapEvents:: map_events SeafoamIslands_B4F_EventObjects, SeafoamIslands_B4F_MapWarps, SeafoamIslands_B4F_MapCoordEvents, SeafoamIslands_B4F_MapBGEvents PokemonTower_1F_EventObjects: @@ -1738,7 +1738,7 @@ PokemonTower_1F_MapWarps: warp_def 12, 19, 3, 0, 772 warp_def 18, 9, 3, 1, 345 -gMapEvents_PokemonTower_1F:: +PokemonTower_1F_MapEvents:: map_events PokemonTower_1F_EventObjects, PokemonTower_1F_MapWarps, 0x0, 0x0 PokemonTower_2F_EventObjects: @@ -1753,7 +1753,7 @@ PokemonTower_2F_MapCoordEvents: coord_event 17, 5, 3, 0, 16477, 0, 0, PokemonTower_2F_EventScript_16328F coord_event 16, 6, 3, 0, 16477, 0, 0, PokemonTower_2F_EventScript_16329B -gMapEvents_PokemonTower_2F:: +PokemonTower_2F_MapEvents:: map_events PokemonTower_2F_EventObjects, PokemonTower_2F_MapWarps, PokemonTower_2F_MapCoordEvents, 0x0 PokemonTower_3F_EventObjects: @@ -1766,7 +1766,7 @@ PokemonTower_3F_MapWarps: warp_def 4, 10, 3, 0, 345 warp_def 18, 10, 3, 1, 347 -gMapEvents_PokemonTower_3F:: +PokemonTower_3F_MapEvents:: map_events PokemonTower_3F_EventObjects, PokemonTower_3F_MapWarps, 0x0, 0x0 PokemonTower_4F_EventObjects: @@ -1781,7 +1781,7 @@ PokemonTower_4F_MapWarps: warp_def 4, 10, 3, 0, 348 warp_def 18, 10, 3, 1, 346 -gMapEvents_PokemonTower_4F:: +PokemonTower_4F_MapEvents:: map_events PokemonTower_4F_EventObjects, PokemonTower_4F_MapWarps, 0x0, 0x0 PokemonTower_5F_EventObjects: @@ -1819,7 +1819,7 @@ PokemonTower_5F_MapCoordEvents: PokemonTower_5F_MapBGEvents: bg_event 7, 3, 3, 7, 0, 104, 14, 1 -gMapEvents_PokemonTower_5F:: +PokemonTower_5F_MapEvents:: map_events PokemonTower_5F_EventObjects, PokemonTower_5F_MapWarps, PokemonTower_5F_MapCoordEvents, PokemonTower_5F_MapBGEvents PokemonTower_6F_EventObjects: @@ -1837,7 +1837,7 @@ PokemonTower_6F_MapCoordEvents: coord_event 11, 15, 3, 0, 16473, 0, 0, PokemonTower_6F_EventScript_1634B8 coord_event 12, 16, 3, 0, 16473, 0, 0, PokemonTower_6F_EventScript_1634B8 -gMapEvents_PokemonTower_6F:: +PokemonTower_6F_MapEvents:: map_events PokemonTower_6F_EventObjects, PokemonTower_6F_MapWarps, PokemonTower_6F_MapCoordEvents, 0x0 PokemonTower_7F_EventObjects: @@ -1852,7 +1852,7 @@ PokemonTower_7F_MapWarps: PokemonTower_7F_MapBGEvents: bg_event 11, 4, 3, 7, 0, 184, 159, 129 -gMapEvents_PokemonTower_7F:: +PokemonTower_7F_MapEvents:: map_events PokemonTower_7F_EventObjects, PokemonTower_7F_MapWarps, 0x0, PokemonTower_7F_MapBGEvents PowerPlant_EventObjects: @@ -1876,7 +1876,7 @@ PowerPlant_MapBGEvents: bg_event 29, 16, 3, 7, 0, 37, 27, 1 bg_event 8, 12, 3, 7, 0, 96, 28, 1 -gMapEvents_PowerPlant:: +PowerPlant_MapEvents:: map_events PowerPlant_EventObjects, PowerPlant_MapWarps, 0x0, PowerPlant_MapBGEvents @@ -1912,7 +1912,7 @@ MtEmber_RubyPath_B4F_MapBGEvents: bg_event 9, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B bg_event 8, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B -gMapEvents_MtEmber_RubyPath_B4F:: +MtEmber_RubyPath_B4F_MapEvents:: map_events 0x0, MtEmber_RubyPath_B4F_MapWarps, 0x0, MtEmber_RubyPath_B4F_MapBGEvents MtEmber_Exterior_EventObjects: @@ -1954,7 +1954,7 @@ MtEmber_Exterior_MapBGEvents: bg_event 18, 17, 0, 7, 0, 95, 158, 1 bg_event 8, 30, 3, 7, 0, 2, 162, 1 -gMapEvents_MtEmber_Exterior:: +MtEmber_Exterior_MapEvents:: map_events MtEmber_Exterior_EventObjects, MtEmber_Exterior_MapWarps, MtEmber_Exterior_MapCoordEvents, MtEmber_Exterior_MapBGEvents @@ -1962,7 +1962,7 @@ MtEmber_SummitPath_1F_MapWarps: warp_def 2, 15, 0, 2, 353 warp_def 11, 1, 0, 0, 355 -gMapEvents_MtEmber_SummitPath_1F:: +MtEmber_SummitPath_1F_MapEvents:: map_events 0x0, MtEmber_SummitPath_1F_MapWarps, 0x0, 0x0 MtEmber_SummitPath_2F_EventObjects: @@ -1980,7 +1980,7 @@ MtEmber_SummitPath_2F_MapWarps: warp_def 8, 39, 0, 1, 354 warp_def 39, 6, 3, 0, 356 -gMapEvents_MtEmber_SummitPath_2F:: +MtEmber_SummitPath_2F_MapEvents:: map_events MtEmber_SummitPath_2F_EventObjects, MtEmber_SummitPath_2F_MapWarps, 0x0, 0x0 @@ -1988,7 +1988,7 @@ MtEmber_SummitPath_3F_MapWarps: warp_def 2, 4, 0, 1, 355 warp_def 11, 8, 0, 3, 353 -gMapEvents_MtEmber_SummitPath_3F:: +MtEmber_SummitPath_3F_MapEvents:: map_events 0x0, MtEmber_SummitPath_3F_MapWarps, 0x0, 0x0 MtEmber_Summit_EventObjects: @@ -2001,7 +2001,7 @@ MtEmber_Summit_EventObjects: MtEmber_Summit_MapWarps: warp_def 9, 15, 0, 4, 353 -gMapEvents_MtEmber_Summit:: +MtEmber_Summit_MapEvents:: map_events MtEmber_Summit_EventObjects, MtEmber_Summit_MapWarps, 0x0, 0x0 MtEmber_RubyPath_B5F_EventObjects: @@ -2013,7 +2013,7 @@ MtEmber_RubyPath_B5F_MapWarps: MtEmber_RubyPath_B5F_MapBGEvents: bg_event 7, 2, 0, 1, 0, MtEmber_RubyPath_B5F_EventScript_163BAB -gMapEvents_MtEmber_RubyPath_B5F:: +MtEmber_RubyPath_B5F_MapEvents:: map_events MtEmber_RubyPath_B5F_EventObjects, MtEmber_RubyPath_B5F_MapWarps, 0x0, MtEmber_RubyPath_B5F_MapBGEvents SSAnne_Kitchen3_EventObjects: @@ -2028,7 +2028,7 @@ SSAnne_Kitchen3_MapWarps: warp_def 1, 1, 0, 0, 360 warp_def 24, 5, 0, 1, 364 -gMapEvents_SSAnne_Kitchen3:: +SSAnne_Kitchen3_MapEvents:: map_events SSAnne_Kitchen3_EventObjects, SSAnne_Kitchen3_MapWarps, 0x0, 0x0 MtEmber_RubyPath_B1F_EventObjects: @@ -2041,7 +2041,7 @@ MtEmber_RubyPath_B1F_MapWarps: warp_def 9, 21, 0, 1, 359 warp_def 6, 1, 0, 0, 361 -gMapEvents_MtEmber_RubyPath_B1F:: +MtEmber_RubyPath_B1F_MapEvents:: map_events MtEmber_RubyPath_B1F_EventObjects, MtEmber_RubyPath_B1F_MapWarps, 0x0, 0x0 MtEmber_RubyPath_B2F_EventObjects: @@ -2057,7 +2057,7 @@ MtEmber_RubyPath_B2F_MapWarps: warp_def 1, 7, 3, 1, 360 warp_def 13, 9, 3, 0, 362 -gMapEvents_MtEmber_RubyPath_B2F:: +MtEmber_RubyPath_B2F_MapEvents:: map_events MtEmber_RubyPath_B2F_EventObjects, MtEmber_RubyPath_B2F_MapWarps, 0x0, 0x0 MtEmber_RubyPath_B3F_EventObjects: @@ -2077,7 +2077,7 @@ MtEmber_RubyPath_B3F_MapWarps: warp_def 19, 19, 3, 0, 363 warp_def 5, 19, 3, 1, 352 -gMapEvents_MtEmber_RubyPath_B3F:: +MtEmber_RubyPath_B3F_MapEvents:: map_events MtEmber_RubyPath_B3F_EventObjects, MtEmber_RubyPath_B3F_MapWarps, 0x0, 0x0 MtEmber_RubyPath_B1F_Stairs_EventObjects: @@ -2087,7 +2087,7 @@ MtEmber_RubyPath_B1F_Stairs_MapWarps: warp_def 4, 1, 0, 1, 362 warp_def 1, 5, 0, 0, 364 -gMapEvents_MtEmber_RubyPath_B1F_Stairs:: +MtEmber_RubyPath_B1F_Stairs_MapEvents:: map_events MtEmber_RubyPath_B1F_Stairs_EventObjects, MtEmber_RubyPath_B1F_Stairs_MapWarps, 0x0, 0x0 MtEmber_RubyPath_B2F_Stairs_EventObjects: @@ -2098,7 +2098,7 @@ MtEmber_RubyPath_B2F_Stairs_MapWarps: warp_def 6, 1, 0, 1, 363 warp_def 1, 4, 0, 2, 359 -gMapEvents_MtEmber_RubyPath_B2F_Stairs:: +MtEmber_RubyPath_B2F_Stairs_MapEvents:: map_events MtEmber_RubyPath_B2F_Stairs_EventObjects, MtEmber_RubyPath_B2F_Stairs_MapWarps, 0x0, 0x0 ThreeIsland_BerryForest_EventObjects: @@ -2139,7 +2139,7 @@ ThreeIsland_BerryForest_MapBGEvents: bg_event 43, 16, 3, 7, 0, 152, 101, 1 bg_event 8, 5, 3, 7, 0, 141, 102, 1 -gMapEvents_ThreeIsland_BerryForest:: +ThreeIsland_BerryForest_MapEvents:: map_events ThreeIsland_BerryForest_EventObjects, ThreeIsland_BerryForest_MapWarps, 0x0, ThreeIsland_BerryForest_MapBGEvents @@ -2148,7 +2148,7 @@ FourIsland_IcefallCave_Entrance_MapWarps: warp_def 10, 21, 3, 0, 367 warp_def 9, 7, 3, 1, 367 -gMapEvents_FourIsland_IcefallCave_Entrance:: +FourIsland_IcefallCave_Entrance_MapEvents:: map_events 0x0, FourIsland_IcefallCave_Entrance_MapWarps, 0x0, 0x0 FourIsland_IcefallCave_1F_EventObjects: @@ -2163,7 +2163,7 @@ FourIsland_IcefallCave_1F_MapWarps: warp_def 15, 16, 3, 2, 368 warp_def 3, 6, 3, 0, 369 -gMapEvents_FourIsland_IcefallCave_1F:: +FourIsland_IcefallCave_1F_MapEvents:: map_events FourIsland_IcefallCave_1F_EventObjects, FourIsland_IcefallCave_1F_MapWarps, 0x0, 0x0 SSAnne_CaptainsOffice2_EventObjects: @@ -2175,7 +2175,7 @@ SSAnne_CaptainsOffice2_MapWarps: warp_def 12, 3, 3, 3, 367 warp_def 15, 16, 3, 4, 367 -gMapEvents_SSAnne_CaptainsOffice2:: +SSAnne_CaptainsOffice2_MapEvents:: map_events SSAnne_CaptainsOffice2_EventObjects, SSAnne_CaptainsOffice2_MapWarps, 0x0, 0x0 SSAnne_CaptainsOffice3_EventObjects: @@ -2192,7 +2192,7 @@ SSAnne_CaptainsOffice3_MapCoordEvents: coord_event 12, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 coord_event 13, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 -gMapEvents_SSAnne_CaptainsOffice3:: +SSAnne_CaptainsOffice3_MapEvents:: map_events SSAnne_CaptainsOffice3_EventObjects, SSAnne_CaptainsOffice3_MapWarps, SSAnne_CaptainsOffice3_MapCoordEvents, 0x0 SSAnne_CaptainsOffice4_EventObjects: @@ -2242,7 +2242,7 @@ SSAnne_CaptainsOffice4_MapBGEvents: bg_event 2, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A bg_event 3, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A -gMapEvents_SSAnne_CaptainsOffice4:: +SSAnne_CaptainsOffice4_MapEvents:: map_events SSAnne_CaptainsOffice4_EventObjects, SSAnne_CaptainsOffice4_MapWarps, SSAnne_CaptainsOffice4_MapCoordEvents, SSAnne_CaptainsOffice4_MapBGEvents @@ -2252,7 +2252,7 @@ SSAnne_CaptainsOffice5_MapWarps: warp_def 13, 5, 3, 0, 376 warp_def 6, 7, 3, 2, 372 -gMapEvents_SSAnne_CaptainsOffice5:: +SSAnne_CaptainsOffice5_MapEvents:: map_events 0x0, SSAnne_CaptainsOffice5_MapWarps, 0x0, 0x0 @@ -2266,7 +2266,7 @@ SixIsland_DottedHole_B1F_MapWarps: SixIsland_DottedHole_B1F_MapBGEvents: bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B1F_EventScript_16418C -gMapEvents_SixIsland_DottedHole_B1F:: +SixIsland_DottedHole_B1F_MapEvents:: map_events 0x0, SixIsland_DottedHole_B1F_MapWarps, 0x0, SixIsland_DottedHole_B1F_MapBGEvents @@ -2280,7 +2280,7 @@ SixIsland_DottedHole_B2F_MapWarps: SixIsland_DottedHole_B2F_MapBGEvents: bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B2F_EventScript_1641A7 -gMapEvents_SixIsland_DottedHole_B2F:: +SixIsland_DottedHole_B2F_MapEvents:: map_events 0x0, SixIsland_DottedHole_B2F_MapWarps, 0x0, SixIsland_DottedHole_B2F_MapBGEvents @@ -2294,7 +2294,7 @@ SixIsland_DottedHole_B3F_MapWarps: SixIsland_DottedHole_B3F_MapBGEvents: bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B3F_EventScript_16419E -gMapEvents_SixIsland_DottedHole_B3F:: +SixIsland_DottedHole_B3F_MapEvents:: map_events 0x0, SixIsland_DottedHole_B3F_MapWarps, 0x0, SixIsland_DottedHole_B3F_MapBGEvents @@ -2308,7 +2308,7 @@ SSAnne_CaptainsOffice9_MapWarps: SSAnne_CaptainsOffice9_MapBGEvents: bg_event 6, 5, 0, 1, 0, SSAnne_CaptainsOffice9_EventScript_164195 -gMapEvents_SSAnne_CaptainsOffice9:: +SSAnne_CaptainsOffice9_MapEvents:: map_events 0x0, SSAnne_CaptainsOffice9_MapWarps, 0x0, SSAnne_CaptainsOffice9_MapBGEvents SixIsland_DottedHole_SapphireRoom_EventObjects: @@ -2322,7 +2322,7 @@ SixIsland_DottedHole_SapphireRoom_MapWarps: SixIsland_DottedHole_SapphireRoom_MapBGEvents: bg_event 7, 2, 0, 1, 0, SixIsland_DottedHole_SapphireRoom_EventScript_16441F -gMapEvents_SixIsland_DottedHole_SapphireRoom:: +SixIsland_DottedHole_SapphireRoom_MapEvents:: map_events SixIsland_DottedHole_SapphireRoom_EventObjects, SixIsland_DottedHole_SapphireRoom_MapWarps, 0x0, SixIsland_DottedHole_SapphireRoom_MapBGEvents SSAnne_1F_Room11_EventObjects: @@ -2347,14 +2347,14 @@ SSAnne_1F_Room11_MapWarps: warp_def 4, 26, 3, 2, 827 warp_def 5, 26, 3, 3, 827 -gMapEvents_SSAnne_1F_Room11:: +SSAnne_1F_Room11_MapEvents:: map_events SSAnne_1F_Room11_EventObjects, SSAnne_1F_Room11_MapWarps, 0x0, 0x0 SSAnne_1F_Room12_MapWarps: warp_def 18, 22, 3, 0, 826 -gMapEvents_SSAnne_1F_Room12:: +SSAnne_1F_Room12_MapEvents:: map_events 0x0, SSAnne_1F_Room12_MapWarps, 0x0, 0x0 @@ -2362,7 +2362,7 @@ NavelRock_Exterior_MapWarps: warp_def 9, 8, 3, 1, 548 warp_def 9, 16, 3, 0, 571 -gMapEvents_NavelRock_Exterior:: +NavelRock_Exterior_MapEvents:: map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 SevenIsland_TrainerTower_1F_EventObjects: @@ -2381,7 +2381,7 @@ SevenIsland_TrainerTower_1F_MapCoordEvents: coord_event 9, 12, 0, 0, 16399, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54B4 coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54EA -gMapEvents_SevenIsland_TrainerTower_1F:: +SevenIsland_TrainerTower_1F_MapEvents:: map_events SevenIsland_TrainerTower_1F_EventObjects, SevenIsland_TrainerTower_1F_MapWarps, SevenIsland_TrainerTower_1F_MapCoordEvents, 0x0 SevenIsland_TrainerTower_2F_EventObjects: @@ -2401,7 +2401,7 @@ SevenIsland_TrainerTower_2F_MapCoordEvents: coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54B4 coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54EA -gMapEvents_SevenIsland_TrainerTower_2F:: +SevenIsland_TrainerTower_2F_MapEvents:: map_events SevenIsland_TrainerTower_2F_EventObjects, SevenIsland_TrainerTower_2F_MapWarps, SevenIsland_TrainerTower_2F_MapCoordEvents, 0x0 SevenIsland_TrainerTower_3F_EventObjects: @@ -2421,7 +2421,7 @@ SevenIsland_TrainerTower_3F_MapCoordEvents: coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54B4 coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54EA -gMapEvents_SevenIsland_TrainerTower_3F:: +SevenIsland_TrainerTower_3F_MapEvents:: map_events SevenIsland_TrainerTower_3F_EventObjects, SevenIsland_TrainerTower_3F_MapWarps, SevenIsland_TrainerTower_3F_MapCoordEvents, 0x0 SevenIsland_TrainerTower_4F_EventObjects: @@ -2441,7 +2441,7 @@ SevenIsland_TrainerTower_4F_MapCoordEvents: coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54B4 coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54EA -gMapEvents_SevenIsland_TrainerTower_4F:: +SevenIsland_TrainerTower_4F_MapEvents:: map_events SevenIsland_TrainerTower_4F_EventObjects, SevenIsland_TrainerTower_4F_MapWarps, SevenIsland_TrainerTower_4F_MapCoordEvents, 0x0 SevenIsland_TrainerTower_5F_EventObjects: @@ -2461,7 +2461,7 @@ SevenIsland_TrainerTower_5F_MapCoordEvents: coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54B4 coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54EA -gMapEvents_SevenIsland_TrainerTower_5F:: +SevenIsland_TrainerTower_5F_MapEvents:: map_events SevenIsland_TrainerTower_5F_EventObjects, SevenIsland_TrainerTower_5F_MapWarps, SevenIsland_TrainerTower_5F_MapCoordEvents, 0x0 SevenIsland_TrainerTower_6F_EventObjects: @@ -2481,7 +2481,7 @@ SevenIsland_TrainerTower_6F_MapCoordEvents: coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54B4 coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54EA -gMapEvents_SevenIsland_TrainerTower_6F:: +SevenIsland_TrainerTower_6F_MapEvents:: map_events SevenIsland_TrainerTower_6F_EventObjects, SevenIsland_TrainerTower_6F_MapWarps, SevenIsland_TrainerTower_6F_MapCoordEvents, 0x0 SevenIsland_TrainerTower_7F_EventObjects: @@ -2501,7 +2501,7 @@ SevenIsland_TrainerTower_7F_MapCoordEvents: coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54B4 coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54EA -gMapEvents_SevenIsland_TrainerTower_7F:: +SevenIsland_TrainerTower_7F_MapEvents:: map_events SevenIsland_TrainerTower_7F_EventObjects, SevenIsland_TrainerTower_7F_MapWarps, SevenIsland_TrainerTower_7F_MapCoordEvents, 0x0 SevenIsland_TrainerTower_8F_EventObjects: @@ -2521,7 +2521,7 @@ SevenIsland_TrainerTower_8F_MapCoordEvents: coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54B4 coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54EA -gMapEvents_SevenIsland_TrainerTower_8F:: +SevenIsland_TrainerTower_8F_MapEvents:: map_events SevenIsland_TrainerTower_8F_EventObjects, SevenIsland_TrainerTower_8F_MapWarps, SevenIsland_TrainerTower_8F_MapCoordEvents, 0x0 SevenIsland_TrainerTower_Roof_EventObjects: @@ -2531,7 +2531,7 @@ SevenIsland_TrainerTower_Roof_MapWarps: warp_def 13, 5, 0, 0, 523 warp_def 4, 6, 3, 0, 520 -gMapEvents_SevenIsland_TrainerTower_Roof:: +SevenIsland_TrainerTower_Roof_MapEvents:: map_events SevenIsland_TrainerTower_Roof_EventObjects, SevenIsland_TrainerTower_Roof_MapWarps, 0x0, 0x0 SevenIsland_TrainerTower_Lobby_EventObjects: @@ -2552,7 +2552,7 @@ SevenIsland_TrainerTower_Lobby_MapCoordEvents: SevenIsland_TrainerTower_Lobby_MapBGEvents: bg_event 8, 10, 0, 1, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AD8 -gMapEvents_SevenIsland_TrainerTower_Lobby:: +SevenIsland_TrainerTower_Lobby_MapEvents:: map_events SevenIsland_TrainerTower_Lobby_EventObjects, SevenIsland_TrainerTower_Lobby_MapWarps, SevenIsland_TrainerTower_Lobby_MapCoordEvents, SevenIsland_TrainerTower_Lobby_MapBGEvents @@ -2562,7 +2562,7 @@ SevenIsland_TrainerTower_Elevator_MapWarps: SevenIsland_TrainerTower_Elevator_MapBGEvents: bg_event 0, 2, 0, 0, 0, SevenIsland_TrainerTower_Elevator_EventScript_164B03 -gMapEvents_SevenIsland_TrainerTower_Elevator:: +SevenIsland_TrainerTower_Elevator_MapEvents:: map_events 0x0, SevenIsland_TrainerTower_Elevator_MapWarps, 0x0, SevenIsland_TrainerTower_Elevator_MapBGEvents @@ -2570,7 +2570,7 @@ FiveIsland_LostCave_Entrance_MapWarps: warp_def 5, 8, 3, 0, 822 warp_def 5, 5, 3, 0, 525 -gMapEvents_FiveIsland_LostCave_Entrance:: +FiveIsland_LostCave_Entrance_MapEvents:: map_events 0x0, FiveIsland_LostCave_Entrance_MapWarps, 0x0, 0x0 FiveIsland_LostCave_Room1_EventObjects: @@ -2583,7 +2583,7 @@ FiveIsland_LostCave_Room1_MapWarps: warp_def 5, 8, 3, 1, 525 warp_def 2, 5, 3, 2, 525 -gMapEvents_FiveIsland_LostCave_Room1:: +FiveIsland_LostCave_Room1_MapEvents:: map_events FiveIsland_LostCave_Room1_EventObjects, FiveIsland_LostCave_Room1_MapWarps, 0x0, 0x0 @@ -2593,7 +2593,7 @@ FiveIsland_LostCave_Room2_MapWarps: warp_def 5, 8, 3, 0, 535 warp_def 2, 5, 3, 2, 525 -gMapEvents_FiveIsland_LostCave_Room2:: +FiveIsland_LostCave_Room2_MapEvents:: map_events 0x0, FiveIsland_LostCave_Room2_MapWarps, 0x0, 0x0 @@ -2603,7 +2603,7 @@ FiveIsland_LostCave_Room3_MapWarps: warp_def 5, 8, 3, 0, 528 warp_def 2, 5, 3, 2, 525 -gMapEvents_FiveIsland_LostCave_Room3:: +FiveIsland_LostCave_Room3_MapEvents:: map_events 0x0, FiveIsland_LostCave_Room3_MapWarps, 0x0, 0x0 FiveIsland_LostCave_Room4_EventObjects: @@ -2615,7 +2615,7 @@ FiveIsland_LostCave_Room4_MapWarps: warp_def 5, 8, 3, 0, 529 warp_def 2, 5, 3, 2, 525 -gMapEvents_FiveIsland_LostCave_Room4:: +FiveIsland_LostCave_Room4_MapEvents:: map_events FiveIsland_LostCave_Room4_EventObjects, FiveIsland_LostCave_Room4_MapWarps, 0x0, 0x0 @@ -2625,7 +2625,7 @@ FiveIsland_LostCave_Room5_MapWarps: warp_def 5, 8, 3, 1, 525 warp_def 2, 5, 3, 2, 525 -gMapEvents_FiveIsland_LostCave_Room5:: +FiveIsland_LostCave_Room5_MapEvents:: map_events 0x0, FiveIsland_LostCave_Room5_MapWarps, 0x0, 0x0 @@ -2635,7 +2635,7 @@ FiveIsland_LostCave_Room6_MapWarps: warp_def 5, 8, 3, 1, 525 warp_def 2, 5, 3, 1, 531 -gMapEvents_FiveIsland_LostCave_Room6:: +FiveIsland_LostCave_Room6_MapEvents:: map_events 0x0, FiveIsland_LostCave_Room6_MapWarps, 0x0, 0x0 @@ -2645,7 +2645,7 @@ FiveIsland_LostCave_Room7_MapWarps: warp_def 5, 8, 3, 0, 532 warp_def 2, 5, 3, 2, 525 -gMapEvents_FiveIsland_LostCave_Room7:: +FiveIsland_LostCave_Room7_MapEvents:: map_events 0x0, FiveIsland_LostCave_Room7_MapWarps, 0x0, 0x0 @@ -2655,7 +2655,7 @@ FiveIsland_LostCave_Room8_MapWarps: warp_def 5, 8, 3, 1, 525 warp_def 2, 5, 3, 0, 538 -gMapEvents_FiveIsland_LostCave_Room8:: +FiveIsland_LostCave_Room8_MapEvents:: map_events 0x0, FiveIsland_LostCave_Room8_MapWarps, 0x0, 0x0 @@ -2665,7 +2665,7 @@ FiveIsland_LostCave_Room9_MapWarps: warp_def 5, 8, 3, 1, 525 warp_def 2, 5, 3, 2, 525 -gMapEvents_FiveIsland_LostCave_Room9:: +FiveIsland_LostCave_Room9_MapEvents:: map_events 0x0, FiveIsland_LostCave_Room9_MapWarps, 0x0, 0x0 FiveIsland_LostCave_Room10_EventObjects: @@ -2675,7 +2675,7 @@ FiveIsland_LostCave_Room10_EventObjects: FiveIsland_LostCave_Room10_MapWarps: warp_def 5, 8, 3, 1, 525 -gMapEvents_FiveIsland_LostCave_Room10:: +FiveIsland_LostCave_Room10_MapEvents:: map_events FiveIsland_LostCave_Room10_EventObjects, FiveIsland_LostCave_Room10_MapWarps, 0x0, 0x0 FiveIsland_LostCave_Room11_EventObjects: @@ -2684,7 +2684,7 @@ FiveIsland_LostCave_Room11_EventObjects: FiveIsland_LostCave_Room11_MapWarps: warp_def 5, 1, 3, 3, 525 -gMapEvents_FiveIsland_LostCave_Room11:: +FiveIsland_LostCave_Room11_MapEvents:: map_events FiveIsland_LostCave_Room11_EventObjects, FiveIsland_LostCave_Room11_MapWarps, 0x0, 0x0 FiveIsland_LostCave_Room12_EventObjects: @@ -2693,7 +2693,7 @@ FiveIsland_LostCave_Room12_EventObjects: FiveIsland_LostCave_Room12_MapWarps: warp_def 5, 8, 3, 1, 525 -gMapEvents_FiveIsland_LostCave_Room12:: +FiveIsland_LostCave_Room12_MapEvents:: map_events FiveIsland_LostCave_Room12_EventObjects, FiveIsland_LostCave_Room12_MapWarps, 0x0, 0x0 FiveIsland_LostCave_Room13_EventObjects: @@ -2702,7 +2702,7 @@ FiveIsland_LostCave_Room13_EventObjects: FiveIsland_LostCave_Room13_MapWarps: warp_def 2, 5, 3, 2, 525 -gMapEvents_FiveIsland_LostCave_Room13:: +FiveIsland_LostCave_Room13_MapEvents:: map_events FiveIsland_LostCave_Room13_EventObjects, FiveIsland_LostCave_Room13_MapWarps, 0x0, 0x0 FiveIsland_LostCave_Room14_EventObjects: @@ -2711,56 +2711,56 @@ FiveIsland_LostCave_Room14_EventObjects: FiveIsland_LostCave_Room14_MapWarps: warp_def 8, 5, 3, 4, 525 -gMapEvents_FiveIsland_LostCave_Room14:: +FiveIsland_LostCave_Room14_MapEvents:: map_events FiveIsland_LostCave_Room14_EventObjects, FiveIsland_LostCave_Room14_MapWarps, 0x0, 0x0 SevenIsland_TanobyRuins_MoneanChamber_MapWarps: warp_def 11, 15, 3, 0, 833 -gMapEvents_SevenIsland_TanobyRuins_MoneanChamber:: +SevenIsland_TanobyRuins_MoneanChamber_MapEvents:: map_events 0x0, SevenIsland_TanobyRuins_MoneanChamber_MapWarps, 0x0, 0x0 SevenIsland_TanobyRuins_LiptooChamber_MapWarps: warp_def 11, 15, 3, 1, 833 -gMapEvents_SevenIsland_TanobyRuins_LiptooChamber:: +SevenIsland_TanobyRuins_LiptooChamber_MapEvents:: map_events 0x0, SevenIsland_TanobyRuins_LiptooChamber_MapWarps, 0x0, 0x0 SevenIsland_TanobyRuins_WeepthChamber_MapWarps: warp_def 11, 15, 3, 2, 833 -gMapEvents_SevenIsland_TanobyRuins_WeepthChamber:: +SevenIsland_TanobyRuins_WeepthChamber_MapEvents:: map_events 0x0, SevenIsland_TanobyRuins_WeepthChamber_MapWarps, 0x0, 0x0 SevenIsland_TanobyRuins_DilfordChamber_MapWarps: warp_def 11, 15, 3, 3, 833 -gMapEvents_SevenIsland_TanobyRuins_DilfordChamber:: +SevenIsland_TanobyRuins_DilfordChamber_MapEvents:: map_events 0x0, SevenIsland_TanobyRuins_DilfordChamber_MapWarps, 0x0, 0x0 SevenIsland_TanobyRuins_ScufibChamber_MapWarps: warp_def 11, 15, 3, 4, 833 -gMapEvents_SevenIsland_TanobyRuins_ScufibChamber:: +SevenIsland_TanobyRuins_ScufibChamber_MapEvents:: map_events 0x0, SevenIsland_TanobyRuins_ScufibChamber_MapWarps, 0x0, 0x0 SevenIsland_TanobyRuins_RixyChamber_MapWarps: warp_def 11, 15, 3, 5, 833 -gMapEvents_SevenIsland_TanobyRuins_RixyChamber:: +SevenIsland_TanobyRuins_RixyChamber_MapEvents:: map_events 0x0, SevenIsland_TanobyRuins_RixyChamber_MapWarps, 0x0, 0x0 SevenIsland_TanobyRuins_ViapoisChamber_MapWarps: warp_def 11, 15, 3, 6, 833 -gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber:: +SevenIsland_TanobyRuins_ViapoisChamber_MapEvents:: map_events 0x0, SevenIsland_TanobyRuins_ViapoisChamber_MapWarps, 0x0, 0x0 ThreeIsland_DunsparceTunnel_EventObjects: @@ -2773,7 +2773,7 @@ ThreeIsland_DunsparceTunnel_MapWarps: ThreeIsland_DunsparceTunnel_MapBGEvents: bg_event 21, 3, 0, 7, 0, 110, 163, 1 -gMapEvents_ThreeIsland_DunsparceTunnel:: +ThreeIsland_DunsparceTunnel_MapEvents:: map_events ThreeIsland_DunsparceTunnel_EventObjects, ThreeIsland_DunsparceTunnel_MapWarps, 0x0, ThreeIsland_DunsparceTunnel_MapBGEvents SevenIsland_SeavaultCanyon_TanobyKey_EventObjects: @@ -2797,7 +2797,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapCoordEvents: coord_event 10, 4, 3, 0, 16387, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F coord_event 4, 4, 3, 0, 16386, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C -gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey:: +SevenIsland_SeavaultCanyon_TanobyKey_MapEvents:: map_events SevenIsland_SeavaultCanyon_TanobyKey_EventObjects, SevenIsland_SeavaultCanyon_TanobyKey_MapWarps, SevenIsland_SeavaultCanyon_TanobyKey_MapCoordEvents, 0x0 @@ -2805,7 +2805,7 @@ NavelRock_1F_MapWarps: warp_def 8, 4, 3, 0, 566 warp_def 8, 23, 3, 0, 512 -gMapEvents_NavelRock_1F:: +NavelRock_1F_MapEvents:: map_events 0x0, NavelRock_1F_MapWarps, 0x0, 0x0 NavelRock_Summit_EventObjects: @@ -2820,7 +2820,7 @@ NavelRock_Summit_MapCoordEvents: NavelRock_Summit_MapBGEvents: bg_event 9, 11, 3, 7, 0, 45, 160, 129 -gMapEvents_NavelRock_Summit:: +NavelRock_Summit_MapEvents:: map_events NavelRock_Summit_EventObjects, NavelRock_Summit_MapWarps, NavelRock_Summit_MapCoordEvents, NavelRock_Summit_MapBGEvents NavelRock_Base_EventObjects: @@ -2829,7 +2829,7 @@ NavelRock_Base_EventObjects: NavelRock_Base_MapWarps: warp_def 13, 20, 3, 1, 565 -gMapEvents_NavelRock_Base:: +NavelRock_Base_MapEvents:: map_events NavelRock_Base_EventObjects, NavelRock_Base_MapWarps, 0x0, 0x0 @@ -2837,7 +2837,7 @@ NavelRock_SummitPath_2F_MapWarps: warp_def 4, 4, 3, 1, 567 warp_def 2, 2, 3, 0, 552 -gMapEvents_NavelRock_SummitPath_2F:: +NavelRock_SummitPath_2F_MapEvents:: map_events 0x0, NavelRock_SummitPath_2F_MapWarps, 0x0, 0x0 @@ -2845,7 +2845,7 @@ NavelRock_SummitPath_3F_MapWarps: warp_def 2, 2, 3, 1, 551 warp_def 4, 4, 3, 0, 553 -gMapEvents_NavelRock_SummitPath_3F:: +NavelRock_SummitPath_3F_MapEvents:: map_events 0x0, NavelRock_SummitPath_3F_MapWarps, 0x0, 0x0 @@ -2853,7 +2853,7 @@ NavelRock_SummitPath_4F_MapWarps: warp_def 4, 4, 3, 1, 552 warp_def 2, 2, 3, 0, 554 -gMapEvents_NavelRock_SummitPath_4F:: +NavelRock_SummitPath_4F_MapEvents:: map_events 0x0, NavelRock_SummitPath_4F_MapWarps, 0x0, 0x0 @@ -2861,7 +2861,7 @@ NavelRock_SummitPath_5F_MapWarps: warp_def 2, 2, 3, 1, 553 warp_def 4, 4, 3, 0, 549 -gMapEvents_NavelRock_SummitPath_5F:: +NavelRock_SummitPath_5F_MapEvents:: map_events 0x0, NavelRock_SummitPath_5F_MapWarps, 0x0, 0x0 @@ -2869,7 +2869,7 @@ NavelRock_BasePath_B1F_MapWarps: warp_def 2, 2, 3, 2, 567 warp_def 4, 4, 3, 0, 556 -gMapEvents_NavelRock_BasePath_B1F:: +NavelRock_BasePath_B1F_MapEvents:: map_events 0x0, NavelRock_BasePath_B1F_MapWarps, 0x0, 0x0 @@ -2877,7 +2877,7 @@ NavelRock_BasePath_B2F_MapWarps: warp_def 4, 4, 3, 1, 555 warp_def 2, 2, 3, 0, 557 -gMapEvents_NavelRock_BasePath_B2F:: +NavelRock_BasePath_B2F_MapEvents:: map_events 0x0, NavelRock_BasePath_B2F_MapWarps, 0x0, 0x0 @@ -2885,7 +2885,7 @@ NavelRock_BasePath_B3F_MapWarps: warp_def 2, 2, 3, 1, 556 warp_def 4, 4, 3, 0, 558 -gMapEvents_NavelRock_BasePath_B3F:: +NavelRock_BasePath_B3F_MapEvents:: map_events 0x0, NavelRock_BasePath_B3F_MapWarps, 0x0, 0x0 @@ -2893,7 +2893,7 @@ NavelRock_BasePath_B4F_MapWarps: warp_def 4, 4, 3, 1, 557 warp_def 2, 2, 3, 0, 559 -gMapEvents_NavelRock_BasePath_B4F:: +NavelRock_BasePath_B4F_MapEvents:: map_events 0x0, NavelRock_BasePath_B4F_MapWarps, 0x0, 0x0 @@ -2901,7 +2901,7 @@ NavelRock_BasePath_B5F_MapWarps: warp_def 2, 2, 3, 1, 558 warp_def 4, 4, 3, 0, 560 -gMapEvents_NavelRock_BasePath_B5F:: +NavelRock_BasePath_B5F_MapEvents:: map_events 0x0, NavelRock_BasePath_B5F_MapWarps, 0x0, 0x0 @@ -2909,7 +2909,7 @@ NavelRock_BasePath_B6F_MapWarps: warp_def 4, 4, 3, 1, 559 warp_def 2, 2, 3, 0, 561 -gMapEvents_NavelRock_BasePath_B6F:: +NavelRock_BasePath_B6F_MapEvents:: map_events 0x0, NavelRock_BasePath_B6F_MapWarps, 0x0, 0x0 @@ -2917,7 +2917,7 @@ NavelRock_BasePath_B7F_MapWarps: warp_def 2, 2, 3, 1, 560 warp_def 4, 4, 3, 0, 562 -gMapEvents_NavelRock_BasePath_B7F:: +NavelRock_BasePath_B7F_MapEvents:: map_events 0x0, NavelRock_BasePath_B7F_MapWarps, 0x0, 0x0 @@ -2925,7 +2925,7 @@ NavelRock_BasePath_B8F_MapWarps: warp_def 4, 4, 3, 1, 561 warp_def 2, 2, 3, 0, 563 -gMapEvents_NavelRock_BasePath_B8F:: +NavelRock_BasePath_B8F_MapEvents:: map_events 0x0, NavelRock_BasePath_B8F_MapWarps, 0x0, 0x0 @@ -2933,7 +2933,7 @@ NavelRock_BasePath_B9F_MapWarps: warp_def 2, 2, 3, 1, 562 warp_def 4, 4, 3, 0, 564 -gMapEvents_NavelRock_BasePath_B9F:: +NavelRock_BasePath_B9F_MapEvents:: map_events 0x0, NavelRock_BasePath_B9F_MapWarps, 0x0, 0x0 @@ -2941,7 +2941,7 @@ NavelRock_BasePath_B10F_MapWarps: warp_def 4, 4, 3, 1, 563 warp_def 2, 2, 3, 0, 565 -gMapEvents_NavelRock_BasePath_B10F:: +NavelRock_BasePath_B10F_MapEvents:: map_events 0x0, NavelRock_BasePath_B10F_MapWarps, 0x0, 0x0 @@ -2949,7 +2949,7 @@ NavelRock_BasePath_B11F_MapWarps: warp_def 2, 2, 3, 1, 564 warp_def 4, 4, 3, 0, 550 -gMapEvents_NavelRock_BasePath_B11F:: +NavelRock_BasePath_B11F_MapEvents:: map_events 0x0, NavelRock_BasePath_B11F_MapWarps, 0x0, 0x0 @@ -2957,7 +2957,7 @@ NavelRock_B1F_MapWarps: warp_def 4, 2, 3, 0, 548 warp_def 11, 5, 3, 0, 567 -gMapEvents_NavelRock_B1F:: +NavelRock_B1F_MapEvents:: map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 @@ -2966,7 +2966,7 @@ NavelRock_Fork_MapWarps: warp_def 3, 1, 3, 0, 551 warp_def 26, 1, 3, 0, 555 -gMapEvents_NavelRock_Fork:: +NavelRock_Fork_MapEvents:: map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 BirthIsland_Exterior_EventObjects: @@ -2976,7 +2976,7 @@ BirthIsland_Exterior_EventObjects: BirthIsland_Exterior_MapWarps: warp_def 15, 24, 3, 0, 570 -gMapEvents_BirthIsland_Exterior:: +BirthIsland_Exterior_MapEvents:: map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 OneIsland_KindleRoad_EmberSpa_EventObjects: @@ -2993,7 +2993,7 @@ OneIsland_KindleRoad_EmberSpa_MapWarps: OneIsland_KindleRoad_EmberSpa_MapCoordEvents: coord_event 13, 13, 3, 0, 16385, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_1653CF -gMapEvents_OneIsland_KindleRoad_EmberSpa:: +OneIsland_KindleRoad_EmberSpa_MapEvents:: map_events OneIsland_KindleRoad_EmberSpa_EventObjects, OneIsland_KindleRoad_EmberSpa_MapWarps, OneIsland_KindleRoad_EmberSpa_MapCoordEvents, 0x0 BirthIsland_Harbor_EventObjects: @@ -3003,7 +3003,7 @@ BirthIsland_Harbor_EventObjects: BirthIsland_Harbor_MapWarps: warp_def 8, 2, 3, 0, 568 -gMapEvents_BirthIsland_Harbor:: +BirthIsland_Harbor_MapEvents:: map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 NavelRock_Harbor_EventObjects: @@ -3013,7 +3013,7 @@ NavelRock_Harbor_EventObjects: NavelRock_Harbor_MapWarps: warp_def 8, 2, 3, 1, 512 -gMapEvents_NavelRock_Harbor:: +NavelRock_Harbor_MapEvents:: map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 PalletTown_EventObjects: @@ -3038,7 +3038,7 @@ PalletTown_MapBGEvents: bg_event 9, 11, 0, 0, 0, PalletTown_EventScript_165862 bg_event 5, 14, 0, 0, 0, PalletTown_EventScript_16586B -gMapEvents_PalletTown:: +PalletTown_MapEvents:: map_events PalletTown_EventObjects, PalletTown_MapWarps, PalletTown_MapCoordEvents, PalletTown_MapBGEvents ViridianCity_EventObjects: @@ -3072,7 +3072,7 @@ ViridianCity_MapBGEvents: bg_event 20, 16, 0, 0, 0, ViridianCity_EventScript_165994 bg_event 36, 10, 0, 0, 0, ViridianCity_EventScript_1659B8 -gMapEvents_ViridianCity:: +ViridianCity_MapEvents:: map_events ViridianCity_EventObjects, ViridianCity_MapWarps, ViridianCity_MapCoordEvents, ViridianCity_MapBGEvents PewterCity_EventObjects: @@ -3110,7 +3110,7 @@ PewterCity_MapBGEvents: bg_event 31, 25, 0, 0, 0, PewterCity_EventScript_1662A0 bg_event 6, 3, 3, 7, 0, 4, 112, 1 -gMapEvents_PewterCity:: +PewterCity_MapEvents:: map_events PewterCity_EventObjects, PewterCity_MapWarps, PewterCity_MapCoordEvents, PewterCity_MapBGEvents CeruleanCity_EventObjects: @@ -3160,7 +3160,7 @@ CeruleanCity_MapBGEvents: bg_event 11, 27, 0, 0, 0, CeruleanCity_EventScript_16AC94 bg_event 11, 26, 0, 0, 0, CeruleanCity_EventScript_16AC94 -gMapEvents_CeruleanCity:: +CeruleanCity_MapEvents:: map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents LavenderTown_EventObjects: @@ -3182,7 +3182,7 @@ LavenderTown_MapBGEvents: bg_event 21, 7, 0, 0, 0, LavenderTown_EventScript_1668D3 bg_event 7, 11, 0, 0, 0, LavenderTown_EventScript_1668CA -gMapEvents_LavenderTown:: +LavenderTown_MapEvents:: map_events LavenderTown_EventObjects, LavenderTown_MapWarps, 0x0, LavenderTown_MapBGEvents VermilionCity_EventObjects: @@ -3221,7 +3221,7 @@ VermilionCity_MapBGEvents: bg_event 45, 17, 3, 0, 0, VermilionCity_EventScript_166C5C bg_event 14, 11, 3, 7, 0, 35, 48, 1 -gMapEvents_VermilionCity:: +VermilionCity_MapEvents:: map_events VermilionCity_EventObjects, VermilionCity_MapWarps, VermilionCity_MapCoordEvents, VermilionCity_MapBGEvents CeladonCity_EventObjects: @@ -3267,7 +3267,7 @@ CeladonCity_MapBGEvents: bg_event 16, 31, 0, 0, 0, CeladonCity_EventScript_166D30 bg_event 55, 20, 3, 7, 0, 69, 47, 1 -gMapEvents_CeladonCity:: +CeladonCity_MapEvents:: map_events CeladonCity_EventObjects, CeladonCity_MapWarps, 0x0, CeladonCity_MapBGEvents FuchsiaCity_EventObjects: @@ -3315,7 +3315,7 @@ FuchsiaCity_MapBGEvents: bg_event 22, 7, 0, 0, 0, FuchsiaCity_EventScript_166DEC bg_event 33, 26, 3, 7, 0, 25, 133, 1 -gMapEvents_FuchsiaCity:: +FuchsiaCity_MapEvents:: map_events FuchsiaCity_EventObjects, FuchsiaCity_MapWarps, 0x0, FuchsiaCity_MapBGEvents CinnabarIsland_EventObjects: @@ -3340,7 +3340,7 @@ CinnabarIsland_MapBGEvents: bg_event 22, 5, 0, 0, 0, CinnabarIsland_EventScript_167223 bg_event 10, 9, 0, 0, 0, CinnabarIsland_EventScript_16721A -gMapEvents_CinnabarIsland:: +CinnabarIsland_MapEvents:: map_events CinnabarIsland_EventObjects, CinnabarIsland_MapWarps, CinnabarIsland_MapCoordEvents, CinnabarIsland_MapBGEvents IndigoPlateau_Exterior_EventObjects: @@ -3350,7 +3350,7 @@ IndigoPlateau_Exterior_EventObjects: IndigoPlateau_Exterior_MapWarps: warp_def 11, 6, 0, 0, 3328 -gMapEvents_IndigoPlateau_Exterior:: +IndigoPlateau_Exterior_MapEvents:: map_events IndigoPlateau_Exterior_EventObjects, IndigoPlateau_Exterior_MapWarps, 0x0, 0x0 SaffronCity_Duplicate_EventObjects: @@ -3398,11 +3398,11 @@ SaffronCity_Duplicate_MapBGEvents: bg_event 40, 38, 0, 0, 0, SaffronCity_Duplicate_EventScript_167468 bg_event 49, 22, 0, 0, 0, SaffronCity_Duplicate_EventScript_16747A -gMapEvents_SaffronCity_Duplicate:: +SaffronCity_Duplicate_MapEvents:: map_events SaffronCity_Duplicate_EventObjects, SaffronCity_Duplicate_MapWarps, 0x0, SaffronCity_Duplicate_MapBGEvents -gMapEvents_SaffronCity:: +SaffronCity_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 OneIsland_EventObjects: @@ -3420,7 +3420,7 @@ OneIsland_MapBGEvents: bg_event 14, 13, 0, 0, 0, OneIsland_EventScript_167552 bg_event 15, 6, 0, 0, 0, OneIsland_EventScript_16755B -gMapEvents_OneIsland:: +OneIsland_MapEvents:: map_events OneIsland_EventObjects, OneIsland_MapWarps, 0x0, OneIsland_MapBGEvents TwoIsland_EventObjects: @@ -3445,7 +3445,7 @@ TwoIsland_MapBGEvents: bg_event 40, 10, 0, 0, 0, TwoIsland_EventScript_16779B bg_event 8, 3, 0, 0, 0, TwoIsland_EventScript_1677A4 -gMapEvents_TwoIsland:: +TwoIsland_MapEvents:: map_events TwoIsland_EventObjects, TwoIsland_MapWarps, 0x0, TwoIsland_MapBGEvents ThreeIsland_EventObjects: @@ -3489,7 +3489,7 @@ ThreeIsland_MapBGEvents: bg_event 12, 31, 0, 0, 0, ThreeIsland_EventScript_167C9C bg_event 5, 13, 3, 7, 0, 69, 164, 1 -gMapEvents_ThreeIsland:: +ThreeIsland_MapEvents:: map_events ThreeIsland_EventObjects, ThreeIsland_MapWarps, ThreeIsland_MapCoordEvents, ThreeIsland_MapBGEvents FourIsland_EventObjects: @@ -3522,7 +3522,7 @@ FourIsland_MapBGEvents: bg_event 6, 21, 3, 7, 0, 2, 169, 1 bg_event 31, 23, 0, 0, 0, FourIsland_EventScript_167E85 -gMapEvents_FourIsland:: +FourIsland_MapEvents:: map_events FourIsland_EventObjects, FourIsland_MapWarps, 0x0, FourIsland_MapBGEvents FiveIsland_EventObjects: @@ -3539,7 +3539,7 @@ FiveIsland_MapWarps: FiveIsland_MapBGEvents: bg_event 20, 8, 0, 0, 0, FiveIsland_EventScript_167E98 -gMapEvents_FiveIsland:: +FiveIsland_MapEvents:: map_events FiveIsland_EventObjects, FiveIsland_MapWarps, 0x0, FiveIsland_MapBGEvents SevenIsland_EventObjects: @@ -3556,7 +3556,7 @@ SevenIsland_MapWarps: SevenIsland_MapBGEvents: bg_event 17, 9, 0, 0, 0, SevenIsland_EventScript_167EBD -gMapEvents_SevenIsland:: +SevenIsland_MapEvents:: map_events SevenIsland_EventObjects, SevenIsland_MapWarps, 0x0, SevenIsland_MapBGEvents SixIsland_EventObjects: @@ -3573,7 +3573,7 @@ SixIsland_MapBGEvents: bg_event 9, 17, 0, 0, 0, SixIsland_EventScript_167EF4 bg_event 9, 7, 3, 7, 0, 138, 184, 1 -gMapEvents_SixIsland:: +SixIsland_MapEvents:: map_events SixIsland_EventObjects, SixIsland_MapWarps, 0x0, SixIsland_MapBGEvents Route1_EventObjects: @@ -3583,7 +3583,7 @@ Route1_EventObjects: Route1_MapBGEvents: bg_event 9, 31, 0, 0, 0, Route1_EventScript_167F5B -gMapEvents_Route1:: +Route1_MapEvents:: map_events Route1_EventObjects, 0x0, 0x0, Route1_MapBGEvents Route2_EventObjects: @@ -3611,7 +3611,7 @@ Route2_MapBGEvents: bg_event 14, 12, 0, 0, 0, Route2_EventScript_167F6E bg_event 7, 73, 0, 0, 0, Route2_EventScript_167F65 -gMapEvents_Route2:: +Route2_MapEvents:: map_events Route2_EventObjects, Route2_MapWarps, 0x0, Route2_MapBGEvents Route3_EventObjects: @@ -3629,7 +3629,7 @@ Route3_MapBGEvents: bg_event 72, 11, 0, 0, 0, Route3_EventScript_167F81 bg_event 26, 9, 3, 7, 0, 139, 113, 1 -gMapEvents_Route3:: +Route3_MapEvents:: map_events Route3_EventObjects, 0x0, 0x0, Route3_MapBGEvents Route4_EventObjects: @@ -3653,7 +3653,7 @@ Route4_MapBGEvents: bg_event 5, 4, 3, 7, 0, 140, 114, 1 bg_event 67, 17, 3, 7, 0, 148, 156, 1 -gMapEvents_Route4:: +Route4_MapEvents:: map_events Route4_EventObjects, Route4_MapWarps, 0x0, Route4_MapBGEvents @@ -3666,7 +3666,7 @@ Route5_MapWarps: Route5_MapBGEvents: bg_event 32, 32, 0, 0, 0, Route5_EventScript_167FA8 -gMapEvents_Route5:: +Route5_MapEvents:: map_events 0x0, Route5_MapWarps, 0x0, Route5_MapBGEvents Route6_EventObjects: @@ -3687,7 +3687,7 @@ Route6_MapBGEvents: bg_event 5, 5, 3, 7, 0, 142, 118, 1 bg_event 19, 5, 3, 7, 0, 68, 119, 1 -gMapEvents_Route6:: +Route6_MapEvents:: map_events Route6_EventObjects, Route6_MapWarps, 0x0, Route6_MapBGEvents Route7_EventObjects: @@ -3701,7 +3701,7 @@ Route7_MapBGEvents: bg_event 5, 14, 0, 0, 0, Route7_EventScript_167FBC bg_event 16, 15, 3, 7, 0, 151, 152, 1 -gMapEvents_Route7:: +Route7_MapEvents:: map_events Route7_EventObjects, Route7_MapWarps, 0x0, Route7_MapBGEvents Route8_EventObjects: @@ -3731,7 +3731,7 @@ Route8_MapBGEvents: bg_event 38, 11, 3, 7, 0, 141, 128, 1 bg_event 42, 15, 3, 7, 0, 138, 129, 1 -gMapEvents_Route8:: +Route8_MapEvents:: map_events Route8_EventObjects, Route8_MapWarps, 0x0, Route8_MapBGEvents Route9_EventObjects: @@ -3754,7 +3754,7 @@ Route9_MapBGEvents: bg_event 63, 2, 3, 7, 0, 68, 123, 1 bg_event 48, 2, 3, 7, 0, 134, 150, 1 -gMapEvents_Route9:: +Route9_MapEvents:: map_events Route9_EventObjects, 0x0, 0x0, Route9_MapBGEvents Route10_EventObjects: @@ -3786,7 +3786,7 @@ Route10_MapBGEvents: bg_event 17, 29, 3, 7, 0, 140, 125, 1 bg_event 20, 57, 3, 7, 0, 150, 151, 1 -gMapEvents_Route10:: +Route10_MapEvents:: map_events Route10_EventObjects, Route10_MapWarps, 0x0, Route10_MapBGEvents Route11_EventObjects: @@ -3813,7 +3813,7 @@ Route11_MapBGEvents: bg_event 3, 7, 3, 0, 0, Route11_EventScript_167FF7 bg_event 58, 5, 0, 7, 0, 85, 41, 1 -gMapEvents_Route11:: +Route11_MapEvents:: map_events Route11_EventObjects, Route11_MapWarps, 0x0, Route11_MapBGEvents Route12_EventObjects: @@ -3845,7 +3845,7 @@ Route12_MapBGEvents: bg_event 14, 70, 3, 7, 0, 200, 131, 129 bg_event 9, 116, 3, 7, 0, 68, 130, 1 -gMapEvents_Route12:: +Route12_MapEvents:: map_events Route12_EventObjects, Route12_MapWarps, 0x0, Route12_MapBGEvents Route13_EventObjects: @@ -3867,7 +3867,7 @@ Route13_MapBGEvents: bg_event 21, 14, 0, 0, 0, Route13_EventScript_1680B6 bg_event 23, 14, 3, 7, 0, 69, 15, 1 -gMapEvents_Route13:: +Route13_MapEvents:: map_events Route13_EventObjects, 0x0, 0x0, Route13_MapBGEvents Route14_EventObjects: @@ -3892,7 +3892,7 @@ Route14_MapBGEvents: bg_event 9, 20, 3, 7, 0, 70, 149, 1 bg_event 19, 53, 3, 7, 0, 152, 157, 1 -gMapEvents_Route14:: +Route14_MapEvents:: map_events Route14_EventObjects, 0x0, 0x0, Route14_MapBGEvents Route15_EventObjects: @@ -3918,7 +3918,7 @@ Route15_MapWarps: Route15_MapBGEvents: bg_event 41, 11, 0, 0, 0, Route15_EventScript_1680DC -gMapEvents_Route15:: +Route15_MapEvents:: map_events Route15_EventObjects, Route15_MapWarps, 0x0, Route15_MapBGEvents Route16_EventObjects: @@ -3945,7 +3945,7 @@ Route16_MapBGEvents: bg_event 33, 11, 0, 0, 0, Route16_EventScript_1681AD bg_event 31, 13, 3, 7, 0, 200, 132, 129 -gMapEvents_Route16:: +Route16_MapEvents:: map_events Route16_EventObjects, Route16_MapWarps, 0x0, Route16_MapBGEvents Route17_EventObjects: @@ -3973,7 +3973,7 @@ Route17_MapBGEvents: bg_event 4, 125, 3, 7, 0, 25, 20, 1 bg_event 14, 157, 3, 7, 0, 37, 21, 1 -gMapEvents_Route17:: +Route17_MapEvents:: map_events Route17_EventObjects, 0x0, 0x0, Route17_MapBGEvents Route18_EventObjects: @@ -3989,7 +3989,7 @@ Route18_MapBGEvents: bg_event 37, 7, 0, 0, 0, Route18_EventScript_168228 bg_event 52, 7, 0, 0, 0, Route18_EventScript_16821F -gMapEvents_Route18:: +Route18_MapEvents:: map_events Route18_EventObjects, Route18_MapWarps, 0x0, Route18_MapBGEvents Route19_EventObjects: @@ -4009,7 +4009,7 @@ Route19_EventObjects: Route19_MapBGEvents: bg_event 13, 12, 0, 0, 0, Route19_EventScript_168232 -gMapEvents_Route19:: +Route19_MapEvents:: map_events Route19_EventObjects, 0x0, 0x0, Route19_MapBGEvents Route20_EventObjects: @@ -4034,7 +4034,7 @@ Route20_MapBGEvents: bg_event 64, 8, 0, 0, 0, Route20_EventScript_168280 bg_event 23, 6, 3, 7, 0, 108, 153, 1 -gMapEvents_Route20:: +Route20_MapEvents:: map_events Route20_EventObjects, Route20_MapWarps, 0x0, Route20_MapBGEvents Route21_North_EventObjects: @@ -4048,7 +4048,7 @@ Route21_North_EventObjects: Route21_North_MapBGEvents: bg_event 17, 42, 3, 7, 0, 106, 154, 1 -gMapEvents_Route21_North:: +Route21_North_MapEvents:: map_events Route21_North_EventObjects, 0x0, 0x0, Route21_North_MapBGEvents Route21_South_EventObjects: @@ -4058,7 +4058,7 @@ Route21_South_EventObjects: object_event 4, 43, 0, 15, 0, 38, 0, 1, 9, 17, 0, 1, 0, 3, 0, Route21_South_EventScript_1ABAE9, 0, 0, 0 object_event 5, 43, 0, 10, 0, 29, 0, 1, 2, 34, 0, 1, 0, 4, 0, Route21_South_EventScript_1ABB27, 0, 0, 0 -gMapEvents_Route21_South:: +Route21_South_MapEvents:: map_events Route21_South_EventObjects, 0x0, 0x0, 0x0 Route22_EventObjects: @@ -4079,7 +4079,7 @@ Route22_MapCoordEvents: Route22_MapBGEvents: bg_event 7, 12, 0, 0, 0, Route22_EventScript_1684E2 -gMapEvents_Route22:: +Route22_MapEvents:: map_events Route22_EventObjects, Route22_MapWarps, Route22_MapCoordEvents, Route22_MapBGEvents Route23_EventObjects: @@ -4152,7 +4152,7 @@ Route23_MapBGEvents: bg_event 9, 8, 3, 7, 0, 37, 155, 1 bg_event 3, 31, 0, 0, 0, Route23_EventScript_168616 -gMapEvents_Route23:: +Route23_MapEvents:: map_events Route23_EventObjects, Route23_MapWarps, Route23_MapCoordEvents, Route23_MapBGEvents Route24_EventObjects: @@ -4172,7 +4172,7 @@ Route24_MapCoordEvents: Route24_MapBGEvents: bg_event 19, 4, 3, 7, 0, 135, 115, 1 -gMapEvents_Route24:: +Route24_MapEvents:: map_events Route24_EventObjects, 0x0, Route24_MapCoordEvents, Route24_MapBGEvents Route25_EventObjects: @@ -4200,7 +4200,7 @@ Route25_MapBGEvents: bg_event 33, 8, 3, 7, 0, 139, 116, 1 bg_event 40, 3, 3, 7, 0, 149, 117, 1 -gMapEvents_Route25:: +Route25_MapEvents:: map_events Route25_EventObjects, Route25_MapWarps, 0x0, Route25_MapBGEvents OneIsland_KindleRoad_EventObjects: @@ -4243,7 +4243,7 @@ OneIsland_KindleRoad_MapBGEvents: bg_event 13, 59, 0, 0, 0, OneIsland_KindleRoad_EventScript_168762 bg_event 8, 115, 0, 0, 0, OneIsland_KindleRoad_EventScript_168759 -gMapEvents_OneIsland_KindleRoad:: +OneIsland_KindleRoad_MapEvents:: map_events OneIsland_KindleRoad_EventObjects, OneIsland_KindleRoad_MapWarps, 0x0, OneIsland_KindleRoad_MapBGEvents OneIsland_TreasureBeach_EventObjects: @@ -4260,7 +4260,7 @@ OneIsland_TreasureBeach_MapBGEvents: bg_event 15, 29, 3, 7, 0, 109, 109, 1 bg_event 8, 27, 3, 7, 0, 107, 110, 1 -gMapEvents_OneIsland_TreasureBeach:: +OneIsland_TreasureBeach_MapEvents:: map_events OneIsland_TreasureBeach_EventObjects, 0x0, 0x0, OneIsland_TreasureBeach_MapBGEvents @@ -4271,7 +4271,7 @@ TwoIsland_CapeBrink_MapBGEvents: bg_event 16, 28, 3, 7, 0, 71, 161, 129 bg_event 15, 13, 3, 7, 0, 68, 111, 1 -gMapEvents_TwoIsland_CapeBrink:: +TwoIsland_CapeBrink_MapEvents:: map_events 0x0, TwoIsland_CapeBrink_MapWarps, 0x0, TwoIsland_CapeBrink_MapBGEvents ThreeIsland_BondBridge_EventObjects: @@ -4296,7 +4296,7 @@ ThreeIsland_BondBridge_MapBGEvents: bg_event 33, 7, 3, 7, 0, 108, 167, 1 bg_event 91, 9, 0, 0, 0, ThreeIsland_BondBridge_EventScript_168780 -gMapEvents_ThreeIsland_BondBridge:: +ThreeIsland_BondBridge_MapEvents:: map_events ThreeIsland_BondBridge_EventObjects, ThreeIsland_BondBridge_MapWarps, 0x0, ThreeIsland_BondBridge_MapBGEvents ThreeIsland_Port_EventObjects: @@ -4309,23 +4309,23 @@ ThreeIsland_Port_MapWarps: warp_def 38, 5, 3, 1, 546 warp_def 12, 13, 3, 0, 9728 -gMapEvents_ThreeIsland_Port:: +ThreeIsland_Port_MapEvents:: map_events ThreeIsland_Port_EventObjects, ThreeIsland_Port_MapWarps, 0x0, 0x0 -gMapEvents_UnknownMap_03_50:: +UnknownMap_03_50_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 -gMapEvents_UnknownMap_03_51:: +UnknownMap_03_51_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 -gMapEvents_UnknownMap_03_52:: +UnknownMap_03_52_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 -gMapEvents_UnknownMap_03_53:: +UnknownMap_03_53_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 FiveIsland_ResortGorgeous_EventObjects: @@ -4349,14 +4349,14 @@ FiveIsland_ResortGorgeous_MapBGEvents: bg_event 27, 5, 3, 7, 0, 108, 177, 1 bg_event 42, 9, 0, 0, 0, FiveIsland_ResortGorgeous_EventScript_168844 -gMapEvents_FiveIsland_ResortGorgeous:: +FiveIsland_ResortGorgeous_MapEvents:: map_events FiveIsland_ResortGorgeous_EventObjects, FiveIsland_ResortGorgeous_MapWarps, 0x0, FiveIsland_ResortGorgeous_MapBGEvents FiveIsland_WaterLabyrinth_EventObjects: object_event 1, 61, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_WaterLabyrinth_EventScript_16884E, 0, 0, 0 object_event 2, 28, 0, 9, 0, 7, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_WaterLabyrinth_EventScript_1AC2D9, 0, 0, 0 -gMapEvents_FiveIsland_WaterLabyrinth:: +FiveIsland_WaterLabyrinth_MapEvents:: map_events FiveIsland_WaterLabyrinth_EventObjects, 0x0, 0x0, 0x0 FiveIsland_Meadow_EventObjects: @@ -4374,7 +4374,7 @@ FiveIsland_Meadow_MapWarps: FiveIsland_Meadow_MapBGEvents: bg_event 12, 21, 0, 0, 0, FiveIsland_Meadow_EventScript_168942 -gMapEvents_FiveIsland_Meadow:: +FiveIsland_Meadow_MapEvents:: map_events FiveIsland_Meadow_EventObjects, FiveIsland_Meadow_MapWarps, 0x0, FiveIsland_Meadow_MapBGEvents FiveIsland_MemorialPillar_EventObjects: @@ -4391,7 +4391,7 @@ FiveIsland_MemorialPillar_MapBGEvents: bg_event 17, 22, 3, 7, 0, 142, 172, 1 bg_event 14, 25, 3, 7, 0, 149, 173, 1 -gMapEvents_FiveIsland_MemorialPillar:: +FiveIsland_MemorialPillar_MapEvents:: map_events FiveIsland_MemorialPillar_EventObjects, 0x0, 0x0, FiveIsland_MemorialPillar_MapBGEvents SixIsland_OutcastIsland_EventObjects: @@ -4410,7 +4410,7 @@ SixIsland_OutcastIsland_MapBGEvents: bg_event 16, 23, 3, 7, 0, 109, 178, 1 bg_event 6, 24, 3, 7, 0, 6, 179, 1 -gMapEvents_SixIsland_OutcastIsland:: +SixIsland_OutcastIsland_MapEvents:: map_events SixIsland_OutcastIsland_EventObjects, SixIsland_OutcastIsland_MapWarps, 0x0, SixIsland_OutcastIsland_MapBGEvents SixIsland_GreenPath_EventObjects: @@ -4427,7 +4427,7 @@ SixIsland_GreenPath_MapBGEvents: bg_event 69, 10, 0, 0, 0, SixIsland_GreenPath_EventScript_168B2E bg_event 12, 9, 3, 7, 0, 2, 180, 1 -gMapEvents_SixIsland_GreenPath:: +SixIsland_GreenPath_MapEvents:: map_events SixIsland_GreenPath_EventObjects, SixIsland_GreenPath_MapWarps, 0x0, SixIsland_GreenPath_MapBGEvents SixIsland_WaterPath_EventObjects: @@ -4452,7 +4452,7 @@ SixIsland_WaterPath_MapBGEvents: bg_event 13, 63, 3, 7, 0, 152, 183, 1 bg_event 12, 54, 0, 0, 0, SixIsland_WaterPath_EventScript_168B4A -gMapEvents_SixIsland_WaterPath:: +SixIsland_WaterPath_MapEvents:: map_events SixIsland_WaterPath_EventObjects, SixIsland_WaterPath_MapWarps, 0x0, SixIsland_WaterPath_MapBGEvents SixIsland_RuinValley_EventObjects: @@ -4480,7 +4480,7 @@ SixIsland_RuinValley_MapWarps: SixIsland_RuinValley_MapBGEvents: bg_event 24, 24, 3, 0, 0, SixIsland_RuinValley_EventScript_168B94 -gMapEvents_SixIsland_RuinValley:: +SixIsland_RuinValley_MapEvents:: map_events SixIsland_RuinValley_EventObjects, SixIsland_RuinValley_MapWarps, 0x0, SixIsland_RuinValley_MapBGEvents SevenIsland_TrainerTower_EventObjects: @@ -4497,7 +4497,7 @@ SevenIsland_TrainerTower_MapBGEvents: bg_event 56, 8, 0, 0, 0, SevenIsland_TrainerTower_EventScript_168BE1 bg_event 50, 30, 0, 0, 0, SevenIsland_TrainerTower_EventScript_168BEA -gMapEvents_SevenIsland_TrainerTower:: +SevenIsland_TrainerTower_MapEvents:: map_events SevenIsland_TrainerTower_EventObjects, SevenIsland_TrainerTower_MapWarps, 0x0, SevenIsland_TrainerTower_MapBGEvents SevenIsland_SevaultCanyon_Entrance_EventObjects: @@ -4513,7 +4513,7 @@ SevenIsland_SevaultCanyon_Entrance_MapBGEvents: bg_event 8, 29, 5, 7, 0, 136, 188, 1 bg_event 14, 26, 0, 0, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4 -gMapEvents_SevenIsland_SevaultCanyon_Entrance:: +SevenIsland_SevaultCanyon_Entrance_MapEvents:: map_events SevenIsland_SevaultCanyon_Entrance_EventObjects, 0x0, 0x0, SevenIsland_SevaultCanyon_Entrance_MapBGEvents SevenIsland_SevaultCanyon_EventObjects: @@ -4546,7 +4546,7 @@ SevenIsland_SevaultCanyon_MapBGEvents: bg_event 15, 66, 3, 7, 0, 133, 63, 1 bg_event 16, 71, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_168BFE -gMapEvents_SevenIsland_SevaultCanyon:: +SevenIsland_SevaultCanyon_MapEvents:: map_events SevenIsland_SevaultCanyon_EventObjects, SevenIsland_SevaultCanyon_MapWarps, 0x0, SevenIsland_SevaultCanyon_MapBGEvents SevenIsland_TanobyRuins_EventObjects: @@ -4570,7 +4570,7 @@ SevenIsland_TanobyRuins_MapBGEvents: bg_event 125, 5, 3, 7, 0, 111, 67, 1 bg_event 8, 2, 3, 7, 0, 111, 64, 1 -gMapEvents_SevenIsland_TanobyRuins:: +SevenIsland_TanobyRuins_MapEvents:: map_events SevenIsland_TanobyRuins_EventObjects, SevenIsland_TanobyRuins_MapWarps, 0x0, SevenIsland_TanobyRuins_MapBGEvents PalletTown_PlayersHouse_1F_EventObjects: @@ -4585,7 +4585,7 @@ PalletTown_PlayersHouse_1F_MapWarps: PalletTown_PlayersHouse_1F_MapBGEvents: bg_event 6, 1, 0, 0, 0, PalletTown_PlayersHouse_1F_EventScript_168C62 -gMapEvents_PalletTown_PlayersHouse_1F:: +PalletTown_PlayersHouse_1F_MapEvents:: map_events PalletTown_PlayersHouse_1F_EventObjects, PalletTown_PlayersHouse_1F_MapWarps, 0x0, PalletTown_PlayersHouse_1F_MapBGEvents @@ -4597,7 +4597,7 @@ PalletTown_PlayersHouse_2F_MapBGEvents: bg_event 1, 1, 0, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CE4 bg_event 11, 1, 0, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CDB -gMapEvents_PalletTown_PlayersHouse_2F:: +PalletTown_PlayersHouse_2F_MapEvents:: map_events 0x0, PalletTown_PlayersHouse_2F_MapWarps, 0x0, PalletTown_PlayersHouse_2F_MapBGEvents PalletTown_GarysHouse_EventObjects: @@ -4614,7 +4614,7 @@ PalletTown_GarysHouse_MapBGEvents: bg_event 11, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F6C bg_event 9, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F75 -gMapEvents_PalletTown_GarysHouse:: +PalletTown_GarysHouse_MapEvents:: map_events PalletTown_GarysHouse_EventObjects, PalletTown_GarysHouse_MapWarps, 0x0, PalletTown_GarysHouse_MapBGEvents PalletTown_ProfessorOaksLab_EventObjects: @@ -4648,7 +4648,7 @@ PalletTown_ProfessorOaksLab_MapBGEvents: bg_event 6, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E71 bg_event 7, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E7A -gMapEvents_PalletTown_ProfessorOaksLab:: +PalletTown_ProfessorOaksLab_MapEvents:: map_events PalletTown_ProfessorOaksLab_EventObjects, PalletTown_ProfessorOaksLab_MapWarps, PalletTown_ProfessorOaksLab_MapCoordEvents, PalletTown_ProfessorOaksLab_MapBGEvents ViridianCity_House1_EventObjects: @@ -4664,7 +4664,7 @@ ViridianCity_House1_MapWarps: ViridianCity_House1_MapBGEvents: bg_event 7, 1, 0, 0, 0, ViridianCity_House1_EventScript_169EC0 -gMapEvents_ViridianCity_House1:: +ViridianCity_House1_MapEvents:: map_events ViridianCity_House1_EventObjects, ViridianCity_House1_MapWarps, 0x0, ViridianCity_House1_MapBGEvents ViridianCity_Gym_EventObjects: @@ -4689,7 +4689,7 @@ ViridianCity_Gym_MapBGEvents: bg_event 19, 20, 0, 0, 0, ViridianCity_Gym_EventScript_16A05E bg_event 2, 2, 3, 7, 0, 181, 189, 129 -gMapEvents_ViridianCity_Gym:: +ViridianCity_Gym_MapEvents:: map_events ViridianCity_Gym_EventObjects, ViridianCity_Gym_MapWarps, 0x0, ViridianCity_Gym_MapBGEvents ViridianCity_House2_EventObjects: @@ -4708,7 +4708,7 @@ ViridianCity_House2_MapBGEvents: bg_event 9, 2, 0, 1, 0, ViridianCity_House2_EventScript_1ACD65 bg_event 8, 2, 0, 1, 0, ViridianCity_House2_EventScript_1ACD65 -gMapEvents_ViridianCity_House2:: +ViridianCity_House2_MapEvents:: map_events ViridianCity_House2_EventObjects, ViridianCity_House2_MapWarps, 0x0, ViridianCity_House2_MapBGEvents ViridianCity_Mart_EventObjects: @@ -4721,7 +4721,7 @@ ViridianCity_Mart_MapWarps: warp_def 4, 7, 3, 4, 769 warp_def 5, 7, 3, 4, 769 -gMapEvents_ViridianCity_Mart:: +ViridianCity_Mart_MapEvents:: map_events ViridianCity_Mart_EventObjects, ViridianCity_Mart_MapWarps, 0x0, 0x0 ViridianCity_PokemonCenter_1F_EventObjects: @@ -4736,7 +4736,7 @@ ViridianCity_PokemonCenter_1F_MapWarps: warp_def 8, 8, 3, 0, 769 warp_def 1, 6, 4, 0, 1285 -gMapEvents_ViridianCity_PokemonCenter_1F:: +ViridianCity_PokemonCenter_1F_MapEvents:: map_events ViridianCity_PokemonCenter_1F_EventObjects, ViridianCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 ViridianCity_PokemonCenter_2F_EventObjects: @@ -4750,7 +4750,7 @@ ViridianCity_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_ViridianCity_PokemonCenter_2F:: +ViridianCity_PokemonCenter_2F_MapEvents:: map_events ViridianCity_PokemonCenter_2F_EventObjects, ViridianCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 PewterCity_Museum_1F_EventObjects: @@ -4780,7 +4780,7 @@ PewterCity_Museum_1F_MapBGEvents: bg_event 27, 1, 0, 1, 0, PewterCity_Museum_1F_EventScript_1ACE1C bg_event 26, 1, 0, 1, 0, PewterCity_Museum_1F_EventScript_1ACE1C -gMapEvents_PewterCity_Museum_1F:: +PewterCity_Museum_1F_MapEvents:: map_events PewterCity_Museum_1F_EventObjects, PewterCity_Museum_1F_MapWarps, PewterCity_Museum_1F_MapCoordEvents, PewterCity_Museum_1F_MapBGEvents PewterCity_Museum_2F_EventObjects: @@ -4803,7 +4803,7 @@ PewterCity_Museum_2F_MapBGEvents: bg_event 16, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 bg_event 3, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A589 -gMapEvents_PewterCity_Museum_2F:: +PewterCity_Museum_2F_MapEvents:: map_events PewterCity_Museum_2F_EventObjects, PewterCity_Museum_2F_MapWarps, 0x0, PewterCity_Museum_2F_MapBGEvents PewterCity_Gym_EventObjects: @@ -4820,7 +4820,7 @@ PewterCity_Gym_MapBGEvents: bg_event 4, 12, 0, 0, 0, PewterCity_Gym_EventScript_16A6AF bg_event 8, 12, 0, 0, 0, PewterCity_Gym_EventScript_16A6AF -gMapEvents_PewterCity_Gym:: +PewterCity_Gym_MapEvents:: map_events PewterCity_Gym_EventObjects, PewterCity_Gym_MapWarps, 0x0, PewterCity_Gym_MapBGEvents PewterCity_Mart_EventObjects: @@ -4833,7 +4833,7 @@ PewterCity_Mart_MapWarps: warp_def 4, 7, 3, 3, 770 warp_def 5, 7, 3, 3, 770 -gMapEvents_PewterCity_Mart:: +PewterCity_Mart_MapEvents:: map_events PewterCity_Mart_EventObjects, PewterCity_Mart_MapWarps, 0x0, 0x0 PewterCity_House1_EventObjects: @@ -4846,7 +4846,7 @@ PewterCity_House1_MapWarps: warp_def 4, 7, 0, 4, 770 warp_def 5, 7, 0, 4, 770 -gMapEvents_PewterCity_House1:: +PewterCity_House1_MapEvents:: map_events PewterCity_House1_EventObjects, PewterCity_House1_MapWarps, 0x0, 0x0 PewterCity_PokemonCenter_1F_EventObjects: @@ -4864,7 +4864,7 @@ PewterCity_PokemonCenter_1F_MapWarps: warp_def 8, 8, 0, 5, 770 warp_def 1, 6, 4, 0, 1542 -gMapEvents_PewterCity_PokemonCenter_1F:: +PewterCity_PokemonCenter_1F_MapEvents:: map_events PewterCity_PokemonCenter_1F_EventObjects, PewterCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 PewterCity_PokemonCenter_2F_EventObjects: @@ -4878,7 +4878,7 @@ PewterCity_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_PewterCity_PokemonCenter_2F:: +PewterCity_PokemonCenter_2F_MapEvents:: map_events PewterCity_PokemonCenter_2F_EventObjects, PewterCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 PewterCity_House2_EventObjects: @@ -4890,7 +4890,7 @@ PewterCity_House2_MapWarps: warp_def 4, 7, 0, 6, 770 warp_def 5, 7, 0, 6, 770 -gMapEvents_PewterCity_House2:: +PewterCity_House2_MapEvents:: map_events PewterCity_House2_EventObjects, PewterCity_House2_MapWarps, 0x0, 0x0 CeruleanCity_House1_EventObjects: @@ -4902,7 +4902,7 @@ CeruleanCity_House1_MapWarps: warp_def 4, 9, 0, 0, 771 warp_def 3, 1, 3, 8, 771 -gMapEvents_CeruleanCity_House1:: +CeruleanCity_House1_MapEvents:: map_events CeruleanCity_House1_EventObjects, CeruleanCity_House1_MapWarps, 0x0, 0x0 CeruleanCity_House2_EventObjects: @@ -4918,7 +4918,7 @@ CeruleanCity_House2_MapWarps: CeruleanCity_House2_MapBGEvents: bg_event 4, 1, 0, 0, 0, CeruleanCity_House2_EventScript_16A99E -gMapEvents_CeruleanCity_House2:: +CeruleanCity_House2_MapEvents:: map_events CeruleanCity_House2_EventObjects, CeruleanCity_House2_MapWarps, 0x0, CeruleanCity_House2_MapBGEvents CeruleanCity_House3_EventObjects: @@ -4930,7 +4930,7 @@ CeruleanCity_House3_MapWarps: warp_def 4, 7, 0, 2, 771 warp_def 5, 7, 0, 2, 771 -gMapEvents_CeruleanCity_House3:: +CeruleanCity_House3_MapEvents:: map_events CeruleanCity_House3_EventObjects, CeruleanCity_House3_MapWarps, 0x0, 0x0 CeruleanCity_PokemonCenter_1F_EventObjects: @@ -4948,7 +4948,7 @@ CeruleanCity_PokemonCenter_1F_MapWarps: warp_def 8, 8, 0, 3, 771 warp_def 1, 6, 4, 0, 1796 -gMapEvents_CeruleanCity_PokemonCenter_1F:: +CeruleanCity_PokemonCenter_1F_MapEvents:: map_events CeruleanCity_PokemonCenter_1F_EventObjects, CeruleanCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 CeruleanCity_PokemonCenter_2F_EventObjects: @@ -4962,7 +4962,7 @@ CeruleanCity_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_CeruleanCity_PokemonCenter_2F:: +CeruleanCity_PokemonCenter_2F_MapEvents:: map_events CeruleanCity_PokemonCenter_2F_EventObjects, CeruleanCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 CeruleanCity_Gym_EventObjects: @@ -4980,7 +4980,7 @@ CeruleanCity_Gym_MapBGEvents: bg_event 6, 17, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB9E bg_event 10, 17, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB9E -gMapEvents_CeruleanCity_Gym:: +CeruleanCity_Gym_MapEvents:: map_events CeruleanCity_Gym_EventObjects, CeruleanCity_Gym_MapWarps, 0x0, CeruleanCity_Gym_MapBGEvents CeruleanCity_BikeShop_EventObjects: @@ -5003,7 +5003,7 @@ CeruleanCity_BikeShop_MapBGEvents: bg_event 2, 7, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 bg_event 2, 8, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 -gMapEvents_CeruleanCity_BikeShop:: +CeruleanCity_BikeShop_MapEvents:: map_events CeruleanCity_BikeShop_EventObjects, CeruleanCity_BikeShop_MapWarps, 0x0, CeruleanCity_BikeShop_MapBGEvents CeruleanCity_Mart_EventObjects: @@ -5016,7 +5016,7 @@ CeruleanCity_Mart_MapWarps: warp_def 4, 7, 3, 6, 771 warp_def 5, 7, 3, 6, 771 -gMapEvents_CeruleanCity_Mart:: +CeruleanCity_Mart_MapEvents:: map_events CeruleanCity_Mart_EventObjects, CeruleanCity_Mart_MapWarps, 0x0, 0x0 CeruleanCity_House4_EventObjects: @@ -5025,7 +5025,7 @@ CeruleanCity_House4_EventObjects: CeruleanCity_House4_MapWarps: warp_def 4, 7, 3, 12, 771 -gMapEvents_CeruleanCity_House4:: +CeruleanCity_House4_MapEvents:: map_events CeruleanCity_House4_EventObjects, CeruleanCity_House4_MapWarps, 0x0, 0x0 CeruleanCity_House5_EventObjects: @@ -5037,7 +5037,7 @@ CeruleanCity_House5_MapWarps: CeruleanCity_House5_MapBGEvents: bg_event 3, 1, 0, 0, 0, CeruleanCity_House5_EventScript_16B0DA -gMapEvents_CeruleanCity_House5:: +CeruleanCity_House5_MapEvents:: map_events CeruleanCity_House5_EventObjects, CeruleanCity_House5_MapWarps, 0x0, CeruleanCity_House5_MapBGEvents LavenderTown_PokemonCenter_1F_EventObjects: @@ -5053,7 +5053,7 @@ LavenderTown_PokemonCenter_1F_MapWarps: warp_def 8, 8, 3, 1, 772 warp_def 1, 6, 4, 0, 2049 -gMapEvents_LavenderTown_PokemonCenter_1F:: +LavenderTown_PokemonCenter_1F_MapEvents:: map_events LavenderTown_PokemonCenter_1F_EventObjects, LavenderTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 LavenderTown_PokemonCenter_2F_EventObjects: @@ -5067,7 +5067,7 @@ LavenderTown_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_LavenderTown_PokemonCenter_2F:: +LavenderTown_PokemonCenter_2F_MapEvents:: map_events LavenderTown_PokemonCenter_2F_EventObjects, LavenderTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 LavenderTown_VolunteerPokemonHouse_EventObjects: @@ -5088,7 +5088,7 @@ LavenderTown_VolunteerPokemonHouse_MapBGEvents: bg_event 3, 1, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B229 bg_event 4, 1, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B229 -gMapEvents_LavenderTown_VolunteerPokemonHouse:: +LavenderTown_VolunteerPokemonHouse_MapEvents:: map_events LavenderTown_VolunteerPokemonHouse_EventObjects, LavenderTown_VolunteerPokemonHouse_MapWarps, 0x0, LavenderTown_VolunteerPokemonHouse_MapBGEvents LavenderTown_House1_EventObjects: @@ -5100,7 +5100,7 @@ LavenderTown_House1_MapWarps: warp_def 4, 7, 3, 3, 772 warp_def 5, 7, 3, 3, 772 -gMapEvents_LavenderTown_House1:: +LavenderTown_House1_MapEvents:: map_events LavenderTown_House1_EventObjects, LavenderTown_House1_MapWarps, 0x0, 0x0 LavenderTown_House2_EventObjects: @@ -5111,7 +5111,7 @@ LavenderTown_House2_MapWarps: warp_def 4, 7, 3, 4, 772 warp_def 5, 7, 3, 4, 772 -gMapEvents_LavenderTown_House2:: +LavenderTown_House2_MapEvents:: map_events LavenderTown_House2_EventObjects, LavenderTown_House2_MapWarps, 0x0, 0x0 LavenderTown_Mart_EventObjects: @@ -5125,7 +5125,7 @@ LavenderTown_Mart_MapWarps: warp_def 4, 7, 3, 5, 772 warp_def 5, 7, 3, 5, 772 -gMapEvents_LavenderTown_Mart:: +LavenderTown_Mart_MapEvents:: map_events LavenderTown_Mart_EventObjects, LavenderTown_Mart_MapWarps, 0x0, 0x0 VermilionCity_House1_EventObjects: @@ -5136,7 +5136,7 @@ VermilionCity_House1_MapWarps: warp_def 4, 7, 3, 3, 773 warp_def 5, 7, 3, 3, 773 -gMapEvents_VermilionCity_House1:: +VermilionCity_House1_MapEvents:: map_events VermilionCity_House1_EventObjects, VermilionCity_House1_MapWarps, 0x0, 0x0 VermilionCity_PokemonCenter_1F_EventObjects: @@ -5154,7 +5154,7 @@ VermilionCity_PokemonCenter_1F_MapWarps: warp_def 8, 8, 3, 4, 773 warp_def 1, 6, 4, 0, 2306 -gMapEvents_VermilionCity_PokemonCenter_1F:: +VermilionCity_PokemonCenter_1F_MapEvents:: map_events VermilionCity_PokemonCenter_1F_EventObjects, VermilionCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 VermilionCity_PokemonCenter_2F_EventObjects: @@ -5168,7 +5168,7 @@ VermilionCity_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_VermilionCity_PokemonCenter_2F:: +VermilionCity_PokemonCenter_2F_MapEvents:: map_events VermilionCity_PokemonCenter_2F_EventObjects, VermilionCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 VermilionCity_PokemonFanClub_EventObjects: @@ -5188,7 +5188,7 @@ VermilionCity_PokemonFanClub_MapBGEvents: bg_event 2, 1, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5C4 bg_event 9, 1, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5CD -gMapEvents_VermilionCity_PokemonFanClub:: +VermilionCity_PokemonFanClub_MapEvents:: map_events VermilionCity_PokemonFanClub_EventObjects, VermilionCity_PokemonFanClub_MapWarps, 0x0, VermilionCity_PokemonFanClub_MapBGEvents VermilionCity_House2_EventObjects: @@ -5199,7 +5199,7 @@ VermilionCity_House2_MapWarps: warp_def 4, 7, 3, 6, 773 warp_def 5, 7, 3, 6, 773 -gMapEvents_VermilionCity_House2:: +VermilionCity_House2_MapEvents:: map_events VermilionCity_House2_EventObjects, VermilionCity_House2_MapWarps, 0x0, 0x0 VermilionCity_Mart_EventObjects: @@ -5212,7 +5212,7 @@ VermilionCity_Mart_MapWarps: warp_def 4, 7, 3, 7, 773 warp_def 5, 7, 3, 7, 773 -gMapEvents_VermilionCity_Mart:: +VermilionCity_Mart_MapEvents:: map_events VermilionCity_Mart_EventObjects, VermilionCity_Mart_MapWarps, 0x0, 0x0 VermilionCity_Gym_EventObjects: @@ -5246,7 +5246,7 @@ VermilionCity_Gym_MapBGEvents: bg_event 7, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B82B bg_event 9, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B837 -gMapEvents_VermilionCity_Gym:: +VermilionCity_Gym_MapEvents:: map_events VermilionCity_Gym_EventObjects, VermilionCity_Gym_MapWarps, 0x0, VermilionCity_Gym_MapBGEvents VermilionCity_House3_EventObjects: @@ -5263,7 +5263,7 @@ VermilionCity_House3_MapWarps: VermilionCity_House3_MapBGEvents: bg_event 6, 4, 3, 0, 0, VermilionCity_House3_EventScript_16BACF -gMapEvents_VermilionCity_House3:: +VermilionCity_House3_MapEvents:: map_events VermilionCity_House3_EventObjects, VermilionCity_House3_MapWarps, 0x0, VermilionCity_House3_MapBGEvents CeladonCity_DepartmentStore_1F_EventObjects: @@ -5283,7 +5283,7 @@ CeladonCity_DepartmentStore_1F_MapBGEvents: bg_event 9, 11, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAE2 bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAEB -gMapEvents_CeladonCity_DepartmentStore_1F:: +CeladonCity_DepartmentStore_1F_MapEvents:: map_events CeladonCity_DepartmentStore_1F_EventObjects, CeladonCity_DepartmentStore_1F_MapWarps, 0x0, CeladonCity_DepartmentStore_1F_MapBGEvents CeladonCity_DepartmentStore_2F_EventObjects: @@ -5300,7 +5300,7 @@ CeladonCity_DepartmentStore_2F_MapWarps: CeladonCity_DepartmentStore_2F_MapBGEvents: bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB07 -gMapEvents_CeladonCity_DepartmentStore_2F:: +CeladonCity_DepartmentStore_2F_MapEvents:: map_events CeladonCity_DepartmentStore_2F_EventObjects, CeladonCity_DepartmentStore_2F_MapWarps, 0x0, CeladonCity_DepartmentStore_2F_MapBGEvents CeladonCity_DepartmentStore_3F_EventObjects: @@ -5328,7 +5328,7 @@ CeladonCity_DepartmentStore_3F_MapBGEvents: bg_event 2, 4, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBE5 bg_event 0, 4, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBE5 -gMapEvents_CeladonCity_DepartmentStore_3F:: +CeladonCity_DepartmentStore_3F_MapEvents:: map_events CeladonCity_DepartmentStore_3F_EventObjects, CeladonCity_DepartmentStore_3F_MapWarps, 0x0, CeladonCity_DepartmentStore_3F_MapBGEvents CeladonCity_DepartmentStore_4F_EventObjects: @@ -5344,7 +5344,7 @@ CeladonCity_DepartmentStore_4F_MapWarps: CeladonCity_DepartmentStore_4F_MapBGEvents: bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BC01 -gMapEvents_CeladonCity_DepartmentStore_4F:: +CeladonCity_DepartmentStore_4F_MapEvents:: map_events CeladonCity_DepartmentStore_4F_EventObjects, CeladonCity_DepartmentStore_4F_MapWarps, 0x0, CeladonCity_DepartmentStore_4F_MapBGEvents CeladonCity_DepartmentStore_5F_EventObjects: @@ -5361,7 +5361,7 @@ CeladonCity_DepartmentStore_5F_MapWarps: CeladonCity_DepartmentStore_5F_MapBGEvents: bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC53 -gMapEvents_CeladonCity_DepartmentStore_5F:: +CeladonCity_DepartmentStore_5F_MapEvents:: map_events CeladonCity_DepartmentStore_5F_EventObjects, CeladonCity_DepartmentStore_5F_MapWarps, 0x0, CeladonCity_DepartmentStore_5F_MapBGEvents CeladonCity_DepartmentStore_Roof_EventObjects: @@ -5377,7 +5377,7 @@ CeladonCity_DepartmentStore_Roof_MapBGEvents: bg_event 11, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 bg_event 12, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 -gMapEvents_CeladonCity_DepartmentStore_Roof:: +CeladonCity_DepartmentStore_Roof_MapEvents:: map_events CeladonCity_DepartmentStore_Roof_EventObjects, CeladonCity_DepartmentStore_Roof_MapWarps, 0x0, CeladonCity_DepartmentStore_Roof_MapBGEvents @@ -5389,7 +5389,7 @@ CeladonCity_DepartmentStore_Elevator_MapBGEvents: bg_event 0, 2, 0, 0, 0, CeladonCity_DepartmentStore_Elevator_EventScript_16C153 bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_Elevator_EventScript_16C153 -gMapEvents_CeladonCity_DepartmentStore_Elevator:: +CeladonCity_DepartmentStore_Elevator_MapEvents:: map_events 0x0, CeladonCity_DepartmentStore_Elevator_MapWarps, 0x0, CeladonCity_DepartmentStore_Elevator_MapBGEvents CeladonCity_Condominiums_1F_EventObjects: @@ -5410,7 +5410,7 @@ CeladonCity_Condominiums_1F_MapBGEvents: bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3C7 bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3C7 -gMapEvents_CeladonCity_Condominiums_1F:: +CeladonCity_Condominiums_1F_MapEvents:: map_events CeladonCity_Condominiums_1F_EventObjects, CeladonCity_Condominiums_1F_MapWarps, 0x0, CeladonCity_Condominiums_1F_MapBGEvents CeladonCity_Condominiums_2F_EventObjects: @@ -5427,7 +5427,7 @@ CeladonCity_Condominiums_2F_MapBGEvents: bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_16C3D1 bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_16C3D1 -gMapEvents_CeladonCity_Condominiums_2F:: +CeladonCity_Condominiums_2F_MapEvents:: map_events CeladonCity_Condominiums_2F_EventObjects, CeladonCity_Condominiums_2F_MapWarps, 0x0, CeladonCity_Condominiums_2F_MapBGEvents CeladonCity_Condominiums_3F_EventObjects: @@ -5452,7 +5452,7 @@ CeladonCity_Condominiums_3F_MapBGEvents: bg_event 0, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C43E bg_event 4, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C447 -gMapEvents_CeladonCity_Condominiums_3F:: +CeladonCity_Condominiums_3F_MapEvents:: map_events CeladonCity_Condominiums_3F_EventObjects, CeladonCity_Condominiums_3F_MapWarps, 0x0, CeladonCity_Condominiums_3F_MapBGEvents @@ -5465,7 +5465,7 @@ CeladonCity_Condominiums_Roof_MapBGEvents: bg_event 4, 12, 0, 0, 0, CeladonCity_Condominiums_Roof_EventScript_16C45A bg_event 3, 12, 0, 0, 0, CeladonCity_Condominiums_Roof_EventScript_16C45A -gMapEvents_CeladonCity_Condominiums_Roof:: +CeladonCity_Condominiums_Roof_MapEvents:: map_events 0x0, CeladonCity_Condominiums_Roof_MapWarps, 0x0, CeladonCity_Condominiums_Roof_MapBGEvents CeladonCity_Condominiums_RoofRoom_EventObjects: @@ -5482,7 +5482,7 @@ CeladonCity_Condominiums_RoofRoom_MapBGEvents: bg_event 5, 1, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C522 bg_event 4, 4, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C519 -gMapEvents_CeladonCity_Condominiums_RoofRoom:: +CeladonCity_Condominiums_RoofRoom_MapEvents:: map_events CeladonCity_Condominiums_RoofRoom_EventObjects, CeladonCity_Condominiums_RoofRoom_MapWarps, 0x0, CeladonCity_Condominiums_RoofRoom_MapBGEvents CeladonCity_PokemonCenter_1F_EventObjects: @@ -5497,7 +5497,7 @@ CeladonCity_PokemonCenter_1F_MapWarps: warp_def 8, 8, 3, 4, 774 warp_def 1, 6, 4, 0, 2573 -gMapEvents_CeladonCity_PokemonCenter_1F:: +CeladonCity_PokemonCenter_1F_MapEvents:: map_events CeladonCity_PokemonCenter_1F_EventObjects, CeladonCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 CeladonCity_PokemonCenter_2F_EventObjects: @@ -5511,7 +5511,7 @@ CeladonCity_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_CeladonCity_PokemonCenter_2F:: +CeladonCity_PokemonCenter_2F_MapEvents:: map_events CeladonCity_PokemonCenter_2F_EventObjects, CeladonCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 CeladonCity_GameCorner_EventObjects: @@ -5571,7 +5571,7 @@ CeladonCity_GameCorner_MapBGEvents: bg_event 11, 1, 0, 0, 0, CeladonCity_GameCorner_EventScript_16CAAA bg_event 17, 13, 0, 3, 0, CeladonCity_GameCorner_EventScript_1B2867 -gMapEvents_CeladonCity_GameCorner:: +CeladonCity_GameCorner_MapEvents:: map_events CeladonCity_GameCorner_EventObjects, CeladonCity_GameCorner_MapWarps, 0x0, CeladonCity_GameCorner_MapBGEvents CeladonCity_GameCorner_PrizeRoom_EventObjects: @@ -5586,7 +5586,7 @@ CeladonCity_GameCorner_PrizeRoom_MapWarps: warp_def 4, 8, 3, 5, 774 warp_def 5, 9, 0, 5, 774 -gMapEvents_CeladonCity_GameCorner_PrizeRoom:: +CeladonCity_GameCorner_PrizeRoom_MapEvents:: map_events CeladonCity_GameCorner_PrizeRoom_EventObjects, CeladonCity_GameCorner_PrizeRoom_MapWarps, 0x0, 0x0 CeladonCity_Gym_EventObjects: @@ -5611,7 +5611,7 @@ CeladonCity_Gym_MapBGEvents: bg_event 4, 16, 0, 0, 0, CeladonCity_Gym_EventScript_16D1CC bg_event 8, 16, 0, 0, 0, CeladonCity_Gym_EventScript_16D1CC -gMapEvents_CeladonCity_Gym:: +CeladonCity_Gym_MapEvents:: map_events CeladonCity_Gym_EventObjects, CeladonCity_Gym_MapWarps, 0x0, CeladonCity_Gym_MapBGEvents CeladonCity_Restaurant_EventObjects: @@ -5626,7 +5626,7 @@ CeladonCity_Restaurant_MapWarps: warp_def 6, 9, 0, 7, 774 warp_def 7, 9, 0, 7, 774 -gMapEvents_CeladonCity_Restaurant:: +CeladonCity_Restaurant_MapEvents:: map_events CeladonCity_Restaurant_EventObjects, CeladonCity_Restaurant_MapWarps, 0x0, 0x0 CeladonCity_House1_EventObjects: @@ -5639,7 +5639,7 @@ CeladonCity_House1_MapWarps: warp_def 4, 7, 3, 8, 774 warp_def 5, 7, 3, 8, 774 -gMapEvents_CeladonCity_House1:: +CeladonCity_House1_MapEvents:: map_events CeladonCity_House1_EventObjects, CeladonCity_House1_MapWarps, 0x0, 0x0 CeladonCity_Hotel_EventObjects: @@ -5653,7 +5653,7 @@ CeladonCity_Hotel_MapWarps: warp_def 4, 9, 0, 9, 774 warp_def 5, 10, 0, 9, 774 -gMapEvents_CeladonCity_Hotel:: +CeladonCity_Hotel_MapEvents:: map_events CeladonCity_Hotel_EventObjects, CeladonCity_Hotel_MapWarps, 0x0, 0x0 FuchsiaCity_SafariZone_Entrance_EventObjects: @@ -5671,7 +5671,7 @@ FuchsiaCity_SafariZone_Entrance_MapCoordEvents: coord_event 5, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D379 coord_event 3, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D385 -gMapEvents_FuchsiaCity_SafariZone_Entrance:: +FuchsiaCity_SafariZone_Entrance_MapEvents:: map_events FuchsiaCity_SafariZone_Entrance_EventObjects, FuchsiaCity_SafariZone_Entrance_MapWarps, FuchsiaCity_SafariZone_Entrance_MapCoordEvents, 0x0 FuchsiaCity_Mart_EventObjects: @@ -5684,7 +5684,7 @@ FuchsiaCity_Mart_MapWarps: warp_def 4, 7, 3, 2, 775 warp_def 5, 7, 3, 2, 775 -gMapEvents_FuchsiaCity_Mart:: +FuchsiaCity_Mart_MapEvents:: map_events FuchsiaCity_Mart_EventObjects, FuchsiaCity_Mart_MapWarps, 0x0, 0x0 FuchsiaCity_ZooBuilding_EventObjects: @@ -5698,7 +5698,7 @@ FuchsiaCity_ZooBuilding_MapWarps: warp_def 6, 9, 0, 3, 775 warp_def 7, 9, 3, 3, 775 -gMapEvents_FuchsiaCity_ZooBuilding:: +FuchsiaCity_ZooBuilding_MapEvents:: map_events FuchsiaCity_ZooBuilding_EventObjects, FuchsiaCity_ZooBuilding_MapWarps, 0x0, 0x0 FuchsiaCity_Gym_EventObjects: @@ -5720,7 +5720,7 @@ FuchsiaCity_Gym_MapBGEvents: bg_event 4, 19, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D6A7 bg_event 10, 19, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D6A7 -gMapEvents_FuchsiaCity_Gym:: +FuchsiaCity_Gym_MapEvents:: map_events FuchsiaCity_Gym_EventObjects, FuchsiaCity_Gym_MapWarps, 0x0, FuchsiaCity_Gym_MapBGEvents FuchsiaCity_House1_EventObjects: @@ -5733,7 +5733,7 @@ FuchsiaCity_House1_MapWarps: warp_def 4, 7, 3, 5, 775 warp_def 5, 7, 3, 5, 775 -gMapEvents_FuchsiaCity_House1:: +FuchsiaCity_House1_MapEvents:: map_events FuchsiaCity_House1_EventObjects, FuchsiaCity_House1_MapWarps, 0x0, 0x0 FuchsiaCity_PokemonCenter_1F_EventObjects: @@ -5748,7 +5748,7 @@ FuchsiaCity_PokemonCenter_1F_MapWarps: warp_def 8, 8, 3, 6, 775 warp_def 1, 6, 4, 0, 2822 -gMapEvents_FuchsiaCity_PokemonCenter_1F:: +FuchsiaCity_PokemonCenter_1F_MapEvents:: map_events FuchsiaCity_PokemonCenter_1F_EventObjects, FuchsiaCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 FuchsiaCity_PokemonCenter_2F_EventObjects: @@ -5762,7 +5762,7 @@ FuchsiaCity_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_FuchsiaCity_PokemonCenter_2F:: +FuchsiaCity_PokemonCenter_2F_MapEvents:: map_events FuchsiaCity_PokemonCenter_2F_EventObjects, FuchsiaCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 FuchsiaCity_Building1_EventObjects: @@ -5782,7 +5782,7 @@ FuchsiaCity_Building1_MapBGEvents: bg_event 5, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D804 bg_event 6, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D80D -gMapEvents_FuchsiaCity_Building1:: +FuchsiaCity_Building1_MapEvents:: map_events FuchsiaCity_Building1_EventObjects, FuchsiaCity_Building1_MapWarps, 0x0, FuchsiaCity_Building1_MapBGEvents FuchsiaCity_House2_EventObjects: @@ -5794,7 +5794,7 @@ FuchsiaCity_House2_MapWarps: warp_def 4, 9, 0, 7, 775 warp_def 3, 1, 3, 8, 775 -gMapEvents_FuchsiaCity_House2:: +FuchsiaCity_House2_MapEvents:: map_events FuchsiaCity_House2_EventObjects, FuchsiaCity_House2_MapWarps, 0x0, 0x0 FuchsiaCity_House3_EventObjects: @@ -5803,7 +5803,7 @@ FuchsiaCity_House3_EventObjects: FuchsiaCity_House3_MapWarps: warp_def 4, 7, 3, 10, 775 -gMapEvents_FuchsiaCity_House3:: +FuchsiaCity_House3_MapEvents:: map_events FuchsiaCity_House3_EventObjects, FuchsiaCity_House3_MapWarps, 0x0, 0x0 CinnabarIsland_Gym_EventObjects: @@ -5839,7 +5839,7 @@ CinnabarIsland_Gym_MapBGEvents: bg_event 2, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16E04C bg_event 3, 1, 0, 1, 0, CinnabarIsland_Gym_EventScript_1ACF07 -gMapEvents_CinnabarIsland_Gym:: +CinnabarIsland_Gym_MapEvents:: map_events CinnabarIsland_Gym_EventObjects, CinnabarIsland_Gym_MapWarps, 0x0, CinnabarIsland_Gym_MapBGEvents CinnabarIsland_PokemonLab_Entrance_EventObjects: @@ -5859,7 +5859,7 @@ CinnabarIsland_PokemonLab_Entrance_MapBGEvents: bg_event 18, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6 bg_event 24, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF -gMapEvents_CinnabarIsland_PokemonLab_Entrance:: +CinnabarIsland_PokemonLab_Entrance_MapEvents:: map_events CinnabarIsland_PokemonLab_Entrance_EventObjects, CinnabarIsland_PokemonLab_Entrance_MapWarps, 0x0, CinnabarIsland_PokemonLab_Entrance_MapBGEvents CinnabarIsland_PokemonLab_Lounge_EventObjects: @@ -5870,7 +5870,7 @@ CinnabarIsland_PokemonLab_Lounge_EventObjects: CinnabarIsland_PokemonLab_Lounge_MapWarps: warp_def 7, 9, 3, 3, 3073 -gMapEvents_CinnabarIsland_PokemonLab_Lounge:: +CinnabarIsland_PokemonLab_Lounge_MapEvents:: map_events CinnabarIsland_PokemonLab_Lounge_EventObjects, CinnabarIsland_PokemonLab_Lounge_MapWarps, 0x0, 0x0 CinnabarIsland_PokemonLab_ResearchRoom_EventObjects: @@ -5884,7 +5884,7 @@ CinnabarIsland_PokemonLab_ResearchRoom_MapBGEvents: bg_event 6, 1, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7 bg_event 3, 1, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE -gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom:: +CinnabarIsland_PokemonLab_ResearchRoom_MapEvents:: map_events CinnabarIsland_PokemonLab_ResearchRoom_EventObjects, CinnabarIsland_PokemonLab_ResearchRoom_MapWarps, 0x0, CinnabarIsland_PokemonLab_ResearchRoom_MapBGEvents CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects: @@ -5894,7 +5894,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects: CinnabarIsland_PokemonLab_ExperimentRoom_MapWarps: warp_def 7, 9, 3, 5, 3073 -gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom:: +CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents:: map_events CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects, CinnabarIsland_PokemonLab_ExperimentRoom_MapWarps, 0x0, 0x0 CinnabarIsland_PokemonCenter_1F_EventObjects: @@ -5912,7 +5912,7 @@ CinnabarIsland_PokemonCenter_1F_MapWarps: warp_def 8, 8, 0, 3, 776 warp_def 1, 6, 4, 0, 3078 -gMapEvents_CinnabarIsland_PokemonCenter_1F:: +CinnabarIsland_PokemonCenter_1F_MapEvents:: map_events CinnabarIsland_PokemonCenter_1F_EventObjects, CinnabarIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 CinnabarIsland_PokemonCenter_2F_EventObjects: @@ -5926,7 +5926,7 @@ CinnabarIsland_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_CinnabarIsland_PokemonCenter_2F:: +CinnabarIsland_PokemonCenter_2F_MapEvents:: map_events CinnabarIsland_PokemonCenter_2F_EventObjects, CinnabarIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 CinnabarIsland_Mart_EventObjects: @@ -5939,7 +5939,7 @@ CinnabarIsland_Mart_MapWarps: warp_def 4, 7, 3, 4, 776 warp_def 5, 7, 3, 4, 776 -gMapEvents_CinnabarIsland_Mart:: +CinnabarIsland_Mart_MapEvents:: map_events CinnabarIsland_Mart_EventObjects, CinnabarIsland_Mart_MapWarps, 0x0, 0x0 IndigoPlateau_PokemonCenter_1F_EventObjects: @@ -5957,7 +5957,7 @@ IndigoPlateau_PokemonCenter_1F_MapWarps: warp_def 4, 1, 3, 0, 331 warp_def 1, 14, 4, 0, 3329 -gMapEvents_IndigoPlateau_PokemonCenter_1F:: +IndigoPlateau_PokemonCenter_1F_MapEvents:: map_events IndigoPlateau_PokemonCenter_1F_EventObjects, IndigoPlateau_PokemonCenter_1F_MapWarps, 0x0, 0x0 IndigoPlateau_PokemonCenter_2F_EventObjects: @@ -5971,7 +5971,7 @@ IndigoPlateau_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_IndigoPlateau_PokemonCenter_2F:: +IndigoPlateau_PokemonCenter_2F_MapEvents:: map_events IndigoPlateau_PokemonCenter_2F_EventObjects, IndigoPlateau_PokemonCenter_2F_MapWarps, 0x0, 0x0 SaffronCity_House1_1F_EventObjects: @@ -5985,7 +5985,7 @@ SaffronCity_House1_1F_MapWarps: warp_def 5, 8, 3, 1, 778 warp_def 10, 2, 3, 0, 3585 -gMapEvents_SaffronCity_House1_1F:: +SaffronCity_House1_1F_MapEvents:: map_events SaffronCity_House1_1F_EventObjects, SaffronCity_House1_1F_MapWarps, 0x0, 0x0 SaffronCity_House1_2F_EventObjects: @@ -6002,7 +6002,7 @@ SaffronCity_House1_2F_MapBGEvents: bg_event 3, 5, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EBD2 bg_event 2, 1, 0, 7, 0, 110, 26, 1 -gMapEvents_SaffronCity_House1_2F:: +SaffronCity_House1_2F_MapEvents:: map_events SaffronCity_House1_2F_EventObjects, SaffronCity_House1_2F_MapWarps, 0x0, SaffronCity_House1_2F_MapBGEvents SaffronCity_Dojo_EventObjects: @@ -6029,7 +6029,7 @@ SaffronCity_Dojo_MapBGEvents: bg_event 5, 2, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED34 bg_event 7, 2, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED3D -gMapEvents_SaffronCity_Dojo:: +SaffronCity_Dojo_MapEvents:: map_events SaffronCity_Dojo_EventObjects, SaffronCity_Dojo_MapWarps, SaffronCity_Dojo_MapCoordEvents, SaffronCity_Dojo_MapBGEvents SaffronCity_Gym_EventObjects: @@ -6082,7 +6082,7 @@ SaffronCity_Gym_MapBGEvents: bg_event 12, 20, 0, 0, 0, SaffronCity_Gym_EventScript_16EF55 bg_event 16, 20, 0, 0, 0, SaffronCity_Gym_EventScript_16EF55 -gMapEvents_SaffronCity_Gym:: +SaffronCity_Gym_MapEvents:: map_events SaffronCity_Gym_EventObjects, SaffronCity_Gym_MapWarps, 0x0, SaffronCity_Gym_MapBGEvents SaffronCity_House2_EventObjects: @@ -6099,7 +6099,7 @@ SaffronCity_House2_MapWarps: SaffronCity_House2_MapBGEvents: bg_event 5, 4, 3, 0, 0, SaffronCity_House2_EventScript_16EF99 -gMapEvents_SaffronCity_House2:: +SaffronCity_House2_MapEvents:: map_events SaffronCity_House2_EventObjects, SaffronCity_House2_MapWarps, 0x0, SaffronCity_House2_MapBGEvents SaffronCity_Mart_EventObjects: @@ -6112,7 +6112,7 @@ SaffronCity_Mart_MapWarps: warp_def 4, 7, 3, 5, 778 warp_def 5, 7, 3, 5, 778 -gMapEvents_SaffronCity_Mart:: +SaffronCity_Mart_MapEvents:: map_events SaffronCity_Mart_EventObjects, SaffronCity_Mart_MapWarps, 0x0, 0x0 SaffronCity_PokemonCenter_1F_EventObjects: @@ -6129,7 +6129,7 @@ SaffronCity_PokemonCenter_1F_MapWarps: warp_def 8, 8, 3, 6, 778 warp_def 1, 6, 4, 0, 3591 -gMapEvents_SaffronCity_PokemonCenter_1F:: +SaffronCity_PokemonCenter_1F_MapEvents:: map_events SaffronCity_PokemonCenter_1F_EventObjects, SaffronCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 SaffronCity_PokemonCenter_2F_EventObjects: @@ -6143,7 +6143,7 @@ SaffronCity_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_SaffronCity_PokemonCenter_2F:: +SaffronCity_PokemonCenter_2F_MapEvents:: map_events SaffronCity_PokemonCenter_2F_EventObjects, SaffronCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 SaffronCity_House3_EventObjects: @@ -6154,7 +6154,7 @@ SaffronCity_House3_MapWarps: warp_def 4, 7, 3, 7, 778 warp_def 5, 7, 3, 7, 778 -gMapEvents_SaffronCity_House3:: +SaffronCity_House3_MapEvents:: map_events SaffronCity_House3_EventObjects, SaffronCity_House3_MapWarps, 0x0, 0x0 SaffronCity_PokemonTrainerFanClub_EventObjects: @@ -6172,7 +6172,7 @@ SaffronCity_PokemonTrainerFanClub_EventObjects: SaffronCity_PokemonTrainerFanClub_MapWarps: warp_def 5, 15, 3, 14, 778 -gMapEvents_SaffronCity_PokemonTrainerFanClub:: +SaffronCity_PokemonTrainerFanClub_MapEvents:: map_events SaffronCity_PokemonTrainerFanClub_EventObjects, SaffronCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 Route2_ViridianForest_SouthEntrance_EventObjects: @@ -6185,7 +6185,7 @@ Route2_ViridianForest_SouthEntrance_MapWarps: warp_def 8, 10, 3, 2, 788 warp_def 7, 1, 3, 0, 256 -gMapEvents_Route2_ViridianForest_SouthEntrance:: +Route2_ViridianForest_SouthEntrance_MapEvents:: map_events Route2_ViridianForest_SouthEntrance_EventObjects, Route2_ViridianForest_SouthEntrance_MapWarps, 0x0, 0x0 Route2_House_EventObjects: @@ -6197,7 +6197,7 @@ Route2_House_MapWarps: warp_def 4, 7, 0, 4, 788 warp_def 5, 7, 0, 4, 788 -gMapEvents_Route2_House:: +Route2_House_MapEvents:: map_events Route2_House_EventObjects, Route2_House_MapWarps, 0x0, 0x0 Route2_EastBuilding_EventObjects: @@ -6210,7 +6210,7 @@ Route2_EastBuilding_MapWarps: warp_def 8, 10, 3, 5, 788 warp_def 7, 1, 3, 6, 788 -gMapEvents_Route2_EastBuilding:: +Route2_EastBuilding_MapEvents:: map_events Route2_EastBuilding_EventObjects, Route2_EastBuilding_MapWarps, 0x0, 0x0 Route2_ViridianForest_NorthEntrance_EventObjects: @@ -6224,7 +6224,7 @@ Route2_ViridianForest_NorthEntrance_MapWarps: warp_def 8, 10, 3, 2, 256 warp_def 7, 1, 3, 0, 788 -gMapEvents_Route2_ViridianForest_NorthEntrance:: +Route2_ViridianForest_NorthEntrance_MapEvents:: map_events Route2_ViridianForest_NorthEntrance_EventObjects, Route2_ViridianForest_NorthEntrance_MapWarps, 0x0, 0x0 Route4_PokemonCenter_1F_EventObjects: @@ -6241,7 +6241,7 @@ Route4_PokemonCenter_1F_MapWarps: warp_def 8, 8, 3, 2, 790 warp_def 1, 6, 4, 0, 4097 -gMapEvents_Route4_PokemonCenter_1F:: +Route4_PokemonCenter_1F_MapEvents:: map_events Route4_PokemonCenter_1F_EventObjects, Route4_PokemonCenter_1F_MapWarps, 0x0, 0x0 Route4_PokemonCenter_2F_EventObjects: @@ -6255,7 +6255,7 @@ Route4_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_Route4_PokemonCenter_2F:: +Route4_PokemonCenter_2F_MapEvents:: map_events Route4_PokemonCenter_2F_EventObjects, Route4_PokemonCenter_2F_MapWarps, 0x0, 0x0 Route5_PokemonDayCare_EventObjects: @@ -6266,7 +6266,7 @@ Route5_PokemonDayCare_MapWarps: warp_def 4, 7, 0, 1, 791 warp_def 5, 7, 0, 1, 791 -gMapEvents_Route5_PokemonDayCare:: +Route5_PokemonDayCare_MapEvents:: map_events Route5_PokemonDayCare_EventObjects, Route5_PokemonDayCare_MapWarps, 0x0, 0x0 Route5_SouthEntrance_EventObjects: @@ -6283,7 +6283,7 @@ Route5_SouthEntrance_MapCoordEvents: coord_event 4, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F916 coord_event 5, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F922 -gMapEvents_Route5_SouthEntrance:: +Route5_SouthEntrance_MapEvents:: map_events Route5_SouthEntrance_EventObjects, Route5_SouthEntrance_MapWarps, Route5_SouthEntrance_MapCoordEvents, 0x0 Route6_NorthEntrance_EventObjects: @@ -6300,11 +6300,11 @@ Route6_NorthEntrance_MapCoordEvents: coord_event 4, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9DC coord_event 5, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9E8 -gMapEvents_Route6_NorthEntrance:: +Route6_NorthEntrance_MapEvents:: map_events Route6_NorthEntrance_EventObjects, Route6_NorthEntrance_MapWarps, Route6_NorthEntrance_MapCoordEvents, 0x0 -gMapEvents_UnknownMap_18_01:: +UnknownMap_18_01_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 Route7_EastEntrance_EventObjects: @@ -6321,7 +6321,7 @@ Route7_EastEntrance_MapCoordEvents: coord_event 6, 5, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FAA3 coord_event 6, 6, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FAAF -gMapEvents_Route7_EastEntrance:: +Route7_EastEntrance_MapEvents:: map_events Route7_EastEntrance_EventObjects, Route7_EastEntrance_MapWarps, Route7_EastEntrance_MapCoordEvents, 0x0 Route8_WestEntrance_EventObjects: @@ -6338,7 +6338,7 @@ Route8_WestEntrance_MapCoordEvents: coord_event 6, 5, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB69 coord_event 6, 6, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB75 -gMapEvents_Route8_WestEntrance:: +Route8_WestEntrance_MapEvents:: map_events Route8_WestEntrance_EventObjects, Route8_WestEntrance_MapWarps, Route8_WestEntrance_MapCoordEvents, 0x0 Route10_PokemonCenter_1F_EventObjects: @@ -6354,7 +6354,7 @@ Route10_PokemonCenter_1F_MapWarps: warp_def 8, 8, 3, 3, 796 warp_def 1, 6, 4, 0, 5377 -gMapEvents_Route10_PokemonCenter_1F:: +Route10_PokemonCenter_1F_MapEvents:: map_events Route10_PokemonCenter_1F_EventObjects, Route10_PokemonCenter_1F_MapWarps, 0x0, 0x0 Route10_PokemonCenter_2F_EventObjects: @@ -6368,7 +6368,7 @@ Route10_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_Route10_PokemonCenter_2F:: +Route10_PokemonCenter_2F_MapEvents:: map_events Route10_PokemonCenter_2F_EventObjects, Route10_PokemonCenter_2F_MapWarps, 0x0, 0x0 Route11_EastEntrance_1F_EventObjects: @@ -6382,7 +6382,7 @@ Route11_EastEntrance_1F_MapWarps: warp_def 11, 7, 3, 2, 797 warp_def 9, 10, 3, 0, 5633 -gMapEvents_Route11_EastEntrance_1F:: +Route11_EastEntrance_1F_MapEvents:: map_events Route11_EastEntrance_1F_EventObjects, Route11_EastEntrance_1F_MapWarps, 0x0, 0x0 Route11_EastEntrance_2F_EventObjects: @@ -6396,7 +6396,7 @@ Route11_EastEntrance_2F_MapBGEvents: bg_event 4, 1, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD35 bg_event 8, 1, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD53 -gMapEvents_Route11_EastEntrance_2F:: +Route11_EastEntrance_2F_MapEvents:: map_events Route11_EastEntrance_2F_EventObjects, Route11_EastEntrance_2F_MapWarps, 0x0, Route11_EastEntrance_2F_MapBGEvents Route12_NorthEntrance_1F_EventObjects: @@ -6409,7 +6409,7 @@ Route12_NorthEntrance_1F_MapWarps: warp_def 6, 11, 3, 3, 798 warp_def 8, 10, 3, 0, 5889 -gMapEvents_Route12_NorthEntrance_1F:: +Route12_NorthEntrance_1F_MapEvents:: map_events Route12_NorthEntrance_1F_EventObjects, Route12_NorthEntrance_1F_MapWarps, 0x0, 0x0 Route12_NorthEntrance_2F_EventObjects: @@ -6422,7 +6422,7 @@ Route12_NorthEntrance_2F_MapBGEvents: bg_event 4, 1, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE78 bg_event 8, 1, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE81 -gMapEvents_Route12_NorthEntrance_2F:: +Route12_NorthEntrance_2F_MapEvents:: map_events Route12_NorthEntrance_2F_EventObjects, Route12_NorthEntrance_2F_MapWarps, 0x0, Route12_NorthEntrance_2F_MapBGEvents Route12_FishingHouse_EventObjects: @@ -6436,7 +6436,7 @@ Route12_FishingHouse_MapWarps: Route12_FishingHouse_MapBGEvents: bg_event 9, 1, 0, 0, 0, Route12_FishingHouse_EventScript_170067 -gMapEvents_Route12_FishingHouse:: +Route12_FishingHouse_MapEvents:: map_events Route12_FishingHouse_EventObjects, Route12_FishingHouse_MapWarps, 0x0, Route12_FishingHouse_MapBGEvents Route15_WestEntrance_1F_EventObjects: @@ -6449,7 +6449,7 @@ Route15_WestEntrance_1F_MapWarps: warp_def 11, 7, 3, 1, 801 warp_def 9, 10, 3, 0, 6145 -gMapEvents_Route15_WestEntrance_1F:: +Route15_WestEntrance_1F_MapEvents:: map_events Route15_WestEntrance_1F_EventObjects, Route15_WestEntrance_1F_MapWarps, 0x0, 0x0 Route15_WestEntrance_2F_EventObjects: @@ -6462,7 +6462,7 @@ Route15_WestEntrance_2F_MapBGEvents: bg_event 4, 1, 0, 0, 0, Route15_WestEntrance_2F_EventScript_170093 bg_event 8, 1, 0, 0, 0, Route15_WestEntrance_2F_EventScript_1700B0 -gMapEvents_Route15_WestEntrance_2F:: +Route15_WestEntrance_2F_MapEvents:: map_events Route15_WestEntrance_2F_EventObjects, Route15_WestEntrance_2F_MapWarps, 0x0, Route15_WestEntrance_2F_MapBGEvents Route16_House_EventObjects: @@ -6474,7 +6474,7 @@ Route16_House_MapWarps: warp_def 4, 7, 3, 0, 802 warp_def 5, 7, 3, 0, 802 -gMapEvents_Route16_House:: +Route16_House_MapEvents:: map_events Route16_House_EventObjects, Route16_House_MapWarps, 0x0, 0x0 Route16_NorthEntrance_1F_EventObjects: @@ -6501,7 +6501,7 @@ Route16_NorthEntrance_1F_MapCoordEvents: coord_event 6, 13, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_170208 coord_event 6, 14, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_170214 -gMapEvents_Route16_NorthEntrance_1F:: +Route16_NorthEntrance_1F_MapEvents:: map_events Route16_NorthEntrance_1F_EventObjects, Route16_NorthEntrance_1F_MapWarps, Route16_NorthEntrance_1F_MapCoordEvents, 0x0 Route16_NorthEntrance_2F_EventObjects: @@ -6516,7 +6516,7 @@ Route16_NorthEntrance_2F_MapBGEvents: bg_event 4, 1, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702D1 bg_event 8, 1, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702DA -gMapEvents_Route16_NorthEntrance_2F:: +Route16_NorthEntrance_2F_MapEvents:: map_events Route16_NorthEntrance_2F_EventObjects, Route16_NorthEntrance_2F_MapWarps, 0x0, Route16_NorthEntrance_2F_MapBGEvents Route18_EastEntrance_1F_EventObjects: @@ -6540,7 +6540,7 @@ Route18_EastEntrance_1F_MapCoordEvents: coord_event 1, 5, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 coord_event 1, 7, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 -gMapEvents_Route18_EastEntrance_1F:: +Route18_EastEntrance_1F_MapEvents:: map_events Route18_EastEntrance_1F_EventObjects, Route18_EastEntrance_1F_MapWarps, Route18_EastEntrance_1F_MapCoordEvents, 0x0 Route18_EastEntrance_2F_EventObjects: @@ -6553,11 +6553,11 @@ Route18_EastEntrance_2F_MapBGEvents: bg_event 4, 1, 0, 0, 0, Route18_EastEntrance_2F_EventScript_17046C bg_event 8, 1, 0, 0, 0, Route18_EastEntrance_2F_EventScript_170475 -gMapEvents_Route18_EastEntrance_2F:: +Route18_EastEntrance_2F_MapEvents:: map_events Route18_EastEntrance_2F_EventObjects, Route18_EastEntrance_2F_MapWarps, 0x0, Route18_EastEntrance_2F_MapBGEvents -gMapEvents_UnusedHouse_27_00:: +UnusedHouse_27_00_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 Route22_NorthEntrance_EventObjects: @@ -6572,11 +6572,11 @@ Route22_NorthEntrance_MapWarps: Route22_NorthEntrance_MapCoordEvents: coord_event 7, 2, 3, 0, 16479, 0, 0, Route22_NorthEntrance_EventScript_17050D -gMapEvents_Route22_NorthEntrance:: +Route22_NorthEntrance_MapEvents:: map_events Route22_NorthEntrance_EventObjects, Route22_NorthEntrance_MapWarps, Route22_NorthEntrance_MapCoordEvents, 0x0 -gMapEvents_UnusedHouse_29_00:: +UnusedHouse_29_00_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 Route25_SeaCottage_EventObjects: @@ -6591,7 +6591,7 @@ Route25_SeaCottage_MapWarps: Route25_SeaCottage_MapBGEvents: bg_event 4, 5, 0, 1, 0, Route25_SeaCottage_EventScript_1706DD -gMapEvents_Route25_SeaCottage:: +Route25_SeaCottage_MapEvents:: map_events Route25_SeaCottage_EventObjects, Route25_SeaCottage_MapWarps, 0x0, Route25_SeaCottage_MapBGEvents SevenIsland_House_Room1_EventObjects: @@ -6604,7 +6604,7 @@ SevenIsland_House_Room1_MapWarps: SevenIsland_House_Room1_MapBGEvents: bg_event 4, 1, 0, 0, 0, SevenIsland_House_Room1_EventScript_170A75 -gMapEvents_SevenIsland_House_Room1:: +SevenIsland_House_Room1_MapEvents:: map_events SevenIsland_House_Room1_EventObjects, SevenIsland_House_Room1_MapWarps, 0x0, SevenIsland_House_Room1_MapBGEvents SevenIsland_House_Room2_EventObjects: @@ -6613,7 +6613,7 @@ SevenIsland_House_Room2_EventObjects: SevenIsland_House_Room2_MapWarps: warp_def 3, 1, 0, 1, 7936 -gMapEvents_SevenIsland_House_Room2:: +SevenIsland_House_Room2_MapEvents:: map_events SevenIsland_House_Room2_EventObjects, SevenIsland_House_Room2_MapWarps, 0x0, 0x0 SevenIsland_Mart_EventObjects: @@ -6625,7 +6625,7 @@ SevenIsland_Mart_EventObjects: SevenIsland_Mart_MapWarps: warp_def 4, 7, 3, 1, 785 -gMapEvents_SevenIsland_Mart:: +SevenIsland_Mart_MapEvents:: map_events SevenIsland_Mart_EventObjects, SevenIsland_Mart_MapWarps, 0x0, 0x0 SevenIsland_PokemonCenter_1F_EventObjects: @@ -6640,7 +6640,7 @@ SevenIsland_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, 785 warp_def 1, 6, 4, 0, 7940 -gMapEvents_SevenIsland_PokemonCenter_1F:: +SevenIsland_PokemonCenter_1F_MapEvents:: map_events SevenIsland_PokemonCenter_1F_EventObjects, SevenIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 SevenIsland_PokemonCenter_2F_EventObjects: @@ -6654,11 +6654,11 @@ SevenIsland_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_SevenIsland_PokemonCenter_2F:: +SevenIsland_PokemonCenter_2F_MapEvents:: map_events SevenIsland_PokemonCenter_2F_EventObjects, SevenIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 -gMapEvents_UnusedHouse_31_05:: +UnusedHouse_31_05_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 SevenIsland_Harbor_EventObjects: @@ -6668,7 +6668,7 @@ SevenIsland_Harbor_EventObjects: SevenIsland_Harbor_MapWarps: warp_def 8, 2, 3, 3, 785 -gMapEvents_SevenIsland_Harbor:: +SevenIsland_Harbor_MapEvents:: map_events SevenIsland_Harbor_EventObjects, SevenIsland_Harbor_MapWarps, 0x0, 0x0 OneIsland_PokemonCenter_1F_EventObjects: @@ -6700,7 +6700,7 @@ OneIsland_PokemonCenter_1F_MapBGEvents: bg_event 16, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 bg_event 17, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 -gMapEvents_OneIsland_PokemonCenter_1F:: +OneIsland_PokemonCenter_1F_MapEvents:: map_events OneIsland_PokemonCenter_1F_EventObjects, OneIsland_PokemonCenter_1F_MapWarps, OneIsland_PokemonCenter_1F_MapCoordEvents, OneIsland_PokemonCenter_1F_MapBGEvents OneIsland_PokemonCenter_2F_EventObjects: @@ -6714,7 +6714,7 @@ OneIsland_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_OneIsland_PokemonCenter_2F:: +OneIsland_PokemonCenter_2F_MapEvents:: map_events OneIsland_PokemonCenter_2F_EventObjects, OneIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 OneIsland_House1_EventObjects: @@ -6724,7 +6724,7 @@ OneIsland_House1_EventObjects: OneIsland_House1_MapWarps: warp_def 4, 7, 3, 1, 780 -gMapEvents_OneIsland_House1:: +OneIsland_House1_MapEvents:: map_events OneIsland_House1_EventObjects, OneIsland_House1_MapWarps, 0x0, 0x0 OneIsland_House2_EventObjects: @@ -6733,7 +6733,7 @@ OneIsland_House2_EventObjects: OneIsland_House2_MapWarps: warp_def 4, 7, 3, 2, 780 -gMapEvents_OneIsland_House2:: +OneIsland_House2_MapEvents:: map_events OneIsland_House2_EventObjects, OneIsland_House2_MapWarps, 0x0, 0x0 OneIsland_Harbor_EventObjects: @@ -6743,7 +6743,7 @@ OneIsland_Harbor_EventObjects: OneIsland_Harbor_MapWarps: warp_def 8, 2, 3, 3, 780 -gMapEvents_OneIsland_Harbor:: +OneIsland_Harbor_MapEvents:: map_events OneIsland_Harbor_EventObjects, OneIsland_Harbor_MapWarps, 0x0, 0x0 TwoIsland_JoyfulGameCorner_EventObjects: @@ -6759,7 +6759,7 @@ TwoIsland_JoyfulGameCorner_MapBGEvents: bg_event 1, 1, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_1BC2E7 bg_event 0, 1, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_1BC2FC -gMapEvents_TwoIsland_JoyfulGameCorner:: +TwoIsland_JoyfulGameCorner_MapEvents:: map_events TwoIsland_JoyfulGameCorner_EventObjects, TwoIsland_JoyfulGameCorner_MapWarps, 0x0, TwoIsland_JoyfulGameCorner_MapBGEvents TwoIsland_House_EventObjects: @@ -6768,7 +6768,7 @@ TwoIsland_House_EventObjects: TwoIsland_House_MapWarps: warp_def 4, 7, 3, 1, 781 -gMapEvents_TwoIsland_House:: +TwoIsland_House_MapEvents:: map_events TwoIsland_House_EventObjects, TwoIsland_House_MapWarps, 0x0, 0x0 TwoIsland_PokemonCenter_1F_EventObjects: @@ -6780,7 +6780,7 @@ TwoIsland_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, 781 warp_def 1, 6, 4, 0, 8451 -gMapEvents_TwoIsland_PokemonCenter_1F:: +TwoIsland_PokemonCenter_1F_MapEvents:: map_events TwoIsland_PokemonCenter_1F_EventObjects, TwoIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 TwoIsland_PokemonCenter_2F_EventObjects: @@ -6794,7 +6794,7 @@ TwoIsland_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_TwoIsland_PokemonCenter_2F:: +TwoIsland_PokemonCenter_2F_MapEvents:: map_events TwoIsland_PokemonCenter_2F_EventObjects, TwoIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 TwoIsland_Harbor_EventObjects: @@ -6804,7 +6804,7 @@ TwoIsland_Harbor_EventObjects: TwoIsland_Harbor_MapWarps: warp_def 8, 2, 3, 3, 781 -gMapEvents_TwoIsland_Harbor:: +TwoIsland_Harbor_MapEvents:: map_events TwoIsland_Harbor_EventObjects, TwoIsland_Harbor_MapWarps, 0x0, 0x0 ThreeIsland_House1_EventObjects: @@ -6816,7 +6816,7 @@ ThreeIsland_House1_MapWarps: ThreeIsland_House1_MapBGEvents: bg_event 2, 1, 0, 0, 0, ThreeIsland_House1_EventScript_171829 -gMapEvents_ThreeIsland_House1:: +ThreeIsland_House1_MapEvents:: map_events ThreeIsland_House1_EventObjects, ThreeIsland_House1_MapWarps, 0x0, ThreeIsland_House1_MapBGEvents ThreeIsland_PokemonCenter_1F_EventObjects: @@ -6829,7 +6829,7 @@ ThreeIsland_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, 782 warp_def 1, 6, 4, 0, 8706 -gMapEvents_ThreeIsland_PokemonCenter_1F:: +ThreeIsland_PokemonCenter_1F_MapEvents:: map_events ThreeIsland_PokemonCenter_1F_EventObjects, ThreeIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 ThreeIsland_PokemonCenter_2F_EventObjects: @@ -6843,7 +6843,7 @@ ThreeIsland_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_ThreeIsland_PokemonCenter_2F:: +ThreeIsland_PokemonCenter_2F_MapEvents:: map_events ThreeIsland_PokemonCenter_2F_EventObjects, ThreeIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 ThreeIsland_Mart_EventObjects: @@ -6855,7 +6855,7 @@ ThreeIsland_Mart_EventObjects: ThreeIsland_Mart_MapWarps: warp_def 4, 7, 3, 2, 782 -gMapEvents_ThreeIsland_Mart:: +ThreeIsland_Mart_MapEvents:: map_events ThreeIsland_Mart_EventObjects, ThreeIsland_Mart_MapWarps, 0x0, 0x0 ThreeIsland_House2_EventObjects: @@ -6865,7 +6865,7 @@ ThreeIsland_House2_EventObjects: ThreeIsland_House2_MapWarps: warp_def 4, 7, 3, 3, 782 -gMapEvents_ThreeIsland_House2:: +ThreeIsland_House2_MapEvents:: map_events ThreeIsland_House2_EventObjects, ThreeIsland_House2_MapWarps, 0x0, 0x0 ThreeIsland_House3_EventObjects: @@ -6874,7 +6874,7 @@ ThreeIsland_House3_EventObjects: ThreeIsland_House3_MapWarps: warp_def 4, 7, 3, 4, 782 -gMapEvents_ThreeIsland_House3:: +ThreeIsland_House3_MapEvents:: map_events ThreeIsland_House3_EventObjects, ThreeIsland_House3_MapWarps, 0x0, 0x0 ThreeIsland_House4_EventObjects: @@ -6884,7 +6884,7 @@ ThreeIsland_House4_EventObjects: ThreeIsland_House4_MapWarps: warp_def 4, 7, 3, 5, 782 -gMapEvents_ThreeIsland_House4:: +ThreeIsland_House4_MapEvents:: map_events ThreeIsland_House4_EventObjects, ThreeIsland_House4_MapWarps, 0x0, 0x0 ThreeIsland_House5_EventObjects: @@ -6893,7 +6893,7 @@ ThreeIsland_House5_EventObjects: ThreeIsland_House5_MapWarps: warp_def 4, 7, 3, 6, 782 -gMapEvents_ThreeIsland_House5:: +ThreeIsland_House5_MapEvents:: map_events ThreeIsland_House5_EventObjects, ThreeIsland_House5_MapWarps, 0x0, 0x0 FourIsland_PokemonDayCare_EventObjects: @@ -6902,7 +6902,7 @@ FourIsland_PokemonDayCare_EventObjects: FourIsland_PokemonDayCare_MapWarps: warp_def 4, 7, 3, 1, 783 -gMapEvents_FourIsland_PokemonDayCare:: +FourIsland_PokemonDayCare_MapEvents:: map_events FourIsland_PokemonDayCare_EventObjects, FourIsland_PokemonDayCare_MapWarps, 0x0, 0x0 FourIsland_PokemonCenter_1F_EventObjects: @@ -6919,7 +6919,7 @@ FourIsland_PokemonCenter_1F_MapBGEvents: bg_event 3, 1, 0, 1, 0, FourIsland_PokemonCenter_1F_EventScript_1ACDD0 bg_event 2, 1, 0, 1, 0, FourIsland_PokemonCenter_1F_EventScript_1ACDD0 -gMapEvents_FourIsland_PokemonCenter_1F:: +FourIsland_PokemonCenter_1F_MapEvents:: map_events FourIsland_PokemonCenter_1F_EventObjects, FourIsland_PokemonCenter_1F_MapWarps, 0x0, FourIsland_PokemonCenter_1F_MapBGEvents FourIsland_PokemonCenter_2F_EventObjects: @@ -6933,7 +6933,7 @@ FourIsland_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_FourIsland_PokemonCenter_2F:: +FourIsland_PokemonCenter_2F_MapEvents:: map_events FourIsland_PokemonCenter_2F_EventObjects, FourIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 FourIsland_House1_EventObjects: @@ -6943,7 +6943,7 @@ FourIsland_House1_EventObjects: FourIsland_House1_MapWarps: warp_def 4, 7, 3, 2, 783 -gMapEvents_FourIsland_House1:: +FourIsland_House1_MapEvents:: map_events FourIsland_House1_EventObjects, FourIsland_House1_MapWarps, 0x0, 0x0 FourIsland_LoreleisHouse_EventObjects: @@ -6966,7 +6966,7 @@ FourIsland_LoreleisHouse_EventObjects: FourIsland_LoreleisHouse_MapWarps: warp_def 4, 7, 3, 4, 783 -gMapEvents_FourIsland_LoreleisHouse:: +FourIsland_LoreleisHouse_MapEvents:: map_events FourIsland_LoreleisHouse_EventObjects, FourIsland_LoreleisHouse_MapWarps, 0x0, 0x0 FourIsland_Harbor_EventObjects: @@ -6976,7 +6976,7 @@ FourIsland_Harbor_EventObjects: FourIsland_Harbor_MapWarps: warp_def 8, 2, 3, 6, 783 -gMapEvents_FourIsland_Harbor:: +FourIsland_Harbor_MapEvents:: map_events FourIsland_Harbor_EventObjects, FourIsland_Harbor_MapWarps, 0x0, 0x0 FourIsland_House2_EventObjects: @@ -6985,7 +6985,7 @@ FourIsland_House2_EventObjects: FourIsland_House2_MapWarps: warp_def 4, 7, 3, 5, 783 -gMapEvents_FourIsland_House2:: +FourIsland_House2_MapEvents:: map_events FourIsland_House2_EventObjects, FourIsland_House2_MapWarps, 0x0, 0x0 FourIsland_Mart_EventObjects: @@ -6996,7 +6996,7 @@ FourIsland_Mart_EventObjects: FourIsland_Mart_MapWarps: warp_def 4, 7, 3, 7, 783 -gMapEvents_FourIsland_Mart:: +FourIsland_Mart_MapEvents:: map_events FourIsland_Mart_EventObjects, FourIsland_Mart_MapWarps, 0x0, 0x0 FiveIsland_PokemonCenter_1F_EventObjects: @@ -7010,7 +7010,7 @@ FiveIsland_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, 784 warp_def 1, 6, 4, 0, 9217 -gMapEvents_FiveIsland_PokemonCenter_1F:: +FiveIsland_PokemonCenter_1F_MapEvents:: map_events FiveIsland_PokemonCenter_1F_EventObjects, FiveIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 FiveIsland_PokemonCenter_2F_EventObjects: @@ -7024,7 +7024,7 @@ FiveIsland_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_FiveIsland_PokemonCenter_2F:: +FiveIsland_PokemonCenter_2F_MapEvents:: map_events FiveIsland_PokemonCenter_2F_EventObjects, FiveIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 FiveIsland_Harbor_EventObjects: @@ -7034,7 +7034,7 @@ FiveIsland_Harbor_EventObjects: FiveIsland_Harbor_MapWarps: warp_def 8, 2, 3, 0, 784 -gMapEvents_FiveIsland_Harbor:: +FiveIsland_Harbor_MapEvents:: map_events FiveIsland_Harbor_EventObjects, FiveIsland_Harbor_MapWarps, 0x0, 0x0 FiveIsland_House1_EventObjects: @@ -7043,7 +7043,7 @@ FiveIsland_House1_EventObjects: FiveIsland_House1_MapWarps: warp_def 4, 7, 3, 2, 784 -gMapEvents_FiveIsland_House1:: +FiveIsland_House1_MapEvents:: map_events FiveIsland_House1_EventObjects, FiveIsland_House1_MapWarps, 0x0, 0x0 FiveIsland_House2_EventObjects: @@ -7052,7 +7052,7 @@ FiveIsland_House2_EventObjects: FiveIsland_House2_MapWarps: warp_def 4, 7, 3, 3, 784 -gMapEvents_FiveIsland_House2:: +FiveIsland_House2_MapEvents:: map_events FiveIsland_House2_EventObjects, FiveIsland_House2_MapWarps, 0x0, 0x0 SixIsland_PokemonCenter_1F_EventObjects: @@ -7065,7 +7065,7 @@ SixIsland_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, 786 warp_def 1, 6, 4, 0, 9473 -gMapEvents_SixIsland_PokemonCenter_1F:: +SixIsland_PokemonCenter_1F_MapEvents:: map_events SixIsland_PokemonCenter_1F_EventObjects, SixIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 SixIsland_PokemonCenter_2F_EventObjects: @@ -7079,7 +7079,7 @@ SixIsland_PokemonCenter_2F_MapWarps: warp_def 5, 1, 0, 0, 4 warp_def 9, 1, 0, 0, 1 -gMapEvents_SixIsland_PokemonCenter_2F:: +SixIsland_PokemonCenter_2F_MapEvents:: map_events SixIsland_PokemonCenter_2F_EventObjects, SixIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 SixIsland_Harbor_EventObjects: @@ -7089,7 +7089,7 @@ SixIsland_Harbor_EventObjects: SixIsland_Harbor_MapWarps: warp_def 8, 2, 3, 0, 786 -gMapEvents_SixIsland_Harbor:: +SixIsland_Harbor_MapEvents:: map_events SixIsland_Harbor_EventObjects, SixIsland_Harbor_MapWarps, 0x0, 0x0 SixIsland_House_EventObjects: @@ -7098,7 +7098,7 @@ SixIsland_House_EventObjects: SixIsland_House_MapWarps: warp_def 4, 7, 3, 2, 786 -gMapEvents_SixIsland_House:: +SixIsland_House_MapEvents:: map_events SixIsland_House_EventObjects, SixIsland_House_MapWarps, 0x0, 0x0 SixIsland_Mart_EventObjects: @@ -7109,7 +7109,7 @@ SixIsland_Mart_EventObjects: SixIsland_Mart_MapWarps: warp_def 4, 7, 3, 3, 786 -gMapEvents_SixIsland_Mart:: +SixIsland_Mart_MapEvents:: map_events SixIsland_Mart_EventObjects, SixIsland_Mart_MapWarps, 0x0, 0x0 ThreeIsland_Harbor_EventObjects: @@ -7119,7 +7119,7 @@ ThreeIsland_Harbor_EventObjects: ThreeIsland_Harbor_MapWarps: warp_def 8, 2, 3, 2, 817 -gMapEvents_ThreeIsland_Harbor:: +ThreeIsland_Harbor_MapEvents:: map_events ThreeIsland_Harbor_EventObjects, ThreeIsland_Harbor_MapWarps, 0x0, 0x0 FiveIsland_ResortGorgeous_House_EventObjects: @@ -7133,7 +7133,7 @@ FiveIsland_ResortGorgeous_House_MapBGEvents: bg_event 9, 1, 0, 1, 0, FiveIsland_ResortGorgeous_House_EventScript_1ACF2C bg_event 8, 1, 0, 1, 0, FiveIsland_ResortGorgeous_House_EventScript_1ACF2C -gMapEvents_FiveIsland_ResortGorgeous_House:: +FiveIsland_ResortGorgeous_House_MapEvents:: map_events FiveIsland_ResortGorgeous_House_EventObjects, FiveIsland_ResortGorgeous_House_MapWarps, 0x0, FiveIsland_ResortGorgeous_House_MapBGEvents TwoIsland_CapeBrink_House_EventObjects: @@ -7142,7 +7142,7 @@ TwoIsland_CapeBrink_House_EventObjects: TwoIsland_CapeBrink_House_MapWarps: warp_def 4, 7, 3, 0, 815 -gMapEvents_TwoIsland_CapeBrink_House:: +TwoIsland_CapeBrink_House_MapEvents:: map_events TwoIsland_CapeBrink_House_EventObjects, TwoIsland_CapeBrink_House_MapWarps, 0x0, 0x0 SixIsland_WaterPath_House1_EventObjects: @@ -7154,7 +7154,7 @@ SixIsland_WaterPath_House1_MapWarps: SixIsland_WaterPath_House1_MapBGEvents: bg_event 9, 1, 0, 0, 0, SixIsland_WaterPath_House1_EventScript_172157 -gMapEvents_SixIsland_WaterPath_House1:: +SixIsland_WaterPath_House1_MapEvents:: map_events SixIsland_WaterPath_House1_EventObjects, SixIsland_WaterPath_House1_MapWarps, 0x0, SixIsland_WaterPath_House1_MapBGEvents SixIsland_WaterPath_House2_EventObjects: @@ -7163,7 +7163,7 @@ SixIsland_WaterPath_House2_EventObjects: SixIsland_WaterPath_House2_MapWarps: warp_def 4, 7, 3, 1, 828 -gMapEvents_SixIsland_WaterPath_House2:: +SixIsland_WaterPath_House2_MapEvents:: map_events SixIsland_WaterPath_House2_EventObjects, SixIsland_WaterPath_House2_MapWarps, 0x0, 0x0 SevenIsland_SevaultCanyon_House_EventObjects: @@ -7174,6 +7174,6 @@ SevenIsland_SevaultCanyon_House_EventObjects: SevenIsland_SevaultCanyon_House_MapWarps: warp_def 4, 7, 3, 1, 832 -gMapEvents_SevenIsland_SevaultCanyon_House:: +SevenIsland_SevaultCanyon_House_MapEvents:: map_events SevenIsland_SevaultCanyon_House_EventObjects, SevenIsland_SevaultCanyon_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 5bcc49c74..2634948be 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -1,7 +1,7 @@ BirthIsland_Exterior:: @ 83505A8 .4byte BirthIsland_Exterior_Layout @ 0x8348380 - .4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C - .4byte gMapScripts_BirthIsland_Exterior @ 0x8165203 + .4byte BirthIsland_Exterior_MapEvents @ 0x83B4C1C + .4byte BirthIsland_Exterior_MapScripts @ 0x8165203 .4byte NULL .2byte 0xFFFF .2byte 342 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index a082ac025..68253d8df 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -1,7 +1,7 @@ BirthIsland_Harbor:: @ 83505E0 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24 - .4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6 + .4byte BirthIsland_Harbor_MapEvents @ 0x83B4D24 + .4byte BirthIsland_Harbor_MapScripts @ 0x81653E6 .4byte NULL .2byte 0xFFFF .2byte 315 diff --git a/data/maps/CeladonCity/header.inc b/data/maps/CeladonCity/header.inc index 146c03ab2..2ec3fc62c 100644 --- a/data/maps/CeladonCity/header.inc +++ b/data/maps/CeladonCity/header.inc @@ -1,7 +1,7 @@ CeladonCity:: @ 83506C0 .4byte CeladonCity_Layout @ 0x82E2818 - .4byte gMapEvents_CeladonCity @ 0x83B5898 - .4byte gMapScripts_CeladonCity @ 0x8166C8F + .4byte CeladonCity_MapEvents @ 0x83B5898 + .4byte CeladonCity_MapScripts @ 0x8166C8F .4byte CeladonCity_MapConnections @ 0x835285C .2byte BGM_FRLG_CELADON_CITY .2byte 84 diff --git a/data/maps/CeladonCity_Condominiums_1F/header.inc b/data/maps/CeladonCity_Condominiums_1F/header.inc index 9b842ae2d..b059b11fd 100644 --- a/data/maps/CeladonCity_Condominiums_1F/header.inc +++ b/data/maps/CeladonCity_Condominiums_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_1F:: @ 83512AC .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC - .4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538 - .4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320 + .4byte CeladonCity_Condominiums_1F_MapEvents @ 0x83BB538 + .4byte CeladonCity_Condominiums_1F_MapScripts @ 0x816C320 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 184 diff --git a/data/maps/CeladonCity_Condominiums_2F/header.inc b/data/maps/CeladonCity_Condominiums_2F/header.inc index 46bc1451a..2a380d25d 100644 --- a/data/maps/CeladonCity_Condominiums_2F/header.inc +++ b/data/maps/CeladonCity_Condominiums_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_2F:: @ 83512C8 .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58 - .4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4 - .4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0 + .4byte CeladonCity_Condominiums_2F_MapEvents @ 0x83BB5B4 + .4byte CeladonCity_Condominiums_2F_MapScripts @ 0x816C3D0 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 185 diff --git a/data/maps/CeladonCity_Condominiums_3F/header.inc b/data/maps/CeladonCity_Condominiums_3F/header.inc index 3af5071bb..e945a6abe 100644 --- a/data/maps/CeladonCity_Condominiums_3F/header.inc +++ b/data/maps/CeladonCity_Condominiums_3F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_3F:: @ 83512E4 .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4 - .4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8 - .4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA + .4byte CeladonCity_Condominiums_3F_MapEvents @ 0x83BB6A8 + .4byte CeladonCity_Condominiums_3F_MapScripts @ 0x816C3DA .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 186 diff --git a/data/maps/CeladonCity_Condominiums_Roof/header.inc b/data/maps/CeladonCity_Condominiums_Roof/header.inc index 8ae163248..e858a73f0 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/header.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_Roof:: @ 8351300 .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C - .4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC - .4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459 + .4byte CeladonCity_Condominiums_Roof_MapEvents @ 0x83BB6EC + .4byte CeladonCity_Condominiums_Roof_MapScripts @ 0x816C459 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 187 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc index 7bc9c4eb8..23c2ed330 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_RoofRoom:: @ 835131C .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054 - .4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C - .4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463 + .4byte CeladonCity_Condominiums_RoofRoom_MapEvents @ 0x83BB76C + .4byte CeladonCity_Condominiums_RoofRoom_MapScripts @ 0x816C463 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 188 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/header.inc b/data/maps/CeladonCity_DepartmentStore_1F/header.inc index 3ddab14ae..07b027ede 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_1F:: @ 83511E8 .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC - .4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC - .4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8 + .4byte CeladonCity_DepartmentStore_1F_MapEvents @ 0x83BB0EC + .4byte CeladonCity_DepartmentStore_1F_MapScripts @ 0x816BAD8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 192 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/header.inc b/data/maps/CeladonCity_DepartmentStore_2F/header.inc index 126b23342..48afe690e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_2F:: @ 8351204 .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8 - .4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184 - .4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4 + .4byte CeladonCity_DepartmentStore_2F_MapEvents @ 0x83BB184 + .4byte CeladonCity_DepartmentStore_2F_MapScripts @ 0x816BAF4 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 193 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/header.inc b/data/maps/CeladonCity_DepartmentStore_3F/header.inc index cb31d4ae4..9bfb8d3c4 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_3F:: @ 8351220 .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954 - .4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC - .4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84 + .4byte CeladonCity_DepartmentStore_3F_MapEvents @ 0x83BB2AC + .4byte CeladonCity_DepartmentStore_3F_MapScripts @ 0x816BB84 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 194 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/header.inc b/data/maps/CeladonCity_DepartmentStore_4F/header.inc index 5cd6b390a..e25a983da 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_4F:: @ 835123C .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00 - .4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C - .4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE + .4byte CeladonCity_DepartmentStore_4F_MapEvents @ 0x83BB32C + .4byte CeladonCity_DepartmentStore_4F_MapScripts @ 0x816BBEE .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 195 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/header.inc b/data/maps/CeladonCity_DepartmentStore_5F/header.inc index 853a6e4f2..321174026 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_5F:: @ 8351258 .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC - .4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4 - .4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40 + .4byte CeladonCity_DepartmentStore_5F_MapEvents @ 0x83BB3C4 + .4byte CeladonCity_DepartmentStore_5F_MapScripts @ 0x816BC40 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 196 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc index c78e6449a..e7086ace2 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Elevator:: @ 8351290 .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70 - .4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C - .4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152 + .4byte CeladonCity_DepartmentStore_Elevator_MapEvents @ 0x83BB47C + .4byte CeladonCity_DepartmentStore_Elevator_MapScripts @ 0x816C152 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 179 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc index a8839e6f9..bed42ffb5 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Roof:: @ 8351274 .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4 - .4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440 - .4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC + .4byte CeladonCity_DepartmentStore_Roof_MapEvents @ 0x83BB440 + .4byte CeladonCity_DepartmentStore_Roof_MapScripts @ 0x816BCCC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 197 diff --git a/data/maps/CeladonCity_GameCorner/header.inc b/data/maps/CeladonCity_GameCorner/header.inc index 61c4177d9..dde1f5a6d 100644 --- a/data/maps/CeladonCity_GameCorner/header.inc +++ b/data/maps/CeladonCity_GameCorner/header.inc @@ -1,7 +1,7 @@ CeladonCity_GameCorner:: @ 8351370 .4byte CeladonCity_GameCorner_Layout @ 0x82D7168 - .4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78 - .4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646 + .4byte CeladonCity_GameCorner_MapEvents @ 0x83BBB78 + .4byte CeladonCity_GameCorner_MapScripts @ 0x816C646 .4byte NULL .2byte BGM_FRLG_GAMECORNER .2byte 27 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc index 5577d1f3e..4db3fedfb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc @@ -1,7 +1,7 @@ CeladonCity_GameCorner_PrizeRoom:: @ 835138C .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C - .4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C - .4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75 + .4byte CeladonCity_GameCorner_PrizeRoom_MapEvents @ 0x83BBC1C + .4byte CeladonCity_GameCorner_PrizeRoom_MapScripts @ 0x816CB75 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 189 diff --git a/data/maps/CeladonCity_Gym/header.inc b/data/maps/CeladonCity_Gym/header.inc index 3c04d2673..59ca7c533 100644 --- a/data/maps/CeladonCity_Gym/header.inc +++ b/data/maps/CeladonCity_Gym/header.inc @@ -1,7 +1,7 @@ CeladonCity_Gym:: @ 83513A8 .4byte CeladonCity_Gym_Layout @ 0x82D6370 - .4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68 - .4byte gMapScripts_CeladonCity_Gym @ 0x816D060 + .4byte CeladonCity_Gym_MapEvents @ 0x83BBD68 + .4byte CeladonCity_Gym_MapScripts @ 0x816D060 .4byte NULL .2byte BGM_FRLG_GYM .2byte 15 diff --git a/data/maps/CeladonCity_Hotel/header.inc b/data/maps/CeladonCity_Hotel/header.inc index 553b4c924..b9aecb9a8 100644 --- a/data/maps/CeladonCity_Hotel/header.inc +++ b/data/maps/CeladonCity_Hotel/header.inc @@ -1,7 +1,7 @@ CeladonCity_Hotel:: @ 83513FC .4byte CeladonCity_Hotel_Layout @ 0x831B438 - .4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C - .4byte gMapScripts_CeladonCity_Hotel @ 0x816D283 + .4byte CeladonCity_Hotel_MapEvents @ 0x83BBF0C + .4byte CeladonCity_Hotel_MapScripts @ 0x816D283 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 191 diff --git a/data/maps/CeladonCity_House1/header.inc b/data/maps/CeladonCity_House1/header.inc index 37e671cce..6b0b740f1 100644 --- a/data/maps/CeladonCity_House1/header.inc +++ b/data/maps/CeladonCity_House1/header.inc @@ -1,7 +1,7 @@ CeladonCity_House1:: @ 83513E0 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80 - .4byte gMapScripts_CeladonCity_House1 @ 0x816D267 + .4byte CeladonCity_House1_MapEvents @ 0x83BBE80 + .4byte CeladonCity_House1_MapScripts @ 0x816D267 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 21 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/header.inc b/data/maps/CeladonCity_PokemonCenter_1F/header.inc index c29ce7f43..5875a816d 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/header.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_PokemonCenter_1F:: @ 8351338 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800 - .4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC + .4byte CeladonCity_PokemonCenter_1F_MapEvents @ 0x83BB800 + .4byte CeladonCity_PokemonCenter_1F_MapScripts @ 0x816C5EC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/header.inc b/data/maps/CeladonCity_PokemonCenter_2F/header.inc index d3f2b260e..217db66f2 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/header.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_PokemonCenter_2F:: @ 8351354 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C - .4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F + .4byte CeladonCity_PokemonCenter_2F_MapEvents @ 0x83BB88C + .4byte CeladonCity_PokemonCenter_2F_MapScripts @ 0x816C61F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CeladonCity_Restaurant/header.inc b/data/maps/CeladonCity_Restaurant/header.inc index c588eb45d..2bd3f3867 100644 --- a/data/maps/CeladonCity_Restaurant/header.inc +++ b/data/maps/CeladonCity_Restaurant/header.inc @@ -1,7 +1,7 @@ CeladonCity_Restaurant:: @ 83513C4 .4byte CeladonCity_Restaurant_Layout @ 0x831B29C - .4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C - .4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA + .4byte CeladonCity_Restaurant_MapEvents @ 0x83BBE0C + .4byte CeladonCity_Restaurant_MapScripts @ 0x816D1EA .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 190 diff --git a/data/maps/CeruleanCave_1F/header.inc b/data/maps/CeruleanCave_1F/header.inc index ec467c13e..9bedd6dd6 100644 --- a/data/maps/CeruleanCave_1F/header.inc +++ b/data/maps/CeruleanCave_1F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_1F:: @ 834F9F4 .4byte CeruleanCave_1F_Layout @ 0x8311318 - .4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC - .4byte gMapScripts_CeruleanCave_1F @ 0x81624B3 + .4byte CeruleanCave_1F_MapEvents @ 0x83B15BC + .4byte CeruleanCave_1F_MapScripts @ 0x81624B3 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 151 diff --git a/data/maps/CeruleanCave_2F/header.inc b/data/maps/CeruleanCave_2F/header.inc index 7fe8ccc03..37e25ef1b 100644 --- a/data/maps/CeruleanCave_2F/header.inc +++ b/data/maps/CeruleanCave_2F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_2F:: @ 834FA10 .4byte CeruleanCave_2F_Layout @ 0x8311A6C - .4byte gMapEvents_CeruleanCave_2F @ 0x83B1738 - .4byte gMapScripts_CeruleanCave_2F @ 0x81624BD + .4byte CeruleanCave_2F_MapEvents @ 0x83B1738 + .4byte CeruleanCave_2F_MapScripts @ 0x81624BD .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 152 diff --git a/data/maps/CeruleanCave_B1F/header.inc b/data/maps/CeruleanCave_B1F/header.inc index 89eaec278..88608f654 100644 --- a/data/maps/CeruleanCave_B1F/header.inc +++ b/data/maps/CeruleanCave_B1F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_B1F:: @ 834FA2C .4byte CeruleanCave_B1F_Layout @ 0x83121C0 - .4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874 - .4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE + .4byte CeruleanCave_B1F_MapEvents @ 0x83B1874 + .4byte CeruleanCave_B1F_MapScripts @ 0x81624BE .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 153 diff --git a/data/maps/CeruleanCity/header.inc b/data/maps/CeruleanCity/header.inc index 7f1bed354..720840bf0 100644 --- a/data/maps/CeruleanCity/header.inc +++ b/data/maps/CeruleanCity/header.inc @@ -1,7 +1,7 @@ CeruleanCity:: @ 835066C .4byte CeruleanCity_Layout @ 0x82E022C - .4byte gMapEvents_CeruleanCity @ 0x83B53E0 - .4byte gMapScripts_CeruleanCity @ 0x8166471 + .4byte CeruleanCity_MapEvents @ 0x83B53E0 + .4byte CeruleanCity_MapScripts @ 0x8166471 .4byte CeruleanCity_MapConnections @ 0x83527F0 .2byte BGM_FRLG_CERULEAN_CITY .2byte 81 diff --git a/data/maps/CeruleanCity_BikeShop/header.inc b/data/maps/CeruleanCity_BikeShop/header.inc index 8fd15ec07..3f2bd4de1 100644 --- a/data/maps/CeruleanCity_BikeShop/header.inc +++ b/data/maps/CeruleanCity_BikeShop/header.inc @@ -1,7 +1,7 @@ CeruleanCity_BikeShop:: @ 8350FF0 .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28 - .4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC - .4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC + .4byte CeruleanCity_BikeShop_MapEvents @ 0x83BA6FC + .4byte CeruleanCity_BikeShop_MapScripts @ 0x816ABBC .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 26 diff --git a/data/maps/CeruleanCity_Gym/header.inc b/data/maps/CeruleanCity_Gym/header.inc index 601a9700c..3b3b044e4 100644 --- a/data/maps/CeruleanCity_Gym/header.inc +++ b/data/maps/CeruleanCity_Gym/header.inc @@ -1,7 +1,7 @@ CeruleanCity_Gym:: @ 8350FD4 .4byte CeruleanCity_Gym_Layout @ 0x82D5F84 - .4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628 - .4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0 + .4byte CeruleanCity_Gym_MapEvents @ 0x83BA628 + .4byte CeruleanCity_Gym_MapScripts @ 0x816AAA0 .4byte NULL .2byte BGM_FRLG_GYM .2byte 12 diff --git a/data/maps/CeruleanCity_House1/header.inc b/data/maps/CeruleanCity_House1/header.inc index 622ef5334..092348c5b 100644 --- a/data/maps/CeruleanCity_House1/header.inc +++ b/data/maps/CeruleanCity_House1/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House1:: @ 8350F48 .4byte CeruleanCity_House1_Layout @ 0x831A560 - .4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350 - .4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF + .4byte CeruleanCity_House1_MapEvents @ 0x83BA350 + .4byte CeruleanCity_House1_MapScripts @ 0x816A7EF .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 183 diff --git a/data/maps/CeruleanCity_House2/header.inc b/data/maps/CeruleanCity_House2/header.inc index 0cc637603..66b02a6a6 100644 --- a/data/maps/CeruleanCity_House2/header.inc +++ b/data/maps/CeruleanCity_House2/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House2:: @ 8350F64 .4byte CeruleanCity_House2_Layout @ 0x831A474 - .4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0 - .4byte gMapScripts_CeruleanCity_House2 @ 0x816A975 + .4byte CeruleanCity_House2_MapEvents @ 0x83BA3C0 + .4byte CeruleanCity_House2_MapScripts @ 0x816A975 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 182 diff --git a/data/maps/CeruleanCity_House3/header.inc b/data/maps/CeruleanCity_House3/header.inc index bcaabf913..6e5885015 100644 --- a/data/maps/CeruleanCity_House3/header.inc +++ b/data/maps/CeruleanCity_House3/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House3:: @ 8350F80 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C - .4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7 + .4byte CeruleanCity_House3_MapEvents @ 0x83BA41C + .4byte CeruleanCity_House3_MapScripts @ 0x816A9A7 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/CeruleanCity_House4/header.inc b/data/maps/CeruleanCity_House4/header.inc index 4996f7e7a..979bc788e 100644 --- a/data/maps/CeruleanCity_House4/header.inc +++ b/data/maps/CeruleanCity_House4/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House4:: @ 8351028 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4 - .4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE + .4byte CeruleanCity_House4_MapEvents @ 0x83BA7A4 + .4byte CeruleanCity_House4_MapScripts @ 0x816ACEE .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/CeruleanCity_House5/header.inc b/data/maps/CeruleanCity_House5/header.inc index 317e64841..1c11eb58a 100644 --- a/data/maps/CeruleanCity_House5/header.inc +++ b/data/maps/CeruleanCity_House5/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House5:: @ 8351044 .4byte CeruleanCity_House5_Layout @ 0x8343540 - .4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4 - .4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F + .4byte CeruleanCity_House5_MapEvents @ 0x83BA7E4 + .4byte CeruleanCity_House5_MapScripts @ 0x816AE4F .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 308 diff --git a/data/maps/CeruleanCity_Mart/header.inc b/data/maps/CeruleanCity_Mart/header.inc index b12b85b10..592847fdf 100644 --- a/data/maps/CeruleanCity_Mart/header.inc +++ b/data/maps/CeruleanCity_Mart/header.inc @@ -1,7 +1,7 @@ CeruleanCity_Mart:: @ 835100C .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770 - .4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D + .4byte CeruleanCity_Mart_MapEvents @ 0x83BA770 + .4byte CeruleanCity_Mart_MapScripts @ 0x816AC9D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc index 810354b9c..9978c2508 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CeruleanCity_PokemonCenter_1F:: @ 8350F9C .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8 - .4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D + .4byte CeruleanCity_PokemonCenter_1F_MapEvents @ 0x83BA4F8 + .4byte CeruleanCity_PokemonCenter_1F_MapScripts @ 0x816AA2D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc index 697f7b369..6a650315e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CeruleanCity_PokemonCenter_2F:: @ 8350FB8 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584 - .4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79 + .4byte CeruleanCity_PokemonCenter_2F_MapEvents @ 0x83BA584 + .4byte CeruleanCity_PokemonCenter_2F_MapScripts @ 0x816AA79 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CinnabarIsland/header.inc b/data/maps/CinnabarIsland/header.inc index 9b614bd26..49ec94a3b 100644 --- a/data/maps/CinnabarIsland/header.inc +++ b/data/maps/CinnabarIsland/header.inc @@ -1,7 +1,7 @@ CinnabarIsland:: @ 83506F8 .4byte CinnabarIsland_Layout @ 0x82E3B20 - .4byte gMapEvents_CinnabarIsland @ 0x83B5BF0 - .4byte gMapScripts_CinnabarIsland @ 0x8166ED6 + .4byte CinnabarIsland_MapEvents @ 0x83B5BF0 + .4byte CinnabarIsland_MapScripts @ 0x8166ED6 .4byte CinnabarIsland_MapConnections @ 0x83528A8 .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 86 diff --git a/data/maps/CinnabarIsland_Gym/header.inc b/data/maps/CinnabarIsland_Gym/header.inc index 8e810be7e..902408c88 100644 --- a/data/maps/CinnabarIsland_Gym/header.inc +++ b/data/maps/CinnabarIsland_Gym/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_Gym:: @ 8351530 .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8 - .4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C - .4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B + .4byte CinnabarIsland_Gym_MapEvents @ 0x83BC62C + .4byte CinnabarIsland_Gym_MapScripts @ 0x816D94B .4byte NULL .2byte BGM_FRLG_GYM .2byte 36 diff --git a/data/maps/CinnabarIsland_Mart/header.inc b/data/maps/CinnabarIsland_Mart/header.inc index f6abdf48e..db46f06e4 100644 --- a/data/maps/CinnabarIsland_Mart/header.inc +++ b/data/maps/CinnabarIsland_Mart/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_Mart:: @ 83515F4 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8 - .4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F + .4byte CinnabarIsland_Mart_MapEvents @ 0x83BC9A8 + .4byte CinnabarIsland_Mart_MapScripts @ 0x816EA0F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc index 4d0aac7b3..61259eee7 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonCenter_1F:: @ 83515BC .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8 - .4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7 + .4byte CinnabarIsland_PokemonCenter_1F_MapEvents @ 0x83BC8A8 + .4byte CinnabarIsland_PokemonCenter_1F_MapScripts @ 0x816E8D7 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc index 01c1b0eb9..462076704 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonCenter_2F:: @ 83515D8 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934 - .4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8 + .4byte CinnabarIsland_PokemonCenter_2F_MapEvents @ 0x83BC934 + .4byte CinnabarIsland_PokemonCenter_2F_MapScripts @ 0x816E9E8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc index 4e97c56f2..8f1b3ce10 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_Entrance:: @ 835154C .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804 - .4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8 - .4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273 + .4byte CinnabarIsland_PokemonLab_Entrance_MapEvents @ 0x83BC6B8 + .4byte CinnabarIsland_PokemonLab_Entrance_MapScripts @ 0x816E273 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 203 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc index 866b195ca..f3dca36f6 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54 - .4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC - .4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400 + .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents @ 0x83BC7CC + .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts @ 0x816E400 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 206 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc index 0e0fe0525..ae3a567d7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_Lounge:: @ 8351568 .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974 - .4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C - .4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8 + .4byte CinnabarIsland_PokemonLab_Lounge_MapEvents @ 0x83BC71C + .4byte CinnabarIsland_PokemonLab_Lounge_MapScripts @ 0x816E2B8 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 204 diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc index 8c8f7bc28..34e60e452 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4 - .4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780 - .4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE + .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapEvents @ 0x83BC780 + .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapScripts @ 0x816E3DE .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 205 diff --git a/data/maps/DiglettsCave_B1F/header.inc b/data/maps/DiglettsCave_B1F/header.inc index 7ebb82a62..c72ae342e 100644 --- a/data/maps/DiglettsCave_B1F/header.inc +++ b/data/maps/DiglettsCave_B1F/header.inc @@ -1,7 +1,7 @@ DiglettsCave_B1F:: @ 834F620 .4byte DiglettsCave_B1F_Layout @ 0x8303B68 - .4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490 - .4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1 + .4byte DiglettsCave_B1F_MapEvents @ 0x83AF490 + .4byte DiglettsCave_B1F_MapScripts @ 0x8160EF1 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 124 diff --git a/data/maps/DiglettsCave_NorthEntrance/header.inc b/data/maps/DiglettsCave_NorthEntrance/header.inc index 47df9cac9..ecdeaba44 100644 --- a/data/maps/DiglettsCave_NorthEntrance/header.inc +++ b/data/maps/DiglettsCave_NorthEntrance/header.inc @@ -1,7 +1,7 @@ DiglettsCave_NorthEntrance:: @ 834F604 .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94 - .4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C - .4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7 + .4byte DiglettsCave_NorthEntrance_MapEvents @ 0x83AF46C + .4byte DiglettsCave_NorthEntrance_MapScripts @ 0x8160EE7 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 210 diff --git a/data/maps/DiglettsCave_SouthEntrance/header.inc b/data/maps/DiglettsCave_SouthEntrance/header.inc index 1651d502b..5c84c5307 100644 --- a/data/maps/DiglettsCave_SouthEntrance/header.inc +++ b/data/maps/DiglettsCave_SouthEntrance/header.inc @@ -1,7 +1,7 @@ DiglettsCave_SouthEntrance:: @ 834F63C .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58 - .4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC - .4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB + .4byte DiglettsCave_SouthEntrance_MapEvents @ 0x83AF4CC + .4byte DiglettsCave_SouthEntrance_MapScripts @ 0x8160EFB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 211 diff --git a/data/maps/FiveIsland/header.inc b/data/maps/FiveIsland/header.inc index ee274936b..b38c6fa44 100644 --- a/data/maps/FiveIsland/header.inc +++ b/data/maps/FiveIsland/header.inc @@ -1,7 +1,7 @@ FiveIsland:: @ 83507D8 .4byte FiveIsland_Layout @ 0x8323964 - .4byte gMapEvents_FiveIsland @ 0x83B64F4 - .4byte gMapScripts_FiveIsland @ 0x8167E8E + .4byte FiveIsland_MapEvents @ 0x83B64F4 + .4byte FiveIsland_MapScripts @ 0x8167E8E .4byte FiveIsland_MapConnections @ 0x83529A0 .2byte BGM_FRLG_ISLAND_FOUR .2byte 234 diff --git a/data/maps/FiveIsland_Harbor/header.inc b/data/maps/FiveIsland_Harbor/header.inc index 623c90298..1f7a96309 100644 --- a/data/maps/FiveIsland_Harbor/header.inc +++ b/data/maps/FiveIsland_Harbor/header.inc @@ -1,7 +1,7 @@ FiveIsland_Harbor:: @ 8351E7C .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4 - .4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42 + .4byte FiveIsland_Harbor_MapEvents @ 0x83BEFB4 + .4byte FiveIsland_Harbor_MapScripts @ 0x8171D42 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 315 diff --git a/data/maps/FiveIsland_House1/header.inc b/data/maps/FiveIsland_House1/header.inc index f33f9b4aa..11d3865ff 100644 --- a/data/maps/FiveIsland_House1/header.inc +++ b/data/maps/FiveIsland_House1/header.inc @@ -1,7 +1,7 @@ FiveIsland_House1:: @ 8351E98 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8 - .4byte gMapScripts_FiveIsland_House1 @ 0x8171D56 + .4byte FiveIsland_House1_MapEvents @ 0x83BEFE8 + .4byte FiveIsland_House1_MapScripts @ 0x8171D56 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FiveIsland_House2/header.inc b/data/maps/FiveIsland_House2/header.inc index 10a02b0ae..09a7f015f 100644 --- a/data/maps/FiveIsland_House2/header.inc +++ b/data/maps/FiveIsland_House2/header.inc @@ -1,7 +1,7 @@ FiveIsland_House2:: @ 8351EB4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C - .4byte gMapScripts_FiveIsland_House2 @ 0x8171D60 + .4byte FiveIsland_House2_MapEvents @ 0x83BF01C + .4byte FiveIsland_House2_MapScripts @ 0x8171D60 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FiveIsland_LostCave_Entrance/header.inc b/data/maps/FiveIsland_LostCave_Entrance/header.inc index be1cff1e3..937061b53 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/header.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Entrance:: @ 83500D8 .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8 - .4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354 - .4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC + .4byte FiveIsland_LostCave_Entrance_MapEvents @ 0x83B4354 + .4byte FiveIsland_LostCave_Entrance_MapScripts @ 0x8164BEC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 320 diff --git a/data/maps/FiveIsland_LostCave_Room1/header.inc b/data/maps/FiveIsland_LostCave_Room1/header.inc index 053bb4dee..c251be2c2 100644 --- a/data/maps/FiveIsland_LostCave_Room1/header.inc +++ b/data/maps/FiveIsland_LostCave_Room1/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room1:: @ 83500F4 .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0 - .4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8 - .4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6 + .4byte FiveIsland_LostCave_Room1_MapEvents @ 0x83B43A8 + .4byte FiveIsland_LostCave_Room1_MapScripts @ 0x8164BF6 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 321 diff --git a/data/maps/FiveIsland_LostCave_Room10/header.inc b/data/maps/FiveIsland_LostCave_Room10/header.inc index f770a1340..e27634f92 100644 --- a/data/maps/FiveIsland_LostCave_Room10/header.inc +++ b/data/maps/FiveIsland_LostCave_Room10/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room10:: @ 83501F0 .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8 - .4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC - .4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D + .4byte FiveIsland_LostCave_Room10_MapEvents @ 0x83B45AC + .4byte FiveIsland_LostCave_Room10_MapScripts @ 0x8164C2D .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 330 diff --git a/data/maps/FiveIsland_LostCave_Room11/header.inc b/data/maps/FiveIsland_LostCave_Room11/header.inc index 4e047faf2..56457b055 100644 --- a/data/maps/FiveIsland_LostCave_Room11/header.inc +++ b/data/maps/FiveIsland_LostCave_Room11/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room11:: @ 835020C .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0 - .4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0 - .4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB + .4byte FiveIsland_LostCave_Room11_MapEvents @ 0x83B45E0 + .4byte FiveIsland_LostCave_Room11_MapScripts @ 0x8164CCB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 331 diff --git a/data/maps/FiveIsland_LostCave_Room12/header.inc b/data/maps/FiveIsland_LostCave_Room12/header.inc index 417712f1b..8629a364d 100644 --- a/data/maps/FiveIsland_LostCave_Room12/header.inc +++ b/data/maps/FiveIsland_LostCave_Room12/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room12:: @ 8350228 .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8 - .4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614 - .4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC + .4byte FiveIsland_LostCave_Room12_MapEvents @ 0x83B4614 + .4byte FiveIsland_LostCave_Room12_MapScripts @ 0x8164CCC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 332 diff --git a/data/maps/FiveIsland_LostCave_Room13/header.inc b/data/maps/FiveIsland_LostCave_Room13/header.inc index cbe00c496..cda5b3670 100644 --- a/data/maps/FiveIsland_LostCave_Room13/header.inc +++ b/data/maps/FiveIsland_LostCave_Room13/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room13:: @ 8350244 .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310 - .4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648 - .4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD + .4byte FiveIsland_LostCave_Room13_MapEvents @ 0x83B4648 + .4byte FiveIsland_LostCave_Room13_MapScripts @ 0x8164CCD .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 333 diff --git a/data/maps/FiveIsland_LostCave_Room14/header.inc b/data/maps/FiveIsland_LostCave_Room14/header.inc index 036d47e93..6470895b4 100644 --- a/data/maps/FiveIsland_LostCave_Room14/header.inc +++ b/data/maps/FiveIsland_LostCave_Room14/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room14:: @ 8350260 .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428 - .4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C - .4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE + .4byte FiveIsland_LostCave_Room14_MapEvents @ 0x83B467C + .4byte FiveIsland_LostCave_Room14_MapScripts @ 0x8164CCE .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 334 diff --git a/data/maps/FiveIsland_LostCave_Room2/header.inc b/data/maps/FiveIsland_LostCave_Room2/header.inc index 3a22600b3..2861812a2 100644 --- a/data/maps/FiveIsland_LostCave_Room2/header.inc +++ b/data/maps/FiveIsland_LostCave_Room2/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room2:: @ 8350110 .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708 - .4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC - .4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E + .4byte FiveIsland_LostCave_Room2_MapEvents @ 0x83B43DC + .4byte FiveIsland_LostCave_Room2_MapScripts @ 0x8164C0E .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 322 diff --git a/data/maps/FiveIsland_LostCave_Room3/header.inc b/data/maps/FiveIsland_LostCave_Room3/header.inc index 0080d605e..33c5484e0 100644 --- a/data/maps/FiveIsland_LostCave_Room3/header.inc +++ b/data/maps/FiveIsland_LostCave_Room3/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room3:: @ 835012C .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820 - .4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410 - .4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F + .4byte FiveIsland_LostCave_Room3_MapEvents @ 0x83B4410 + .4byte FiveIsland_LostCave_Room3_MapScripts @ 0x8164C0F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 323 diff --git a/data/maps/FiveIsland_LostCave_Room4/header.inc b/data/maps/FiveIsland_LostCave_Room4/header.inc index 019095376..966532b31 100644 --- a/data/maps/FiveIsland_LostCave_Room4/header.inc +++ b/data/maps/FiveIsland_LostCave_Room4/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room4:: @ 8350148 .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938 - .4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C - .4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10 + .4byte FiveIsland_LostCave_Room4_MapEvents @ 0x83B445C + .4byte FiveIsland_LostCave_Room4_MapScripts @ 0x8164C10 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 324 diff --git a/data/maps/FiveIsland_LostCave_Room5/header.inc b/data/maps/FiveIsland_LostCave_Room5/header.inc index e5bc7e389..6ec15156f 100644 --- a/data/maps/FiveIsland_LostCave_Room5/header.inc +++ b/data/maps/FiveIsland_LostCave_Room5/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room5:: @ 8350164 .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50 - .4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490 - .4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28 + .4byte FiveIsland_LostCave_Room5_MapEvents @ 0x83B4490 + .4byte FiveIsland_LostCave_Room5_MapScripts @ 0x8164C28 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 325 diff --git a/data/maps/FiveIsland_LostCave_Room6/header.inc b/data/maps/FiveIsland_LostCave_Room6/header.inc index 5688b9428..c45b08d1e 100644 --- a/data/maps/FiveIsland_LostCave_Room6/header.inc +++ b/data/maps/FiveIsland_LostCave_Room6/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room6:: @ 8350180 .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68 - .4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4 - .4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29 + .4byte FiveIsland_LostCave_Room6_MapEvents @ 0x83B44C4 + .4byte FiveIsland_LostCave_Room6_MapScripts @ 0x8164C29 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 326 diff --git a/data/maps/FiveIsland_LostCave_Room7/header.inc b/data/maps/FiveIsland_LostCave_Room7/header.inc index eff6b2b3b..17a168e1d 100644 --- a/data/maps/FiveIsland_LostCave_Room7/header.inc +++ b/data/maps/FiveIsland_LostCave_Room7/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room7:: @ 835019C .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80 - .4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8 - .4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A + .4byte FiveIsland_LostCave_Room7_MapEvents @ 0x83B44F8 + .4byte FiveIsland_LostCave_Room7_MapScripts @ 0x8164C2A .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 327 diff --git a/data/maps/FiveIsland_LostCave_Room8/header.inc b/data/maps/FiveIsland_LostCave_Room8/header.inc index 585e219ee..21fa63267 100644 --- a/data/maps/FiveIsland_LostCave_Room8/header.inc +++ b/data/maps/FiveIsland_LostCave_Room8/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room8:: @ 83501B8 .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98 - .4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C - .4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B + .4byte FiveIsland_LostCave_Room8_MapEvents @ 0x83B452C + .4byte FiveIsland_LostCave_Room8_MapScripts @ 0x8164C2B .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 328 diff --git a/data/maps/FiveIsland_LostCave_Room9/header.inc b/data/maps/FiveIsland_LostCave_Room9/header.inc index 2c465cf0e..53ef0c34e 100644 --- a/data/maps/FiveIsland_LostCave_Room9/header.inc +++ b/data/maps/FiveIsland_LostCave_Room9/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room9:: @ 83501D4 .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0 - .4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560 - .4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C + .4byte FiveIsland_LostCave_Room9_MapEvents @ 0x83B4560 + .4byte FiveIsland_LostCave_Room9_MapScripts @ 0x8164C2C .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 329 diff --git a/data/maps/FiveIsland_Meadow/header.inc b/data/maps/FiveIsland_Meadow/header.inc index 05ba4c525..4f30d8ae1 100644 --- a/data/maps/FiveIsland_Meadow/header.inc +++ b/data/maps/FiveIsland_Meadow/header.inc @@ -1,7 +1,7 @@ FiveIsland_Meadow:: @ 8350C38 .4byte FiveIsland_Meadow_Layout @ 0x832BAE4 - .4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94 - .4byte gMapScripts_FiveIsland_Meadow @ 0x8168932 + .4byte FiveIsland_Meadow_MapEvents @ 0x83B8D94 + .4byte FiveIsland_Meadow_MapScripts @ 0x8168932 .4byte FiveIsland_Meadow_MapConnections @ 0x8352DF4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 248 diff --git a/data/maps/FiveIsland_MemorialPillar/header.inc b/data/maps/FiveIsland_MemorialPillar/header.inc index 0db87e74f..39944fcdf 100644 --- a/data/maps/FiveIsland_MemorialPillar/header.inc +++ b/data/maps/FiveIsland_MemorialPillar/header.inc @@ -1,7 +1,7 @@ FiveIsland_MemorialPillar:: @ 8350C54 .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648 - .4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C - .4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2 + .4byte FiveIsland_MemorialPillar_MapEvents @ 0x83B8E5C + .4byte FiveIsland_MemorialPillar_MapScripts @ 0x81689D2 .4byte FiveIsland_MemorialPillar_MapConnections @ 0x8352E08 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 249 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/header.inc b/data/maps/FiveIsland_PokemonCenter_1F/header.inc index 61ceecc1e..ed32a33e9 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/header.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FiveIsland_PokemonCenter_1F:: @ 8351E44 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC - .4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1 + .4byte FiveIsland_PokemonCenter_1F_MapEvents @ 0x83BEEDC + .4byte FiveIsland_PokemonCenter_1F_MapScripts @ 0x8171CF1 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/header.inc b/data/maps/FiveIsland_PokemonCenter_2F/header.inc index a3f51f119..fd00cabd4 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/header.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FiveIsland_PokemonCenter_2F:: @ 8351E60 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68 - .4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B + .4byte FiveIsland_PokemonCenter_2F_MapEvents @ 0x83BEF68 + .4byte FiveIsland_PokemonCenter_2F_MapScripts @ 0x8171D1B .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FiveIsland_ResortGorgeous/header.inc b/data/maps/FiveIsland_ResortGorgeous/header.inc index 13c3647f7..ecbc20c6d 100644 --- a/data/maps/FiveIsland_ResortGorgeous/header.inc +++ b/data/maps/FiveIsland_ResortGorgeous/header.inc @@ -1,7 +1,7 @@ FiveIsland_ResortGorgeous:: @ 8350C00 .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC - .4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80 - .4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4 + .4byte FiveIsland_ResortGorgeous_MapEvents @ 0x83B8C80 + .4byte FiveIsland_ResortGorgeous_MapScripts @ 0x81687E4 .4byte FiveIsland_ResortGorgeous_MapConnections @ 0x8352DB4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 246 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/header.inc b/data/maps/FiveIsland_ResortGorgeous_House/header.inc index 06e2fb981..9ef744a47 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/header.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/header.inc @@ -1,7 +1,7 @@ FiveIsland_ResortGorgeous_House:: @ 8351F78 .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C - .4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0 - .4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD + .4byte FiveIsland_ResortGorgeous_House_MapEvents @ 0x83BF2C0 + .4byte FiveIsland_ResortGorgeous_House_MapScripts @ 0x8171EBD .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 17 diff --git a/data/maps/FiveIsland_WaterLabyrinth/header.inc b/data/maps/FiveIsland_WaterLabyrinth/header.inc index ca762bcd5..9516eb6f8 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/header.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/header.inc @@ -1,7 +1,7 @@ FiveIsland_WaterLabyrinth:: @ 8350C1C .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340 - .4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4 - .4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D + .4byte FiveIsland_WaterLabyrinth_MapEvents @ 0x83B8CC4 + .4byte FiveIsland_WaterLabyrinth_MapScripts @ 0x816884D .4byte FiveIsland_WaterLabyrinth_MapConnections @ 0x8352DD4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 247 diff --git a/data/maps/FourIsland/header.inc b/data/maps/FourIsland/header.inc index 16949a412..7efe4469f 100644 --- a/data/maps/FourIsland/header.inc +++ b/data/maps/FourIsland/header.inc @@ -1,7 +1,7 @@ FourIsland:: @ 83507BC .4byte FourIsland_Layout @ 0x8323580 - .4byte gMapEvents_FourIsland @ 0x83B646C - .4byte gMapScripts_FourIsland @ 0x8167CAE + .4byte FourIsland_MapEvents @ 0x83B646C + .4byte FourIsland_MapScripts @ 0x8167CAE .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 233 diff --git a/data/maps/FourIsland_Harbor/header.inc b/data/maps/FourIsland_Harbor/header.inc index 224d88240..af0f40483 100644 --- a/data/maps/FourIsland_Harbor/header.inc +++ b/data/maps/FourIsland_Harbor/header.inc @@ -1,7 +1,7 @@ FourIsland_Harbor:: @ 8351DF0 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8 - .4byte gMapScripts_FourIsland_Harbor @ 0x8171C98 + .4byte FourIsland_Harbor_MapEvents @ 0x83BEDA8 + .4byte FourIsland_Harbor_MapScripts @ 0x8171C98 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 315 diff --git a/data/maps/FourIsland_House1/header.inc b/data/maps/FourIsland_House1/header.inc index b72ce9938..6f2cf1099 100644 --- a/data/maps/FourIsland_House1/header.inc +++ b/data/maps/FourIsland_House1/header.inc @@ -1,7 +1,7 @@ FourIsland_House1:: @ 8351DB8 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8 - .4byte gMapScripts_FourIsland_House1 @ 0x8171C44 + .4byte FourIsland_House1_MapEvents @ 0x83BEBD8 + .4byte FourIsland_House1_MapScripts @ 0x8171C44 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FourIsland_House2/header.inc b/data/maps/FourIsland_House2/header.inc index fafd19dde..699623002 100644 --- a/data/maps/FourIsland_House2/header.inc +++ b/data/maps/FourIsland_House2/header.inc @@ -1,7 +1,7 @@ FourIsland_House2:: @ 8351E0C .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC - .4byte gMapScripts_FourIsland_House2 @ 0x8171CAC + .4byte FourIsland_House2_MapEvents @ 0x83BEDDC + .4byte FourIsland_House2_MapScripts @ 0x8171CAC .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FourIsland_IcefallCave_1F/header.inc b/data/maps/FourIsland_IcefallCave_1F/header.inc index 8a4ad3c55..a77f235f9 100644 --- a/data/maps/FourIsland_IcefallCave_1F/header.inc +++ b/data/maps/FourIsland_IcefallCave_1F/header.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_1F:: @ 834FE38 .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C - .4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC - .4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44 + .4byte FourIsland_IcefallCave_1F_MapEvents @ 0x83B34AC + .4byte FourIsland_IcefallCave_1F_MapScripts @ 0x8163D44 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 294 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/header.inc b/data/maps/FourIsland_IcefallCave_Entrance/header.inc index 9c183603b..758df55d9 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/header.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/header.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_Entrance:: @ 834FE1C .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38 - .4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438 - .4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A + .4byte FourIsland_IcefallCave_Entrance_MapEvents @ 0x83B3438 + .4byte FourIsland_IcefallCave_Entrance_MapScripts @ 0x8163D3A .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 293 diff --git a/data/maps/FourIsland_LoreleisHouse/header.inc b/data/maps/FourIsland_LoreleisHouse/header.inc index 112231426..70bb32a5d 100644 --- a/data/maps/FourIsland_LoreleisHouse/header.inc +++ b/data/maps/FourIsland_LoreleisHouse/header.inc @@ -1,7 +1,7 @@ FourIsland_LoreleisHouse:: @ 8351DD4 .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418 - .4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C - .4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E + .4byte FourIsland_LoreleisHouse_MapEvents @ 0x83BED5C + .4byte FourIsland_LoreleisHouse_MapScripts @ 0x8171C4E .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 30 diff --git a/data/maps/FourIsland_Mart/header.inc b/data/maps/FourIsland_Mart/header.inc index 634c598fc..95c316e9a 100644 --- a/data/maps/FourIsland_Mart/header.inc +++ b/data/maps/FourIsland_Mart/header.inc @@ -1,7 +1,7 @@ FourIsland_Mart:: @ 8351E28 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_FourIsland_Mart @ 0x83BEE40 - .4byte gMapScripts_FourIsland_Mart @ 0x8171CAD + .4byte FourIsland_Mart_MapEvents @ 0x83BEE40 + .4byte FourIsland_Mart_MapScripts @ 0x8171CAD .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/FourIsland_PokemonCenter_1F/header.inc b/data/maps/FourIsland_PokemonCenter_1F/header.inc index 151688304..917d92aaf 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/header.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonCenter_1F:: @ 8351D80 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00 - .4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA + .4byte FourIsland_PokemonCenter_1F_MapEvents @ 0x83BEB00 + .4byte FourIsland_PokemonCenter_1F_MapScripts @ 0x8171BEA .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FourIsland_PokemonCenter_2F/header.inc b/data/maps/FourIsland_PokemonCenter_2F/header.inc index c79978793..839d75196 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/header.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonCenter_2F:: @ 8351D9C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C - .4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D + .4byte FourIsland_PokemonCenter_2F_MapEvents @ 0x83BEB8C + .4byte FourIsland_PokemonCenter_2F_MapScripts @ 0x8171C1D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FourIsland_PokemonDayCare/header.inc b/data/maps/FourIsland_PokemonDayCare/header.inc index 31aa92deb..7cea7eaa5 100644 --- a/data/maps/FourIsland_PokemonDayCare/header.inc +++ b/data/maps/FourIsland_PokemonDayCare/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonDayCare:: @ 8351D64 .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8 - .4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64 - .4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F + .4byte FourIsland_PokemonDayCare_MapEvents @ 0x83BEA64 + .4byte FourIsland_PokemonDayCare_MapScripts @ 0x817193F .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 277 diff --git a/data/maps/FuchsiaCity/header.inc b/data/maps/FuchsiaCity/header.inc index 8017613bc..b4a33e9c5 100644 --- a/data/maps/FuchsiaCity/header.inc +++ b/data/maps/FuchsiaCity/header.inc @@ -1,7 +1,7 @@ FuchsiaCity:: @ 83506DC .4byte FuchsiaCity_Layout @ 0x82E373C - .4byte gMapEvents_FuchsiaCity @ 0x83B5B14 - .4byte gMapScripts_FuchsiaCity @ 0x8166D75 + .4byte FuchsiaCity_MapEvents @ 0x83B5B14 + .4byte FuchsiaCity_MapScripts @ 0x8166D75 .4byte FuchsiaCity_MapConnections @ 0x8352888 .2byte BGM_FRLG_CERULEAN_CITY .2byte 85 diff --git a/data/maps/FuchsiaCity_Building1/header.inc b/data/maps/FuchsiaCity_Building1/header.inc index db876f27c..f598da548 100644 --- a/data/maps/FuchsiaCity_Building1/header.inc +++ b/data/maps/FuchsiaCity_Building1/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Building1:: @ 83514DC .4byte FuchsiaCity_Building1_Layout @ 0x831C48C - .4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4 - .4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B + .4byte FuchsiaCity_Building1_MapEvents @ 0x83BC3F4 + .4byte FuchsiaCity_Building1_MapScripts @ 0x816D74B .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 201 diff --git a/data/maps/FuchsiaCity_Gym/header.inc b/data/maps/FuchsiaCity_Gym/header.inc index ed9dfef9e..16aeeb007 100644 --- a/data/maps/FuchsiaCity_Gym/header.inc +++ b/data/maps/FuchsiaCity_Gym/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Gym:: @ 835146C .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04 - .4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4 - .4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D + .4byte FuchsiaCity_Gym_MapEvents @ 0x83BC1A4 + .4byte FuchsiaCity_Gym_MapScripts @ 0x816D54D .4byte NULL .2byte BGM_FRLG_GYM .2byte 20 diff --git a/data/maps/FuchsiaCity_House1/header.inc b/data/maps/FuchsiaCity_House1/header.inc index ced57d5dd..018383387 100644 --- a/data/maps/FuchsiaCity_House1/header.inc +++ b/data/maps/FuchsiaCity_House1/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House1:: @ 8351488 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218 - .4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5 + .4byte FuchsiaCity_House1_MapEvents @ 0x83BC218 + .4byte FuchsiaCity_House1_MapScripts @ 0x816D6C5 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/FuchsiaCity_House2/header.inc b/data/maps/FuchsiaCity_House2/header.inc index 7dbe95373..6bedf2ac0 100644 --- a/data/maps/FuchsiaCity_House2/header.inc +++ b/data/maps/FuchsiaCity_House2/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House2:: @ 83514F8 .4byte FuchsiaCity_House2_Layout @ 0x831C578 - .4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440 - .4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816 + .4byte FuchsiaCity_House2_MapEvents @ 0x83BC440 + .4byte FuchsiaCity_House2_MapScripts @ 0x816D816 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 202 diff --git a/data/maps/FuchsiaCity_House3/header.inc b/data/maps/FuchsiaCity_House3/header.inc index 6cd078957..3b4f76d09 100644 --- a/data/maps/FuchsiaCity_House3/header.inc +++ b/data/maps/FuchsiaCity_House3/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House3:: @ 8351514 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474 - .4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894 + .4byte FuchsiaCity_House3_MapEvents @ 0x83BC474 + .4byte FuchsiaCity_House3_MapScripts @ 0x816D894 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/FuchsiaCity_Mart/header.inc b/data/maps/FuchsiaCity_Mart/header.inc index 7e3661618..705b0f301 100644 --- a/data/maps/FuchsiaCity_Mart/header.inc +++ b/data/maps/FuchsiaCity_Mart/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Mart:: @ 8351434 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014 - .4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0 + .4byte FuchsiaCity_Mart_MapEvents @ 0x83BC014 + .4byte FuchsiaCity_Mart_MapScripts @ 0x816D4E0 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc index da90f4470..2d88508c4 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_PokemonCenter_1F:: @ 83514A4 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC - .4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1 + .4byte FuchsiaCity_PokemonCenter_1F_MapEvents @ 0x83BC2AC + .4byte FuchsiaCity_PokemonCenter_1F_MapScripts @ 0x816D6F1 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc index 890dc2977..6beffe603 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_PokemonCenter_2F:: @ 83514C0 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338 - .4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724 + .4byte FuchsiaCity_PokemonCenter_2F_MapEvents @ 0x83BC338 + .4byte FuchsiaCity_PokemonCenter_2F_MapScripts @ 0x816D724 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc index f83a6b62f..7bfaeb1ec 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_SafariZone_Entrance:: @ 8351418 .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80 - .4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0 - .4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8 + .4byte FuchsiaCity_SafariZone_Entrance_MapEvents @ 0x83BBFA0 + .4byte FuchsiaCity_SafariZone_Entrance_MapScripts @ 0x816D2A8 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 51 diff --git a/data/maps/FuchsiaCity_ZooBuilding/header.inc b/data/maps/FuchsiaCity_ZooBuilding/header.inc index a47f66952..e5ad3ae0c 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/header.inc +++ b/data/maps/FuchsiaCity_ZooBuilding/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_ZooBuilding:: @ 8351450 .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348 - .4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0 - .4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528 + .4byte FuchsiaCity_ZooBuilding_MapEvents @ 0x83BC0A0 + .4byte FuchsiaCity_ZooBuilding_MapScripts @ 0x816D528 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 200 diff --git a/data/maps/IndigoPlateau_Exterior/header.inc b/data/maps/IndigoPlateau_Exterior/header.inc index f6d13a5f5..c40993e89 100644 --- a/data/maps/IndigoPlateau_Exterior/header.inc +++ b/data/maps/IndigoPlateau_Exterior/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_Exterior:: @ 8350714 .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04 - .4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C - .4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B + .4byte IndigoPlateau_Exterior_MapEvents @ 0x83B5C3C + .4byte IndigoPlateau_Exterior_MapScripts @ 0x816723B .4byte IndigoPlateau_Exterior_MapConnections @ 0x83528BC .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 87 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc index 48d8200cd..bb16f0475 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_PokemonCenter_1F:: @ 8351610 .4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000 - .4byte gMapEvents_IndigoPlateau_PokemonCenter_1F @ 0x83BCA94 - .4byte gMapScripts_IndigoPlateau_PokemonCenter_1F @ 0x816EA5A + .4byte IndigoPlateau_PokemonCenter_1F_MapEvents @ 0x83BCA94 + .4byte IndigoPlateau_PokemonCenter_1F_MapScripts @ 0x816EA5A .4byte NULL .2byte BGM_FRLG_GYM .2byte 212 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc index 9b88ab689..604c361d8 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_PokemonCenter_2F:: @ 835162C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_IndigoPlateau_PokemonCenter_2F @ 0x83BCB20 - .4byte gMapScripts_IndigoPlateau_PokemonCenter_2F @ 0x816EB0F + .4byte IndigoPlateau_PokemonCenter_2F_MapEvents @ 0x83BCB20 + .4byte IndigoPlateau_PokemonCenter_2F_MapScripts @ 0x816EB0F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/LavenderTown/header.inc b/data/maps/LavenderTown/header.inc index ba459c4ac..24913dc46 100644 --- a/data/maps/LavenderTown/header.inc +++ b/data/maps/LavenderTown/header.inc @@ -1,7 +1,7 @@ LavenderTown:: @ 8350688 .4byte LavenderTown_Layout @ 0x82E0610 - .4byte gMapEvents_LavenderTown @ 0x83B549C - .4byte gMapScripts_LavenderTown @ 0x816686B + .4byte LavenderTown_MapEvents @ 0x83B549C + .4byte LavenderTown_MapScripts @ 0x816686B .4byte LavenderTown_MapConnections @ 0x835281C .2byte BGM_FRLG_LAVENDER_TOWN .2byte 82 diff --git a/data/maps/LavenderTown_House1/header.inc b/data/maps/LavenderTown_House1/header.inc index 1ce5034eb..5c11f9ff5 100644 --- a/data/maps/LavenderTown_House1/header.inc +++ b/data/maps/LavenderTown_House1/header.inc @@ -1,7 +1,7 @@ LavenderTown_House1:: @ 83510B4 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_LavenderTown_House1 @ 0x83BAA58 - .4byte gMapScripts_LavenderTown_House1 @ 0x816B232 + .4byte LavenderTown_House1_MapEvents @ 0x83BAA58 + .4byte LavenderTown_House1_MapScripts @ 0x816B232 .4byte NULL .2byte BGM_FRLG_LAVENDER_TOWN .2byte 21 diff --git a/data/maps/LavenderTown_House2/header.inc b/data/maps/LavenderTown_House2/header.inc index 87ec9bcde..30f103a05 100644 --- a/data/maps/LavenderTown_House2/header.inc +++ b/data/maps/LavenderTown_House2/header.inc @@ -1,7 +1,7 @@ LavenderTown_House2:: @ 83510D0 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_LavenderTown_House2 @ 0x83BAA9C - .4byte gMapScripts_LavenderTown_House2 @ 0x816B265 + .4byte LavenderTown_House2_MapEvents @ 0x83BAA9C + .4byte LavenderTown_House2_MapScripts @ 0x816B265 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 21 diff --git a/data/maps/LavenderTown_Mart/header.inc b/data/maps/LavenderTown_Mart/header.inc index 593229dc4..848c25d72 100644 --- a/data/maps/LavenderTown_Mart/header.inc +++ b/data/maps/LavenderTown_Mart/header.inc @@ -1,7 +1,7 @@ LavenderTown_Mart:: @ 83510EC .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_LavenderTown_Mart @ 0x83BAB28 - .4byte gMapScripts_LavenderTown_Mart @ 0x816B34F + .4byte LavenderTown_Mart_MapEvents @ 0x83BAB28 + .4byte LavenderTown_Mart_MapScripts @ 0x816B34F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/header.inc b/data/maps/LavenderTown_PokemonCenter_1F/header.inc index 65952d0a1..ecf848112 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ LavenderTown_PokemonCenter_1F:: @ 8351060 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_LavenderTown_PokemonCenter_1F @ 0x83BA890 - .4byte gMapScripts_LavenderTown_PokemonCenter_1F @ 0x816B0EF + .4byte LavenderTown_PokemonCenter_1F_MapEvents @ 0x83BA890 + .4byte LavenderTown_PokemonCenter_1F_MapScripts @ 0x816B0EF .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/header.inc b/data/maps/LavenderTown_PokemonCenter_2F/header.inc index 81e4c42e5..99713d4c8 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ LavenderTown_PokemonCenter_2F:: @ 835107C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_LavenderTown_PokemonCenter_2F @ 0x83BA91C - .4byte gMapScripts_LavenderTown_PokemonCenter_2F @ 0x816B122 + .4byte LavenderTown_PokemonCenter_2F_MapEvents @ 0x83BA91C + .4byte LavenderTown_PokemonCenter_2F_MapScripts @ 0x816B122 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc index 2d58479f3..b10a4798f 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc @@ -1,7 +1,7 @@ LavenderTown_VolunteerPokemonHouse:: @ 8351098 .4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4 - .4byte gMapEvents_LavenderTown_VolunteerPokemonHouse @ 0x83BA9FC - .4byte gMapScripts_LavenderTown_VolunteerPokemonHouse @ 0x816B149 + .4byte LavenderTown_VolunteerPokemonHouse_MapEvents @ 0x83BA9FC + .4byte LavenderTown_VolunteerPokemonHouse_MapScripts @ 0x816B149 .4byte NULL .2byte BGM_FRLG_LAVENDER_TOWN .2byte 274 diff --git a/data/maps/MtEmber_Exterior/header.inc b/data/maps/MtEmber_Exterior/header.inc index ef95fc172..8d43c8d97 100644 --- a/data/maps/MtEmber_Exterior/header.inc +++ b/data/maps/MtEmber_Exterior/header.inc @@ -1,7 +1,7 @@ MtEmber_Exterior:: @ 834FCB0 .4byte MtEmber_Exterior_Layout @ 0x833D660 - .4byte gMapEvents_MtEmber_Exterior @ 0x83B2C24 - .4byte gMapScripts_MtEmber_Exterior @ 0x8163946 + .4byte MtEmber_Exterior_MapEvents @ 0x83B2C24 + .4byte MtEmber_Exterior_MapScripts @ 0x8163946 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 280 diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc index bf10f81e3..659721b8b 100644 --- a/data/maps/MtEmber_RubyPath_B1F/header.inc +++ b/data/maps/MtEmber_RubyPath_B1F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B1F:: @ 834FD74 .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 - .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 - .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 + .4byte MtEmber_RubyPath_B1F_MapEvents @ 0x83B2F64 + .4byte MtEmber_RubyPath_B1F_MapScripts @ 0x8163C46 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 286 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc index 8da609b21..605a4c539 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 .4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8 - .4byte gMapEvents_MtEmber_RubyPath_B1F_Stairs @ 0x83B3188 - .4byte gMapScripts_MtEmber_RubyPath_B1F_Stairs @ 0x8163C6F + .4byte MtEmber_RubyPath_B1F_Stairs_MapEvents @ 0x83B3188 + .4byte MtEmber_RubyPath_B1F_Stairs_MapScripts @ 0x8163C6F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 289 diff --git a/data/maps/MtEmber_RubyPath_B2F/header.inc b/data/maps/MtEmber_RubyPath_B2F/header.inc index f390388e4..817cf2e47 100644 --- a/data/maps/MtEmber_RubyPath_B2F/header.inc +++ b/data/maps/MtEmber_RubyPath_B2F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B2F:: @ 834FD90 .4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8 - .4byte gMapEvents_MtEmber_RubyPath_B2F @ 0x83B3030 - .4byte gMapScripts_MtEmber_RubyPath_B2F @ 0x8163C47 + .4byte MtEmber_RubyPath_B2F_MapEvents @ 0x83B3030 + .4byte MtEmber_RubyPath_B2F_MapScripts @ 0x8163C47 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 287 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc index 1b502c77b..875d1f224 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 .4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C - .4byte gMapEvents_MtEmber_RubyPath_B2F_Stairs @ 0x83B31DC - .4byte gMapScripts_MtEmber_RubyPath_B2F_Stairs @ 0x8163C70 + .4byte MtEmber_RubyPath_B2F_Stairs_MapEvents @ 0x83B31DC + .4byte MtEmber_RubyPath_B2F_Stairs_MapScripts @ 0x8163C70 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 290 diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc index d0936221e..bcf17a29f 100644 --- a/data/maps/MtEmber_RubyPath_B3F/header.inc +++ b/data/maps/MtEmber_RubyPath_B3F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B3F:: @ 834FDAC .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 - .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C - .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 + .4byte MtEmber_RubyPath_B3F_MapEvents @ 0x83B314C + .4byte MtEmber_RubyPath_B3F_MapScripts @ 0x8163C48 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 288 diff --git a/data/maps/MtEmber_RubyPath_B4F/header.inc b/data/maps/MtEmber_RubyPath_B4F/header.inc index b91482b18..e6c316632 100644 --- a/data/maps/MtEmber_RubyPath_B4F/header.inc +++ b/data/maps/MtEmber_RubyPath_B4F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B4F:: @ 834FC94 .4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290 - .4byte gMapEvents_MtEmber_RubyPath_B4F @ 0x83B29B8 - .4byte gMapScripts_MtEmber_RubyPath_B4F @ 0x81638EB + .4byte MtEmber_RubyPath_B4F_MapEvents @ 0x83B29B8 + .4byte MtEmber_RubyPath_B4F_MapScripts @ 0x81638EB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 269 diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc index 1a351c127..8fbb65498 100644 --- a/data/maps/MtEmber_RubyPath_B5F/header.inc +++ b/data/maps/MtEmber_RubyPath_B5F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B5F:: @ 834FD3C .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 - .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C - .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA + .4byte MtEmber_RubyPath_B5F_MapEvents @ 0x83B2E3C + .4byte MtEmber_RubyPath_B5F_MapScripts @ 0x8163BAA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 291 diff --git a/data/maps/MtEmber_Summit/header.inc b/data/maps/MtEmber_Summit/header.inc index 367a35294..64c30d948 100644 --- a/data/maps/MtEmber_Summit/header.inc +++ b/data/maps/MtEmber_Summit/header.inc @@ -1,7 +1,7 @@ MtEmber_Summit:: @ 834FD20 .4byte MtEmber_Summit_Layout @ 0x833D9C8 - .4byte gMapEvents_MtEmber_Summit @ 0x83B2DFC - .4byte gMapScripts_MtEmber_Summit @ 0x8163AFC + .4byte MtEmber_Summit_MapEvents @ 0x83B2DFC + .4byte MtEmber_Summit_MapScripts @ 0x8163AFC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 281 diff --git a/data/maps/MtEmber_SummitPath_1F/header.inc b/data/maps/MtEmber_SummitPath_1F/header.inc index 0ea8992a8..380374d2d 100644 --- a/data/maps/MtEmber_SummitPath_1F/header.inc +++ b/data/maps/MtEmber_SummitPath_1F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_1F:: @ 834FCCC .4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08 - .4byte gMapEvents_MtEmber_SummitPath_1F @ 0x83B2C48 - .4byte gMapScripts_MtEmber_SummitPath_1F @ 0x8163AF9 + .4byte MtEmber_SummitPath_1F_MapEvents @ 0x83B2C48 + .4byte MtEmber_SummitPath_1F_MapScripts @ 0x8163AF9 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 282 diff --git a/data/maps/MtEmber_SummitPath_2F/header.inc b/data/maps/MtEmber_SummitPath_2F/header.inc index 503410f81..b53170ef8 100644 --- a/data/maps/MtEmber_SummitPath_2F/header.inc +++ b/data/maps/MtEmber_SummitPath_2F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_2F:: @ 834FCE8 .4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C - .4byte gMapEvents_MtEmber_SummitPath_2F @ 0x83B2D44 - .4byte gMapScripts_MtEmber_SummitPath_2F @ 0x8163AFA + .4byte MtEmber_SummitPath_2F_MapEvents @ 0x83B2D44 + .4byte MtEmber_SummitPath_2F_MapScripts @ 0x8163AFA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 283 diff --git a/data/maps/MtEmber_SummitPath_3F/header.inc b/data/maps/MtEmber_SummitPath_3F/header.inc index 35170cadb..0d6829bab 100644 --- a/data/maps/MtEmber_SummitPath_3F/header.inc +++ b/data/maps/MtEmber_SummitPath_3F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_3F:: @ 834FD04 .4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC - .4byte gMapEvents_MtEmber_SummitPath_3F @ 0x83B2D68 - .4byte gMapScripts_MtEmber_SummitPath_3F @ 0x8163AFB + .4byte MtEmber_SummitPath_3F_MapEvents @ 0x83B2D68 + .4byte MtEmber_SummitPath_3F_MapScripts @ 0x8163AFB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 284 diff --git a/data/maps/MtMoon_1F/header.inc b/data/maps/MtMoon_1F/header.inc index 3c5cd8a69..13f9175f3 100644 --- a/data/maps/MtMoon_1F/header.inc +++ b/data/maps/MtMoon_1F/header.inc @@ -1,7 +1,7 @@ MtMoon_1F:: @ 834F230 .4byte MtMoon_1F_Layout @ 0x82FA890 - .4byte gMapEvents_MtMoon_1F @ 0x83AE668 - .4byte gMapScripts_MtMoon_1F @ 0x81605E4 + .4byte MtMoon_1F_MapEvents @ 0x83AE668 + .4byte MtMoon_1F_MapScripts @ 0x81605E4 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 114 diff --git a/data/maps/MtMoon_B1F/header.inc b/data/maps/MtMoon_B1F/header.inc index 718e761e4..83f710180 100644 --- a/data/maps/MtMoon_B1F/header.inc +++ b/data/maps/MtMoon_B1F/header.inc @@ -1,7 +1,7 @@ MtMoon_B1F:: @ 834F24C .4byte MtMoon_B1F_Layout @ 0x82FB804 - .4byte gMapEvents_MtMoon_B1F @ 0x83AE704 - .4byte gMapScripts_MtMoon_B1F @ 0x8160698 + .4byte MtMoon_B1F_MapEvents @ 0x83AE704 + .4byte MtMoon_B1F_MapScripts @ 0x8160698 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 115 diff --git a/data/maps/MtMoon_B2F/header.inc b/data/maps/MtMoon_B2F/header.inc index 90329479b..d84f5a668 100644 --- a/data/maps/MtMoon_B2F/header.inc +++ b/data/maps/MtMoon_B2F/header.inc @@ -1,7 +1,7 @@ MtMoon_B2F:: @ 834F268 .4byte MtMoon_B2F_Layout @ 0x82FC728 - .4byte gMapEvents_MtMoon_B2F @ 0x83AE868 - .4byte gMapScripts_MtMoon_B2F @ 0x8160699 + .4byte MtMoon_B2F_MapEvents @ 0x83AE868 + .4byte MtMoon_B2F_MapScripts @ 0x8160699 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 116 diff --git a/data/maps/NavelRock_1F/header.inc b/data/maps/NavelRock_1F/header.inc index ec20cfcb6..770c47ebc 100644 --- a/data/maps/NavelRock_1F/header.inc +++ b/data/maps/NavelRock_1F/header.inc @@ -1,7 +1,7 @@ NavelRock_1F:: @ 8350378 .4byte NavelRock_1F_Layout @ 0x8348AD4 - .4byte gMapEvents_NavelRock_1F @ 0x83B48E0 - .4byte gMapScripts_NavelRock_1F @ 0x8164F9E + .4byte NavelRock_1F_MapEvents @ 0x83B48E0 + .4byte NavelRock_1F_MapScripts @ 0x8164F9E .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 344 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 433e62694..b9d2192a8 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -1,7 +1,7 @@ NavelRock_B1F:: @ 8350570 .4byte NavelRock_B1F_Layout @ 0x834A210 - .4byte gMapEvents_NavelRock_B1F @ 0x83B4BA4 - .4byte gMapScripts_NavelRock_B1F @ 0x8165201 + .4byte NavelRock_B1F_MapEvents @ 0x83B4BA4 + .4byte NavelRock_B1F_MapScripts @ 0x8165201 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 364 diff --git a/data/maps/NavelRock_Base/header.inc b/data/maps/NavelRock_Base/header.inc index bf472a849..e452edef9 100644 --- a/data/maps/NavelRock_Base/header.inc +++ b/data/maps/NavelRock_Base/header.inc @@ -1,7 +1,7 @@ NavelRock_Base:: @ 83503B0 .4byte NavelRock_Base_Layout @ 0x834929C - .4byte gMapEvents_NavelRock_Base @ 0x83B4964 - .4byte gMapScripts_NavelRock_Base @ 0x81650E7 + .4byte NavelRock_Base_MapEvents @ 0x83B4964 + .4byte NavelRock_Base_MapScripts @ 0x81650E7 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 346 diff --git a/data/maps/NavelRock_BasePath_B10F/header.inc b/data/maps/NavelRock_BasePath_B10F/header.inc index e08eb617b..5354c6f9f 100644 --- a/data/maps/NavelRock_BasePath_B10F/header.inc +++ b/data/maps/NavelRock_BasePath_B10F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B10F:: @ 8350538 .4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C - .4byte gMapEvents_NavelRock_BasePath_B10F @ 0x83B4B5C - .4byte gMapScripts_NavelRock_BasePath_B10F @ 0x81651FF + .4byte NavelRock_BasePath_B10F_MapEvents @ 0x83B4B5C + .4byte NavelRock_BasePath_B10F_MapScripts @ 0x81651FF .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 360 diff --git a/data/maps/NavelRock_BasePath_B11F/header.inc b/data/maps/NavelRock_BasePath_B11F/header.inc index 5803aa630..395f9d82a 100644 --- a/data/maps/NavelRock_BasePath_B11F/header.inc +++ b/data/maps/NavelRock_BasePath_B11F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B11F:: @ 8350554 .4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94 - .4byte gMapEvents_NavelRock_BasePath_B11F @ 0x83B4B80 - .4byte gMapScripts_NavelRock_BasePath_B11F @ 0x8165200 + .4byte NavelRock_BasePath_B11F_MapEvents @ 0x83B4B80 + .4byte NavelRock_BasePath_B11F_MapScripts @ 0x8165200 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 361 diff --git a/data/maps/NavelRock_BasePath_B1F/header.inc b/data/maps/NavelRock_BasePath_B1F/header.inc index e34db29ef..b7f59616a 100644 --- a/data/maps/NavelRock_BasePath_B1F/header.inc +++ b/data/maps/NavelRock_BasePath_B1F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B1F:: @ 835043C .4byte NavelRock_BasePath_B1F_Layout @ 0x8349544 - .4byte gMapEvents_NavelRock_BasePath_B1F @ 0x83B4A18 - .4byte gMapScripts_NavelRock_BasePath_B1F @ 0x81651F6 + .4byte NavelRock_BasePath_B1F_MapEvents @ 0x83B4A18 + .4byte NavelRock_BasePath_B1F_MapScripts @ 0x81651F6 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 351 diff --git a/data/maps/NavelRock_BasePath_B2F/header.inc b/data/maps/NavelRock_BasePath_B2F/header.inc index bf0cc1d19..55a55d2ab 100644 --- a/data/maps/NavelRock_BasePath_B2F/header.inc +++ b/data/maps/NavelRock_BasePath_B2F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B2F:: @ 8350458 .4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC - .4byte gMapEvents_NavelRock_BasePath_B2F @ 0x83B4A3C - .4byte gMapScripts_NavelRock_BasePath_B2F @ 0x81651F7 + .4byte NavelRock_BasePath_B2F_MapEvents @ 0x83B4A3C + .4byte NavelRock_BasePath_B2F_MapScripts @ 0x81651F7 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 352 diff --git a/data/maps/NavelRock_BasePath_B3F/header.inc b/data/maps/NavelRock_BasePath_B3F/header.inc index 9a85457ec..a2c0a7871 100644 --- a/data/maps/NavelRock_BasePath_B3F/header.inc +++ b/data/maps/NavelRock_BasePath_B3F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B3F:: @ 8350474 .4byte NavelRock_BasePath_B3F_Layout @ 0x8349654 - .4byte gMapEvents_NavelRock_BasePath_B3F @ 0x83B4A60 - .4byte gMapScripts_NavelRock_BasePath_B3F @ 0x81651F8 + .4byte NavelRock_BasePath_B3F_MapEvents @ 0x83B4A60 + .4byte NavelRock_BasePath_B3F_MapScripts @ 0x81651F8 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 353 diff --git a/data/maps/NavelRock_BasePath_B4F/header.inc b/data/maps/NavelRock_BasePath_B4F/header.inc index 75ea7719a..8ea714e88 100644 --- a/data/maps/NavelRock_BasePath_B4F/header.inc +++ b/data/maps/NavelRock_BasePath_B4F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B4F:: @ 8350490 .4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC - .4byte gMapEvents_NavelRock_BasePath_B4F @ 0x83B4A84 - .4byte gMapScripts_NavelRock_BasePath_B4F @ 0x81651F9 + .4byte NavelRock_BasePath_B4F_MapEvents @ 0x83B4A84 + .4byte NavelRock_BasePath_B4F_MapScripts @ 0x81651F9 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 354 diff --git a/data/maps/NavelRock_BasePath_B5F/header.inc b/data/maps/NavelRock_BasePath_B5F/header.inc index 8cc359f34..cceabefd2 100644 --- a/data/maps/NavelRock_BasePath_B5F/header.inc +++ b/data/maps/NavelRock_BasePath_B5F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B5F:: @ 83504AC .4byte NavelRock_BasePath_B5F_Layout @ 0x8349764 - .4byte gMapEvents_NavelRock_BasePath_B5F @ 0x83B4AA8 - .4byte gMapScripts_NavelRock_BasePath_B5F @ 0x81651FA + .4byte NavelRock_BasePath_B5F_MapEvents @ 0x83B4AA8 + .4byte NavelRock_BasePath_B5F_MapScripts @ 0x81651FA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 355 diff --git a/data/maps/NavelRock_BasePath_B6F/header.inc b/data/maps/NavelRock_BasePath_B6F/header.inc index d69c50370..e2c1d0fa6 100644 --- a/data/maps/NavelRock_BasePath_B6F/header.inc +++ b/data/maps/NavelRock_BasePath_B6F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B6F:: @ 83504C8 .4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC - .4byte gMapEvents_NavelRock_BasePath_B6F @ 0x83B4ACC - .4byte gMapScripts_NavelRock_BasePath_B6F @ 0x81651FB + .4byte NavelRock_BasePath_B6F_MapEvents @ 0x83B4ACC + .4byte NavelRock_BasePath_B6F_MapScripts @ 0x81651FB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 356 diff --git a/data/maps/NavelRock_BasePath_B7F/header.inc b/data/maps/NavelRock_BasePath_B7F/header.inc index 409329aee..cfcafafb7 100644 --- a/data/maps/NavelRock_BasePath_B7F/header.inc +++ b/data/maps/NavelRock_BasePath_B7F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B7F:: @ 83504E4 .4byte NavelRock_BasePath_B7F_Layout @ 0x8349874 - .4byte gMapEvents_NavelRock_BasePath_B7F @ 0x83B4AF0 - .4byte gMapScripts_NavelRock_BasePath_B7F @ 0x81651FC + .4byte NavelRock_BasePath_B7F_MapEvents @ 0x83B4AF0 + .4byte NavelRock_BasePath_B7F_MapScripts @ 0x81651FC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 357 diff --git a/data/maps/NavelRock_BasePath_B8F/header.inc b/data/maps/NavelRock_BasePath_B8F/header.inc index 22015b53c..5849c2805 100644 --- a/data/maps/NavelRock_BasePath_B8F/header.inc +++ b/data/maps/NavelRock_BasePath_B8F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B8F:: @ 8350500 .4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC - .4byte gMapEvents_NavelRock_BasePath_B8F @ 0x83B4B14 - .4byte gMapScripts_NavelRock_BasePath_B8F @ 0x81651FD + .4byte NavelRock_BasePath_B8F_MapEvents @ 0x83B4B14 + .4byte NavelRock_BasePath_B8F_MapScripts @ 0x81651FD .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 358 diff --git a/data/maps/NavelRock_BasePath_B9F/header.inc b/data/maps/NavelRock_BasePath_B9F/header.inc index 84f332175..d8b3d5364 100644 --- a/data/maps/NavelRock_BasePath_B9F/header.inc +++ b/data/maps/NavelRock_BasePath_B9F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B9F:: @ 835051C .4byte NavelRock_BasePath_B9F_Layout @ 0x8349984 - .4byte gMapEvents_NavelRock_BasePath_B9F @ 0x83B4B38 - .4byte gMapScripts_NavelRock_BasePath_B9F @ 0x81651FE + .4byte NavelRock_BasePath_B9F_MapEvents @ 0x83B4B38 + .4byte NavelRock_BasePath_B9F_MapScripts @ 0x81651FE .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 359 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 24326d2bf..0d62b0618 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -1,7 +1,7 @@ NavelRock_Exterior:: @ 834FF88 .4byte NavelRock_Exterior_Layout @ 0x834873C - .4byte gMapEvents_NavelRock_Exterior @ 0x83B3B74 - .4byte gMapScripts_NavelRock_Exterior @ 0x81646AE + .4byte NavelRock_Exterior_MapEvents @ 0x83B3B74 + .4byte NavelRock_Exterior_MapScripts @ 0x81646AE .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 343 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 4d2dc4238..93ab89de4 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -1,7 +1,7 @@ NavelRock_Fork:: @ 835058C .4byte NavelRock_Fork_Layout @ 0x834B9A4 - .4byte gMapEvents_NavelRock_Fork @ 0x83B4BD0 - .4byte gMapScripts_NavelRock_Fork @ 0x8165202 + .4byte NavelRock_Fork_MapEvents @ 0x83B4BD0 + .4byte NavelRock_Fork_MapScripts @ 0x8165202 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 365 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 2a6e89bbe..39261ab96 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -1,7 +1,7 @@ NavelRock_Harbor:: @ 83505FC .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_NavelRock_Harbor @ 0x83B4D70 - .4byte gMapScripts_NavelRock_Harbor @ 0x8165420 + .4byte NavelRock_Harbor_MapEvents @ 0x83B4D70 + .4byte NavelRock_Harbor_MapScripts @ 0x8165420 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 315 diff --git a/data/maps/NavelRock_Summit/header.inc b/data/maps/NavelRock_Summit/header.inc index 39b0c4d8f..d49b0dc14 100644 --- a/data/maps/NavelRock_Summit/header.inc +++ b/data/maps/NavelRock_Summit/header.inc @@ -1,7 +1,7 @@ NavelRock_Summit:: @ 8350394 .4byte NavelRock_Summit_Layout @ 0x8348EB0 - .4byte gMapEvents_NavelRock_Summit @ 0x83B4930 - .4byte gMapScripts_NavelRock_Summit @ 0x8164F9F + .4byte NavelRock_Summit_MapEvents @ 0x83B4930 + .4byte NavelRock_Summit_MapScripts @ 0x8164F9F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 345 diff --git a/data/maps/NavelRock_SummitPath_2F/header.inc b/data/maps/NavelRock_SummitPath_2F/header.inc index bc56502b3..9ae52b8ca 100644 --- a/data/maps/NavelRock_SummitPath_2F/header.inc +++ b/data/maps/NavelRock_SummitPath_2F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_2F:: @ 83503CC .4byte NavelRock_SummitPath_2F_Layout @ 0x8349324 - .4byte gMapEvents_NavelRock_SummitPath_2F @ 0x83B4988 - .4byte gMapScripts_NavelRock_SummitPath_2F @ 0x81651F2 + .4byte NavelRock_SummitPath_2F_MapEvents @ 0x83B4988 + .4byte NavelRock_SummitPath_2F_MapScripts @ 0x81651F2 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 347 diff --git a/data/maps/NavelRock_SummitPath_3F/header.inc b/data/maps/NavelRock_SummitPath_3F/header.inc index 3454ffd77..2eb984a8a 100644 --- a/data/maps/NavelRock_SummitPath_3F/header.inc +++ b/data/maps/NavelRock_SummitPath_3F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_3F:: @ 83503E8 .4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC - .4byte gMapEvents_NavelRock_SummitPath_3F @ 0x83B49AC - .4byte gMapScripts_NavelRock_SummitPath_3F @ 0x81651F3 + .4byte NavelRock_SummitPath_3F_MapEvents @ 0x83B49AC + .4byte NavelRock_SummitPath_3F_MapScripts @ 0x81651F3 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 348 diff --git a/data/maps/NavelRock_SummitPath_4F/header.inc b/data/maps/NavelRock_SummitPath_4F/header.inc index 996b28555..37baa8cf6 100644 --- a/data/maps/NavelRock_SummitPath_4F/header.inc +++ b/data/maps/NavelRock_SummitPath_4F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_4F:: @ 8350404 .4byte NavelRock_SummitPath_4F_Layout @ 0x8349434 - .4byte gMapEvents_NavelRock_SummitPath_4F @ 0x83B49D0 - .4byte gMapScripts_NavelRock_SummitPath_4F @ 0x81651F4 + .4byte NavelRock_SummitPath_4F_MapEvents @ 0x83B49D0 + .4byte NavelRock_SummitPath_4F_MapScripts @ 0x81651F4 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 349 diff --git a/data/maps/NavelRock_SummitPath_5F/header.inc b/data/maps/NavelRock_SummitPath_5F/header.inc index 5beffe449..88a1d0a8d 100644 --- a/data/maps/NavelRock_SummitPath_5F/header.inc +++ b/data/maps/NavelRock_SummitPath_5F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_5F:: @ 8350420 .4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC - .4byte gMapEvents_NavelRock_SummitPath_5F @ 0x83B49F4 - .4byte gMapScripts_NavelRock_SummitPath_5F @ 0x81651F5 + .4byte NavelRock_SummitPath_5F_MapEvents @ 0x83B49F4 + .4byte NavelRock_SummitPath_5F_MapScripts @ 0x81651F5 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 350 diff --git a/data/maps/OneIsland/header.inc b/data/maps/OneIsland/header.inc index f54c47e14..a2d521727 100644 --- a/data/maps/OneIsland/header.inc +++ b/data/maps/OneIsland/header.inc @@ -1,7 +1,7 @@ OneIsland:: @ 8350768 .4byte OneIsland_Layout @ 0x8321714 - .4byte gMapEvents_OneIsland @ 0x83B5F44 - .4byte gMapScripts_OneIsland @ 0x8167484 + .4byte OneIsland_MapEvents @ 0x83B5F44 + .4byte OneIsland_MapScripts @ 0x8167484 .4byte OneIsland_MapConnections @ 0x835294C .2byte BGM_FRLG_ISLAND_ONE .2byte 230 diff --git a/data/maps/OneIsland_Harbor/header.inc b/data/maps/OneIsland_Harbor/header.inc index 0a39c9134..d98fcca3a 100644 --- a/data/maps/OneIsland_Harbor/header.inc +++ b/data/maps/OneIsland_Harbor/header.inc @@ -1,7 +1,7 @@ OneIsland_Harbor:: @ 8351BDC .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_OneIsland_Harbor @ 0x83BE558 - .4byte gMapScripts_OneIsland_Harbor @ 0x8171378 + .4byte OneIsland_Harbor_MapEvents @ 0x83BE558 + .4byte OneIsland_Harbor_MapScripts @ 0x8171378 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/OneIsland_House1/header.inc b/data/maps/OneIsland_House1/header.inc index 3c8db882b..7d60ff6d5 100644 --- a/data/maps/OneIsland_House1/header.inc +++ b/data/maps/OneIsland_House1/header.inc @@ -1,7 +1,7 @@ OneIsland_House1:: @ 8351BA4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_OneIsland_House1 @ 0x83BE4D8 - .4byte gMapScripts_OneIsland_House1 @ 0x817135B + .4byte OneIsland_House1_MapEvents @ 0x83BE4D8 + .4byte OneIsland_House1_MapScripts @ 0x817135B .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/OneIsland_House2/header.inc b/data/maps/OneIsland_House2/header.inc index 7df223934..0048e308d 100644 --- a/data/maps/OneIsland_House2/header.inc +++ b/data/maps/OneIsland_House2/header.inc @@ -1,7 +1,7 @@ OneIsland_House2:: @ 8351BC0 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_OneIsland_House2 @ 0x83BE50C - .4byte gMapScripts_OneIsland_House2 @ 0x817136E + .4byte OneIsland_House2_MapEvents @ 0x83BE50C + .4byte OneIsland_House2_MapScripts @ 0x817136E .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/OneIsland_KindleRoad/header.inc b/data/maps/OneIsland_KindleRoad/header.inc index b1c68b719..1c540ae87 100644 --- a/data/maps/OneIsland_KindleRoad/header.inc +++ b/data/maps/OneIsland_KindleRoad/header.inc @@ -1,7 +1,7 @@ OneIsland_KindleRoad:: @ 8350B04 .4byte OneIsland_KindleRoad_Layout @ 0x8325D70 - .4byte gMapEvents_OneIsland_KindleRoad @ 0x83B888C - .4byte gMapScripts_OneIsland_KindleRoad @ 0x8168758 + .4byte OneIsland_KindleRoad_MapEvents @ 0x83B888C + .4byte OneIsland_KindleRoad_MapScripts @ 0x8168758 .4byte OneIsland_KindleRoad_MapConnections @ 0x8352D28 .2byte BGM_FRLG_ROUTE_3 .2byte 237 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc index b9be8bb22..ca4afdec0 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc @@ -1,7 +1,7 @@ OneIsland_KindleRoad_EmberSpa:: @ 83505C4 .4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70 - .4byte gMapEvents_OneIsland_KindleRoad_EmberSpa @ 0x83B4CD8 - .4byte gMapScripts_OneIsland_KindleRoad_EmberSpa @ 0x816535B + .4byte OneIsland_KindleRoad_EmberSpa_MapEvents @ 0x83B4CD8 + .4byte OneIsland_KindleRoad_EmberSpa_MapScripts @ 0x816535B .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 383 diff --git a/data/maps/OneIsland_PokemonCenter_1F/header.inc b/data/maps/OneIsland_PokemonCenter_1F/header.inc index 53afa9da1..815f1fc82 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/header.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ OneIsland_PokemonCenter_1F:: @ 8351B6C .4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970 - .4byte gMapEvents_OneIsland_PokemonCenter_1F @ 0x83BE400 - .4byte gMapScripts_OneIsland_PokemonCenter_1F @ 0x8170BF8 + .4byte OneIsland_PokemonCenter_1F_MapEvents @ 0x83BE400 + .4byte OneIsland_PokemonCenter_1F_MapScripts @ 0x8170BF8 .4byte NULL .2byte BGM_FRLG_POKEMON_NETWORK_CENTER .2byte 271 diff --git a/data/maps/OneIsland_PokemonCenter_2F/header.inc b/data/maps/OneIsland_PokemonCenter_2F/header.inc index 87fa3c548..d0a077901 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/header.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ OneIsland_PokemonCenter_2F:: @ 8351B88 .4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108 - .4byte gMapEvents_OneIsland_PokemonCenter_2F @ 0x83BE48C - .4byte gMapScripts_OneIsland_PokemonCenter_2F @ 0x8171334 + .4byte OneIsland_PokemonCenter_2F_MapEvents @ 0x83BE48C + .4byte OneIsland_PokemonCenter_2F_MapScripts @ 0x8171334 .4byte NULL .2byte BGM_FRLG_POKEMON_NETWORK_CENTER .2byte 316 diff --git a/data/maps/OneIsland_TreasureBeach/header.inc b/data/maps/OneIsland_TreasureBeach/header.inc index 203c7a407..419a99ea7 100644 --- a/data/maps/OneIsland_TreasureBeach/header.inc +++ b/data/maps/OneIsland_TreasureBeach/header.inc @@ -1,7 +1,7 @@ OneIsland_TreasureBeach:: @ 8350B20 .4byte OneIsland_TreasureBeach_Layout @ 0x8326514 - .4byte gMapEvents_OneIsland_TreasureBeach @ 0x83B8930 - .4byte gMapScripts_OneIsland_TreasureBeach @ 0x816876B + .4byte OneIsland_TreasureBeach_MapEvents @ 0x83B8930 + .4byte OneIsland_TreasureBeach_MapScripts @ 0x816876B .4byte OneIsland_TreasureBeach_MapConnections @ 0x8352D3C .2byte BGM_FRLG_ROUTE_3 .2byte 238 diff --git a/data/maps/PalletTown/header.inc b/data/maps/PalletTown/header.inc index f148906c6..8d9104896 100644 --- a/data/maps/PalletTown/header.inc +++ b/data/maps/PalletTown/header.inc @@ -1,7 +1,7 @@ PalletTown:: @ 8350618 .4byte PalletTown_Layout @ 0x82DD4C0 - .4byte gMapEvents_PalletTown @ 0x83B4E50 - .4byte gMapScripts_PalletTown @ 0x816545A + .4byte PalletTown_MapEvents @ 0x83B4E50 + .4byte PalletTown_MapScripts @ 0x816545A .4byte PalletTown_MapConnections @ 0x835276C .2byte BGM_FRLG_PALLET_TOWN .2byte 78 diff --git a/data/maps/PalletTown_GarysHouse/header.inc b/data/maps/PalletTown_GarysHouse/header.inc index 6179b28ee..da1b1bd3e 100644 --- a/data/maps/PalletTown_GarysHouse/header.inc +++ b/data/maps/PalletTown_GarysHouse/header.inc @@ -1,7 +1,7 @@ PalletTown_GarysHouse:: @ 8350D88 .4byte PalletTown_GarysHouse_Layout @ 0x82D5424 - .4byte gMapEvents_PalletTown_GarysHouse @ 0x83B980C - .4byte gMapScripts_PalletTown_GarysHouse @ 0x8168D27 + .4byte PalletTown_GarysHouse_MapEvents @ 0x83B980C + .4byte PalletTown_GarysHouse_MapScripts @ 0x8168D27 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 3 diff --git a/data/maps/PalletTown_PlayersHouse_1F/header.inc b/data/maps/PalletTown_PlayersHouse_1F/header.inc index 48c815047..16a3b2627 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/header.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/header.inc @@ -1,7 +1,7 @@ PalletTown_PlayersHouse_1F:: @ 8350D50 .4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200 - .4byte gMapEvents_PalletTown_PlayersHouse_1F @ 0x83B974C - .4byte gMapScripts_PalletTown_PlayersHouse_1F @ 0x8168C08 + .4byte PalletTown_PlayersHouse_1F_MapEvents @ 0x83B974C + .4byte PalletTown_PlayersHouse_1F_MapScripts @ 0x8168C08 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 1 diff --git a/data/maps/PalletTown_PlayersHouse_2F/header.inc b/data/maps/PalletTown_PlayersHouse_2F/header.inc index 5b99b625d..8f886a89c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/header.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/header.inc @@ -1,7 +1,7 @@ PalletTown_PlayersHouse_2F:: @ 8350D6C .4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC - .4byte gMapEvents_PalletTown_PlayersHouse_2F @ 0x83B978C - .4byte gMapScripts_PalletTown_PlayersHouse_2F @ 0x8168CA3 + .4byte PalletTown_PlayersHouse_2F_MapEvents @ 0x83B978C + .4byte PalletTown_PlayersHouse_2F_MapScripts @ 0x8168CA3 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 2 diff --git a/data/maps/PalletTown_ProfessorOaksLab/header.inc b/data/maps/PalletTown_ProfessorOaksLab/header.inc index 226e0ce92..2d2667998 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/header.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/header.inc @@ -1,7 +1,7 @@ PalletTown_ProfessorOaksLab:: @ 8350DA4 .4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668 - .4byte gMapEvents_PalletTown_ProfessorOaksLab @ 0x83B99B8 - .4byte gMapScripts_PalletTown_ProfessorOaksLab @ 0x8168F7E + .4byte PalletTown_ProfessorOaksLab_MapEvents @ 0x83B99B8 + .4byte PalletTown_ProfessorOaksLab_MapScripts @ 0x8168F7E .4byte NULL .2byte BGM_FRLG_OAK_LAB .2byte 5 diff --git a/data/maps/PewterCity/header.inc b/data/maps/PewterCity/header.inc index 9fcbb10ed..f6f16be53 100644 --- a/data/maps/PewterCity/header.inc +++ b/data/maps/PewterCity/header.inc @@ -1,7 +1,7 @@ PewterCity:: @ 8350650 .4byte PewterCity_Layout @ 0x82DF308 - .4byte gMapEvents_PewterCity @ 0x83B518C - .4byte gMapScripts_PewterCity @ 0x8165B8E + .4byte PewterCity_MapEvents @ 0x83B518C + .4byte PewterCity_MapScripts @ 0x8165B8E .4byte PewterCity_MapConnections @ 0x83527B8 .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 80 diff --git a/data/maps/PewterCity_Gym/header.inc b/data/maps/PewterCity_Gym/header.inc index 4d8348987..088aa1ab1 100644 --- a/data/maps/PewterCity_Gym/header.inc +++ b/data/maps/PewterCity_Gym/header.inc @@ -1,7 +1,7 @@ PewterCity_Gym:: @ 8350EA0 .4byte PewterCity_Gym_Layout @ 0x82D732C - .4byte gMapEvents_PewterCity_Gym @ 0x83BA058 - .4byte gMapScripts_PewterCity_Gym @ 0x816A592 + .4byte PewterCity_Gym_MapEvents @ 0x83BA058 + .4byte PewterCity_Gym_MapScripts @ 0x816A592 .4byte NULL .2byte BGM_FRLG_GYM .2byte 28 diff --git a/data/maps/PewterCity_House1/header.inc b/data/maps/PewterCity_House1/header.inc index 547b7ca0c..933c38e45 100644 --- a/data/maps/PewterCity_House1/header.inc +++ b/data/maps/PewterCity_House1/header.inc @@ -1,7 +1,7 @@ PewterCity_House1:: @ 8350ED8 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_PewterCity_House1 @ 0x83BA140 - .4byte gMapScripts_PewterCity_House1 @ 0x816A71C + .4byte PewterCity_House1_MapEvents @ 0x83BA140 + .4byte PewterCity_House1_MapScripts @ 0x816A71C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/PewterCity_House2/header.inc b/data/maps/PewterCity_House2/header.inc index a793efd1c..af76d49ff 100644 --- a/data/maps/PewterCity_House2/header.inc +++ b/data/maps/PewterCity_House2/header.inc @@ -1,7 +1,7 @@ PewterCity_House2:: @ 8350F2C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_PewterCity_House2 @ 0x83BA304 - .4byte gMapScripts_PewterCity_House2 @ 0x816A7DC + .4byte PewterCity_House2_MapEvents @ 0x83BA304 + .4byte PewterCity_House2_MapScripts @ 0x816A7DC .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/PewterCity_Mart/header.inc b/data/maps/PewterCity_Mart/header.inc index ec685db00..2cd4eccad 100644 --- a/data/maps/PewterCity_Mart/header.inc +++ b/data/maps/PewterCity_Mart/header.inc @@ -1,7 +1,7 @@ PewterCity_Mart:: @ 8350EBC .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_PewterCity_Mart @ 0x83BA0CC - .4byte gMapScripts_PewterCity_Mart @ 0x816A6CD + .4byte PewterCity_Mart_MapEvents @ 0x83BA0CC + .4byte PewterCity_Mart_MapScripts @ 0x816A6CD .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/PewterCity_Museum_1F/header.inc b/data/maps/PewterCity_Museum_1F/header.inc index 255e31980..b2ae946ec 100644 --- a/data/maps/PewterCity_Museum_1F/header.inc +++ b/data/maps/PewterCity_Museum_1F/header.inc @@ -1,7 +1,7 @@ PewterCity_Museum_1F:: @ 8350E68 .4byte PewterCity_Museum_1F_Layout @ 0x831A1FC - .4byte gMapEvents_PewterCity_Museum_1F @ 0x83B9ED8 - .4byte gMapScripts_PewterCity_Museum_1F @ 0x816A31A + .4byte PewterCity_Museum_1F_MapEvents @ 0x83B9ED8 + .4byte PewterCity_Museum_1F_MapScripts @ 0x816A31A .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 180 diff --git a/data/maps/PewterCity_Museum_2F/header.inc b/data/maps/PewterCity_Museum_2F/header.inc index 6b6c397ed..d62dc30e1 100644 --- a/data/maps/PewterCity_Museum_2F/header.inc +++ b/data/maps/PewterCity_Museum_2F/header.inc @@ -1,7 +1,7 @@ PewterCity_Museum_2F:: @ 8350E84 .4byte PewterCity_Museum_2F_Layout @ 0x831A39C - .4byte gMapEvents_PewterCity_Museum_2F @ 0x83B9FCC - .4byte gMapScripts_PewterCity_Museum_2F @ 0x816A552 + .4byte PewterCity_Museum_2F_MapEvents @ 0x83B9FCC + .4byte PewterCity_Museum_2F_MapScripts @ 0x816A552 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 181 diff --git a/data/maps/PewterCity_PokemonCenter_1F/header.inc b/data/maps/PewterCity_PokemonCenter_1F/header.inc index 89d2f8208..9270308b7 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/header.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ PewterCity_PokemonCenter_1F:: @ 8350EF4 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_PewterCity_PokemonCenter_1F @ 0x83BA21C - .4byte gMapScripts_PewterCity_PokemonCenter_1F @ 0x816A760 + .4byte PewterCity_PokemonCenter_1F_MapEvents @ 0x83BA21C + .4byte PewterCity_PokemonCenter_1F_MapScripts @ 0x816A760 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/PewterCity_PokemonCenter_2F/header.inc b/data/maps/PewterCity_PokemonCenter_2F/header.inc index 39b506417..c050eb5fb 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/header.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ PewterCity_PokemonCenter_2F:: @ 8350F10 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_PewterCity_PokemonCenter_2F @ 0x83BA2A8 - .4byte gMapScripts_PewterCity_PokemonCenter_2F @ 0x816A7B5 + .4byte PewterCity_PokemonCenter_2F_MapEvents @ 0x83BA2A8 + .4byte PewterCity_PokemonCenter_2F_MapScripts @ 0x816A7B5 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/PokemonLeague_AgathasRoom/header.inc b/data/maps/PokemonLeague_AgathasRoom/header.inc index a5f4c703b..1e253cb1c 100644 --- a/data/maps/PokemonLeague_AgathasRoom/header.inc +++ b/data/maps/PokemonLeague_AgathasRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_AgathasRoom:: @ 834FA80 .4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468 - .4byte gMapEvents_PokemonLeague_AgathasRoom @ 0x83B1928 - .4byte gMapScripts_PokemonLeague_AgathasRoom @ 0x8162810 + .4byte PokemonLeague_AgathasRoom_MapEvents @ 0x83B1928 + .4byte PokemonLeague_AgathasRoom_MapScripts @ 0x8162810 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 215 diff --git a/data/maps/PokemonLeague_BrunosRoom/header.inc b/data/maps/PokemonLeague_BrunosRoom/header.inc index b8fa38018..4a0db477d 100644 --- a/data/maps/PokemonLeague_BrunosRoom/header.inc +++ b/data/maps/PokemonLeague_BrunosRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_BrunosRoom:: @ 834FA64 .4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0 - .4byte gMapEvents_PokemonLeague_BrunosRoom @ 0x83B18EC - .4byte gMapScripts_PokemonLeague_BrunosRoom @ 0x8162685 + .4byte PokemonLeague_BrunosRoom_MapEvents @ 0x83B18EC + .4byte PokemonLeague_BrunosRoom_MapScripts @ 0x8162685 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 214 diff --git a/data/maps/PokemonLeague_ChampionsRoom/header.inc b/data/maps/PokemonLeague_ChampionsRoom/header.inc index f08a9d072..8dd19508d 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/header.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_ChampionsRoom:: @ 834FAB8 .4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8 - .4byte gMapEvents_PokemonLeague_ChampionsRoom @ 0x83B19B8 - .4byte gMapScripts_PokemonLeague_ChampionsRoom @ 0x8162AE2 + .4byte PokemonLeague_ChampionsRoom_MapEvents @ 0x83B19B8 + .4byte PokemonLeague_ChampionsRoom_MapScripts @ 0x8162AE2 .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 217 diff --git a/data/maps/PokemonLeague_HallOfFame/header.inc b/data/maps/PokemonLeague_HallOfFame/header.inc index 0b1464dbb..aa3d6c3b9 100644 --- a/data/maps/PokemonLeague_HallOfFame/header.inc +++ b/data/maps/PokemonLeague_HallOfFame/header.inc @@ -1,7 +1,7 @@ PokemonLeague_HallOfFame:: @ 834FAD4 .4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C - .4byte gMapEvents_PokemonLeague_HallOfFame @ 0x83B19EC - .4byte gMapScripts_PokemonLeague_HallOfFame @ 0x8162D4C + .4byte PokemonLeague_HallOfFame_MapEvents @ 0x83B19EC + .4byte PokemonLeague_HallOfFame_MapScripts @ 0x8162D4C .4byte NULL .2byte BGM_FRLG_HALL_OF_FAME_PALLET_TOWN .2byte 218 diff --git a/data/maps/PokemonLeague_LancesRoom/header.inc b/data/maps/PokemonLeague_LancesRoom/header.inc index ac970db8f..d37a1c254 100644 --- a/data/maps/PokemonLeague_LancesRoom/header.inc +++ b/data/maps/PokemonLeague_LancesRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_LancesRoom:: @ 834FA9C .4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC - .4byte gMapEvents_PokemonLeague_LancesRoom @ 0x83B1964 - .4byte gMapScripts_PokemonLeague_LancesRoom @ 0x816292D + .4byte PokemonLeague_LancesRoom_MapEvents @ 0x83B1964 + .4byte PokemonLeague_LancesRoom_MapScripts @ 0x816292D .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 216 diff --git a/data/maps/PokemonLeague_LoreleisRoom/header.inc b/data/maps/PokemonLeague_LoreleisRoom/header.inc index 01f12285b..c72d978f6 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/header.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_LoreleisRoom:: @ 834FA48 .4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178 - .4byte gMapEvents_PokemonLeague_LoreleisRoom @ 0x83B18B0 - .4byte gMapScripts_PokemonLeague_LoreleisRoom @ 0x816256C + .4byte PokemonLeague_LoreleisRoom_MapEvents @ 0x83B18B0 + .4byte PokemonLeague_LoreleisRoom_MapScripts @ 0x816256C .4byte NULL .2byte BGM_FRLG_GYM .2byte 213 diff --git a/data/maps/PokemonMansion_1F/header.inc b/data/maps/PokemonMansion_1F/header.inc index 167c4d42b..b3e59a63c 100644 --- a/data/maps/PokemonMansion_1F/header.inc +++ b/data/maps/PokemonMansion_1F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_1F:: @ 834F888 .4byte PokemonMansion_1F_Layout @ 0x830AE3C - .4byte gMapEvents_PokemonMansion_1F @ 0x83B0C60 - .4byte gMapScripts_PokemonMansion_1F @ 0x81621F9 + .4byte PokemonMansion_1F_MapEvents @ 0x83B0C60 + .4byte PokemonMansion_1F_MapScripts @ 0x81621F9 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 143 diff --git a/data/maps/PokemonMansion_2F/header.inc b/data/maps/PokemonMansion_2F/header.inc index 39716d024..f3b161fdd 100644 --- a/data/maps/PokemonMansion_2F/header.inc +++ b/data/maps/PokemonMansion_2F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_2F:: @ 834F8A4 .4byte PokemonMansion_2F_Layout @ 0x830B9A8 - .4byte gMapEvents_PokemonMansion_2F @ 0x83B0D20 - .4byte gMapScripts_PokemonMansion_2F @ 0x8162254 + .4byte PokemonMansion_2F_MapEvents @ 0x83B0D20 + .4byte PokemonMansion_2F_MapScripts @ 0x8162254 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 144 diff --git a/data/maps/PokemonMansion_3F/header.inc b/data/maps/PokemonMansion_3F/header.inc index 9dde682d0..e86dc4f3b 100644 --- a/data/maps/PokemonMansion_3F/header.inc +++ b/data/maps/PokemonMansion_3F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_3F:: @ 834F8C0 .4byte PokemonMansion_3F_Layout @ 0x830C430 - .4byte gMapEvents_PokemonMansion_3F @ 0x83B0DF8 - .4byte gMapScripts_PokemonMansion_3F @ 0x81622A1 + .4byte PokemonMansion_3F_MapEvents @ 0x83B0DF8 + .4byte PokemonMansion_3F_MapScripts @ 0x81622A1 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 145 diff --git a/data/maps/PokemonMansion_B1F/header.inc b/data/maps/PokemonMansion_B1F/header.inc index 28d4cec5e..a5d64c3bf 100644 --- a/data/maps/PokemonMansion_B1F/header.inc +++ b/data/maps/PokemonMansion_B1F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_B1F:: @ 834F8DC .4byte PokemonMansion_B1F_Layout @ 0x830CEB8 - .4byte gMapEvents_PokemonMansion_B1F @ 0x83B0ED4 - .4byte gMapScripts_PokemonMansion_B1F @ 0x81622FC + .4byte PokemonMansion_B1F_MapEvents @ 0x83B0ED4 + .4byte PokemonMansion_B1F_MapScripts @ 0x81622FC .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 146 diff --git a/data/maps/PokemonTower_1F/header.inc b/data/maps/PokemonTower_1F/header.inc index 94aefddf2..61a8cd0fb 100644 --- a/data/maps/PokemonTower_1F/header.inc +++ b/data/maps/PokemonTower_1F/header.inc @@ -1,7 +1,7 @@ PokemonTower_1F:: @ 834FBB4 .4byte PokemonTower_1F_Layout @ 0x83167F4 - .4byte gMapEvents_PokemonTower_1F @ 0x83B2270 - .4byte gMapScripts_PokemonTower_1F @ 0x8163235 + .4byte PokemonTower_1F_MapEvents @ 0x83B2270 + .4byte PokemonTower_1F_MapScripts @ 0x8163235 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 161 diff --git a/data/maps/PokemonTower_2F/header.inc b/data/maps/PokemonTower_2F/header.inc index 45838cb9b..ee7c892ce 100644 --- a/data/maps/PokemonTower_2F/header.inc +++ b/data/maps/PokemonTower_2F/header.inc @@ -1,7 +1,7 @@ PokemonTower_2F:: @ 834FBD0 .4byte PokemonTower_2F_Layout @ 0x8316BD8 - .4byte gMapEvents_PokemonTower_2F @ 0x83B22E4 - .4byte gMapScripts_PokemonTower_2F @ 0x8163285 + .4byte PokemonTower_2F_MapEvents @ 0x83B22E4 + .4byte PokemonTower_2F_MapScripts @ 0x8163285 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 162 diff --git a/data/maps/PokemonTower_3F/header.inc b/data/maps/PokemonTower_3F/header.inc index cd7c8fa57..9d972f0a1 100644 --- a/data/maps/PokemonTower_3F/header.inc +++ b/data/maps/PokemonTower_3F/header.inc @@ -1,7 +1,7 @@ PokemonTower_3F:: @ 834FBEC .4byte PokemonTower_3F_Layout @ 0x8316FBC - .4byte gMapEvents_PokemonTower_3F @ 0x83B2368 - .4byte gMapScripts_PokemonTower_3F @ 0x81633A6 + .4byte PokemonTower_3F_MapEvents @ 0x83B2368 + .4byte PokemonTower_3F_MapScripts @ 0x81633A6 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 163 diff --git a/data/maps/PokemonTower_4F/header.inc b/data/maps/PokemonTower_4F/header.inc index 63fccbe42..fe31ef96b 100644 --- a/data/maps/PokemonTower_4F/header.inc +++ b/data/maps/PokemonTower_4F/header.inc @@ -1,7 +1,7 @@ PokemonTower_4F:: @ 834FC08 .4byte PokemonTower_4F_Layout @ 0x83173A0 - .4byte gMapEvents_PokemonTower_4F @ 0x83B241C - .4byte gMapScripts_PokemonTower_4F @ 0x81633EC + .4byte PokemonTower_4F_MapEvents @ 0x83B241C + .4byte PokemonTower_4F_MapScripts @ 0x81633EC .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 164 diff --git a/data/maps/PokemonTower_5F/header.inc b/data/maps/PokemonTower_5F/header.inc index d5328464b..f2e38b1b6 100644 --- a/data/maps/PokemonTower_5F/header.inc +++ b/data/maps/PokemonTower_5F/header.inc @@ -1,7 +1,7 @@ PokemonTower_5F:: @ 834FC24 .4byte PokemonTower_5F_Layout @ 0x8317784 - .4byte gMapEvents_PokemonTower_5F @ 0x83B2604 - .4byte gMapScripts_PokemonTower_5F @ 0x8163432 + .4byte PokemonTower_5F_MapEvents @ 0x83B2604 + .4byte PokemonTower_5F_MapScripts @ 0x8163432 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 165 diff --git a/data/maps/PokemonTower_6F/header.inc b/data/maps/PokemonTower_6F/header.inc index 4f928c92d..6bafef55e 100644 --- a/data/maps/PokemonTower_6F/header.inc +++ b/data/maps/PokemonTower_6F/header.inc @@ -1,7 +1,7 @@ PokemonTower_6F:: @ 834FC40 .4byte PokemonTower_6F_Layout @ 0x8317B68 - .4byte gMapEvents_PokemonTower_6F @ 0x83B26C0 - .4byte gMapScripts_PokemonTower_6F @ 0x81634B7 + .4byte PokemonTower_6F_MapEvents @ 0x83B26C0 + .4byte PokemonTower_6F_MapScripts @ 0x81634B7 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 166 diff --git a/data/maps/PokemonTower_7F/header.inc b/data/maps/PokemonTower_7F/header.inc index ada7b480e..4125a4d9f 100644 --- a/data/maps/PokemonTower_7F/header.inc +++ b/data/maps/PokemonTower_7F/header.inc @@ -1,7 +1,7 @@ PokemonTower_7F:: @ 834FC5C .4byte PokemonTower_7F_Layout @ 0x8317F4C - .4byte gMapEvents_PokemonTower_7F @ 0x83B2748 - .4byte gMapScripts_PokemonTower_7F @ 0x8163559 + .4byte PokemonTower_7F_MapEvents @ 0x83B2748 + .4byte PokemonTower_7F_MapScripts @ 0x8163559 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 167 diff --git a/data/maps/PowerPlant/header.inc b/data/maps/PowerPlant/header.inc index 2062f30c3..530e24a98 100644 --- a/data/maps/PowerPlant/header.inc +++ b/data/maps/PowerPlant/header.inc @@ -1,7 +1,7 @@ PowerPlant:: @ 834FC78 .4byte PowerPlant_Layout @ 0x8318EC0 - .4byte gMapEvents_PowerPlant @ 0x83B285C - .4byte gMapScripts_PowerPlant @ 0x8163764 + .4byte PowerPlant_MapEvents @ 0x83B285C + .4byte PowerPlant_MapScripts @ 0x8163764 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 168 diff --git a/data/maps/RockTunnel_1F/header.inc b/data/maps/RockTunnel_1F/header.inc index 21bd063fd..5a9e6fac6 100644 --- a/data/maps/RockTunnel_1F/header.inc +++ b/data/maps/RockTunnel_1F/header.inc @@ -1,7 +1,7 @@ RockTunnel_1F:: @ 834FAF0 .4byte RockTunnel_1F_Layout @ 0x83130E4 - .4byte gMapEvents_RockTunnel_1F @ 0x83B1B2C - .4byte gMapScripts_RockTunnel_1F @ 0x8162DD6 + .4byte RockTunnel_1F_MapEvents @ 0x83B1B2C + .4byte RockTunnel_1F_MapScripts @ 0x8162DD6 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 154 diff --git a/data/maps/RockTunnel_B1F/header.inc b/data/maps/RockTunnel_B1F/header.inc index 9b6e260e9..7ee412e7b 100644 --- a/data/maps/RockTunnel_B1F/header.inc +++ b/data/maps/RockTunnel_B1F/header.inc @@ -1,7 +1,7 @@ RockTunnel_B1F:: @ 834FB0C .4byte RockTunnel_B1F_Layout @ 0x8314008 - .4byte gMapEvents_RockTunnel_B1F @ 0x83B1DD0 - .4byte gMapScripts_RockTunnel_B1F @ 0x8162E8A + .4byte RockTunnel_B1F_MapEvents @ 0x83B1DD0 + .4byte RockTunnel_B1F_MapScripts @ 0x8162E8A .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 155 diff --git a/data/maps/RocketHideout_B1F/header.inc b/data/maps/RocketHideout_B1F/header.inc index 0cba66e5d..76da1d708 100644 --- a/data/maps/RocketHideout_B1F/header.inc +++ b/data/maps/RocketHideout_B1F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B1F:: @ 834F6AC .4byte RocketHideout_B1F_Layout @ 0x8305C28 - .4byte gMapEvents_RocketHideout_B1F @ 0x83AF9D8 - .4byte gMapScripts_RocketHideout_B1F @ 0x8161195 + .4byte RocketHideout_B1F_MapEvents @ 0x83AF9D8 + .4byte RocketHideout_B1F_MapScripts @ 0x8161195 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 128 diff --git a/data/maps/RocketHideout_B2F/header.inc b/data/maps/RocketHideout_B2F/header.inc index 516adc9a2..6f3624422 100644 --- a/data/maps/RocketHideout_B2F/header.inc +++ b/data/maps/RocketHideout_B2F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B2F:: @ 834F6C8 .4byte RocketHideout_B2F_Layout @ 0x83061CC - .4byte gMapEvents_RocketHideout_B2F @ 0x83AFA8C - .4byte gMapScripts_RocketHideout_B2F @ 0x81612A1 + .4byte RocketHideout_B2F_MapEvents @ 0x83AFA8C + .4byte RocketHideout_B2F_MapScripts @ 0x81612A1 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 129 diff --git a/data/maps/RocketHideout_B3F/header.inc b/data/maps/RocketHideout_B3F/header.inc index 2a639bda8..82aff9271 100644 --- a/data/maps/RocketHideout_B3F/header.inc +++ b/data/maps/RocketHideout_B3F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B3F:: @ 834F6E4 .4byte RocketHideout_B3F_Layout @ 0x8306694 - .4byte gMapEvents_RocketHideout_B3F @ 0x83AFB34 - .4byte gMapScripts_RocketHideout_B3F @ 0x81612B9 + .4byte RocketHideout_B3F_MapEvents @ 0x83AFB34 + .4byte RocketHideout_B3F_MapScripts @ 0x81612B9 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 130 diff --git a/data/maps/RocketHideout_B4F/header.inc b/data/maps/RocketHideout_B4F/header.inc index 0cf775f5a..1d37c165d 100644 --- a/data/maps/RocketHideout_B4F/header.inc +++ b/data/maps/RocketHideout_B4F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B4F:: @ 834F700 .4byte RocketHideout_B4F_Layout @ 0x8306B98 - .4byte gMapEvents_RocketHideout_B4F @ 0x83AFC50 - .4byte gMapScripts_RocketHideout_B4F @ 0x81612E8 + .4byte RocketHideout_B4F_MapEvents @ 0x83AFC50 + .4byte RocketHideout_B4F_MapScripts @ 0x81612E8 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 131 diff --git a/data/maps/RocketHideout_Elevator/header.inc b/data/maps/RocketHideout_Elevator/header.inc index 70c8c2a22..321b9829d 100644 --- a/data/maps/RocketHideout_Elevator/header.inc +++ b/data/maps/RocketHideout_Elevator/header.inc @@ -1,7 +1,7 @@ RocketHideout_Elevator:: @ 834F71C .4byte RocketHideout_Elevator_Layout @ 0x8320EDC - .4byte gMapEvents_RocketHideout_Elevator @ 0x83AFC80 - .4byte gMapScripts_RocketHideout_Elevator @ 0x81614D8 + .4byte RocketHideout_Elevator_MapEvents @ 0x83AFC80 + .4byte RocketHideout_Elevator_MapScripts @ 0x81614D8 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 225 diff --git a/data/maps/Route1/header.inc b/data/maps/Route1/header.inc index 6f2a76447..900563a23 100644 --- a/data/maps/Route1/header.inc +++ b/data/maps/Route1/header.inc @@ -1,7 +1,7 @@ Route1:: @ 835082C .4byte Route1_Layout @ 0x82E55CC - .4byte gMapEvents_Route1 @ 0x83B6648 - .4byte gMapScripts_Route1 @ 0x8167EFD + .4byte Route1_MapEvents @ 0x83B6648 + .4byte Route1_MapScripts @ 0x8167EFD .4byte Route1_MapConnections @ 0x83529F4 .2byte BGM_FRLG_ROUTE_1 .2byte 89 diff --git a/data/maps/Route10/header.inc b/data/maps/Route10/header.inc index 8c8dc7244..3557919fb 100644 --- a/data/maps/Route10/header.inc +++ b/data/maps/Route10/header.inc @@ -1,7 +1,7 @@ Route10:: @ 8350928 .4byte Route10_Layout @ 0x82EC3D0 - .4byte gMapEvents_Route10 @ 0x83B6FA0 - .4byte gMapScripts_Route10 @ 0x8167FD9 + .4byte Route10_MapEvents @ 0x83B6FA0 + .4byte Route10_MapScripts @ 0x8167FD9 .4byte Route10_MapConnections @ 0x8352B14 .2byte BGM_FRLG_ROUTE_3 .2byte 98 diff --git a/data/maps/Route10_PokemonCenter_1F/header.inc b/data/maps/Route10_PokemonCenter_1F/header.inc index 3e965c250..2f7bd05cc 100644 --- a/data/maps/Route10_PokemonCenter_1F/header.inc +++ b/data/maps/Route10_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ Route10_PokemonCenter_1F:: @ 83518B0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route10_PokemonCenter_1F @ 0x83BD8FC - .4byte gMapScripts_Route10_PokemonCenter_1F @ 0x816FC2F + .4byte Route10_PokemonCenter_1F_MapEvents @ 0x83BD8FC + .4byte Route10_PokemonCenter_1F_MapScripts @ 0x816FC2F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/Route10_PokemonCenter_2F/header.inc b/data/maps/Route10_PokemonCenter_2F/header.inc index 9502d74d9..5ed083920 100644 --- a/data/maps/Route10_PokemonCenter_2F/header.inc +++ b/data/maps/Route10_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ Route10_PokemonCenter_2F:: @ 83518CC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route10_PokemonCenter_2F @ 0x83BD988 - .4byte gMapScripts_Route10_PokemonCenter_2F @ 0x816FCFA + .4byte Route10_PokemonCenter_2F_MapEvents @ 0x83BD988 + .4byte Route10_PokemonCenter_2F_MapScripts @ 0x816FCFA .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/Route11/header.inc b/data/maps/Route11/header.inc index 93550fb3c..92ea71fdb 100644 --- a/data/maps/Route11/header.inc +++ b/data/maps/Route11/header.inc @@ -1,7 +1,7 @@ Route11:: @ 8350944 .4byte Route11_Layout @ 0x82ECF34 - .4byte gMapEvents_Route11 @ 0x83B711C - .4byte gMapScripts_Route11 @ 0x8167FF6 + .4byte Route11_MapEvents @ 0x83B711C + .4byte Route11_MapScripts @ 0x8167FF6 .4byte Route11_MapConnections @ 0x8352B34 .2byte BGM_FRLG_ROUTE_11 .2byte 99 diff --git a/data/maps/Route11_EastEntrance_1F/header.inc b/data/maps/Route11_EastEntrance_1F/header.inc index d8f7762e3..8c54bc523 100644 --- a/data/maps/Route11_EastEntrance_1F/header.inc +++ b/data/maps/Route11_EastEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route11_EastEntrance_1F:: @ 83518E8 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route11_EastEntrance_1F @ 0x83BD9F4 - .4byte gMapScripts_Route11_EastEntrance_1F @ 0x816FD21 + .4byte Route11_EastEntrance_1F_MapEvents @ 0x83BD9F4 + .4byte Route11_EastEntrance_1F_MapScripts @ 0x816FD21 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 224 diff --git a/data/maps/Route11_EastEntrance_2F/header.inc b/data/maps/Route11_EastEntrance_2F/header.inc index 964580122..4b3611c21 100644 --- a/data/maps/Route11_EastEntrance_2F/header.inc +++ b/data/maps/Route11_EastEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route11_EastEntrance_2F:: @ 8351904 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route11_EastEntrance_2F @ 0x83BDA58 - .4byte gMapScripts_Route11_EastEntrance_2F @ 0x816FD34 + .4byte Route11_EastEntrance_2F_MapEvents @ 0x83BDA58 + .4byte Route11_EastEntrance_2F_MapScripts @ 0x816FD34 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 220 diff --git a/data/maps/Route12/header.inc b/data/maps/Route12/header.inc index 89963d62a..882794915 100644 --- a/data/maps/Route12/header.inc +++ b/data/maps/Route12/header.inc @@ -1,7 +1,7 @@ Route12:: @ 8350960 .4byte Route12_Layout @ 0x82EE5D8 - .4byte gMapEvents_Route12 @ 0x83B72DC - .4byte gMapScripts_Route12 @ 0x8168000 + .4byte Route12_MapEvents @ 0x83B72DC + .4byte Route12_MapScripts @ 0x8168000 .4byte Route12_MapConnections @ 0x8352B60 .2byte BGM_FRLG_ROUTE_11 .2byte 100 diff --git a/data/maps/Route12_FishingHouse/header.inc b/data/maps/Route12_FishingHouse/header.inc index a7c27f49d..31fa7f94d 100644 --- a/data/maps/Route12_FishingHouse/header.inc +++ b/data/maps/Route12_FishingHouse/header.inc @@ -1,7 +1,7 @@ Route12_FishingHouse:: @ 8351958 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_Route12_FishingHouse @ 0x83BDB48 - .4byte gMapScripts_Route12_FishingHouse @ 0x816FF0B + .4byte Route12_FishingHouse_MapEvents @ 0x83BDB48 + .4byte Route12_FishingHouse_MapScripts @ 0x816FF0B .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 13 diff --git a/data/maps/Route12_NorthEntrance_1F/header.inc b/data/maps/Route12_NorthEntrance_1F/header.inc index f3a501887..60a2f30e5 100644 --- a/data/maps/Route12_NorthEntrance_1F/header.inc +++ b/data/maps/Route12_NorthEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route12_NorthEntrance_1F:: @ 8351920 .4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0 - .4byte gMapEvents_Route12_NorthEntrance_1F @ 0x83BDAAC - .4byte gMapScripts_Route12_NorthEntrance_1F @ 0x816FE6D + .4byte Route12_NorthEntrance_1F_MapEvents @ 0x83BDAAC + .4byte Route12_NorthEntrance_1F_MapScripts @ 0x816FE6D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 176 diff --git a/data/maps/Route12_NorthEntrance_2F/header.inc b/data/maps/Route12_NorthEntrance_2F/header.inc index deb9655e1..00a195bd2 100644 --- a/data/maps/Route12_NorthEntrance_2F/header.inc +++ b/data/maps/Route12_NorthEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route12_NorthEntrance_2F:: @ 835193C .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route12_NorthEntrance_2F @ 0x83BDAF8 - .4byte gMapScripts_Route12_NorthEntrance_2F @ 0x816FE77 + .4byte Route12_NorthEntrance_2F_MapEvents @ 0x83BDAF8 + .4byte Route12_NorthEntrance_2F_MapScripts @ 0x816FE77 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route13/header.inc b/data/maps/Route13/header.inc index 2f98d6d15..854f41328 100644 --- a/data/maps/Route13/header.inc +++ b/data/maps/Route13/header.inc @@ -1,7 +1,7 @@ Route13:: @ 835097C .4byte Route13_Layout @ 0x82EF13C - .4byte gMapEvents_Route13 @ 0x83B7428 - .4byte gMapScripts_Route13 @ 0x81680B5 + .4byte Route13_MapEvents @ 0x83B7428 + .4byte Route13_MapScripts @ 0x81680B5 .4byte Route13_MapConnections @ 0x8352B80 .2byte BGM_FRLG_ROUTE_11 .2byte 101 diff --git a/data/maps/Route14/header.inc b/data/maps/Route14/header.inc index 5fe549443..4dc8ad571 100644 --- a/data/maps/Route14/header.inc +++ b/data/maps/Route14/header.inc @@ -1,7 +1,7 @@ Route14:: @ 8350998 .4byte Route14_Layout @ 0x82EFCA0 - .4byte gMapEvents_Route14 @ 0x83B75C8 - .4byte gMapScripts_Route14 @ 0x81680D1 + .4byte Route14_MapEvents @ 0x83B75C8 + .4byte Route14_MapScripts @ 0x81680D1 .4byte Route14_MapConnections @ 0x8352BA0 .2byte BGM_FRLG_ROUTE_11 .2byte 102 diff --git a/data/maps/Route15/header.inc b/data/maps/Route15/header.inc index 12dc0221c..c1fc1f9cd 100644 --- a/data/maps/Route15/header.inc +++ b/data/maps/Route15/header.inc @@ -1,7 +1,7 @@ Route15:: @ 83509B4 .4byte Route15_Layout @ 0x82F0804 - .4byte gMapEvents_Route15 @ 0x83B7748 - .4byte gMapScripts_Route15 @ 0x81680DB + .4byte Route15_MapEvents @ 0x83B7748 + .4byte Route15_MapScripts @ 0x81680DB .4byte Route15_MapConnections @ 0x8352BC0 .2byte BGM_FRLG_ROUTE_11 .2byte 103 diff --git a/data/maps/Route15_WestEntrance_1F/header.inc b/data/maps/Route15_WestEntrance_1F/header.inc index 9c8348b58..7e3573609 100644 --- a/data/maps/Route15_WestEntrance_1F/header.inc +++ b/data/maps/Route15_WestEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route15_WestEntrance_1F:: @ 8351974 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route15_WestEntrance_1F @ 0x83BDB9C - .4byte gMapScripts_Route15_WestEntrance_1F @ 0x8170088 + .4byte Route15_WestEntrance_1F_MapEvents @ 0x83BDB9C + .4byte Route15_WestEntrance_1F_MapScripts @ 0x8170088 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 224 diff --git a/data/maps/Route15_WestEntrance_2F/header.inc b/data/maps/Route15_WestEntrance_2F/header.inc index 3be6a3320..7bd72a5b8 100644 --- a/data/maps/Route15_WestEntrance_2F/header.inc +++ b/data/maps/Route15_WestEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route15_WestEntrance_2F:: @ 8351990 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route15_WestEntrance_2F @ 0x83BDBE8 - .4byte gMapScripts_Route15_WestEntrance_2F @ 0x8170092 + .4byte Route15_WestEntrance_2F_MapEvents @ 0x83BDBE8 + .4byte Route15_WestEntrance_2F_MapScripts @ 0x8170092 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route16/header.inc b/data/maps/Route16/header.inc index 8b6cd97fe..71785a7a5 100644 --- a/data/maps/Route16/header.inc +++ b/data/maps/Route16/header.inc @@ -1,7 +1,7 @@ Route16:: @ 83509D0 .4byte Route16_Layout @ 0x82F0FA8 - .4byte gMapEvents_Route16 @ 0x83B7898 - .4byte gMapScripts_Route16 @ 0x81680E5 + .4byte Route16_MapEvents @ 0x83B7898 + .4byte Route16_MapScripts @ 0x81680E5 .4byte Route16_MapConnections @ 0x8352BE0 .2byte BGM_FRLG_ROUTE_3 .2byte 104 diff --git a/data/maps/Route16_House/header.inc b/data/maps/Route16_House/header.inc index 473deb93f..3fd158b04 100644 --- a/data/maps/Route16_House/header.inc +++ b/data/maps/Route16_House/header.inc @@ -1,7 +1,7 @@ Route16_House:: @ 83519AC .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_Route16_House @ 0x83BDC44 - .4byte gMapScripts_Route16_House @ 0x817014E + .4byte Route16_House_MapEvents @ 0x83BDC44 + .4byte Route16_House_MapScripts @ 0x817014E .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 6 diff --git a/data/maps/Route16_NorthEntrance_1F/header.inc b/data/maps/Route16_NorthEntrance_1F/header.inc index b0f6c815b..fffac64b8 100644 --- a/data/maps/Route16_NorthEntrance_1F/header.inc +++ b/data/maps/Route16_NorthEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route16_NorthEntrance_1F:: @ 83519C8 .4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14 - .4byte gMapEvents_Route16_NorthEntrance_1F @ 0x83BDD60 - .4byte gMapScripts_Route16_NorthEntrance_1F @ 0x81701C2 + .4byte Route16_NorthEntrance_1F_MapEvents @ 0x83BDD60 + .4byte Route16_NorthEntrance_1F_MapScripts @ 0x81701C2 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 223 diff --git a/data/maps/Route16_NorthEntrance_2F/header.inc b/data/maps/Route16_NorthEntrance_2F/header.inc index 91998b7ce..ea494e816 100644 --- a/data/maps/Route16_NorthEntrance_2F/header.inc +++ b/data/maps/Route16_NorthEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route16_NorthEntrance_2F:: @ 83519E4 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route16_NorthEntrance_2F @ 0x83BDDDC - .4byte gMapScripts_Route16_NorthEntrance_2F @ 0x81702BE + .4byte Route16_NorthEntrance_2F_MapEvents @ 0x83BDDDC + .4byte Route16_NorthEntrance_2F_MapScripts @ 0x81702BE .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route17/header.inc b/data/maps/Route17/header.inc index 1794580a8..ae76e440e 100644 --- a/data/maps/Route17/header.inc +++ b/data/maps/Route17/header.inc @@ -1,7 +1,7 @@ Route17:: @ 83509EC .4byte Route17_Layout @ 0x82F2DCC - .4byte gMapEvents_Route17 @ 0x83B7A20 - .4byte gMapScripts_Route17 @ 0x81681BF + .4byte Route17_MapEvents @ 0x83B7A20 + .4byte Route17_MapScripts @ 0x81681BF .4byte Route17_MapConnections @ 0x8352C00 .2byte BGM_FRLG_ROUTE_3 .2byte 105 diff --git a/data/maps/Route18/header.inc b/data/maps/Route18/header.inc index 9ca9d432b..b4861fdf1 100644 --- a/data/maps/Route18/header.inc +++ b/data/maps/Route18/header.inc @@ -1,7 +1,7 @@ Route18:: @ 8350A08 .4byte Route18_Layout @ 0x82F3750 - .4byte gMapEvents_Route18 @ 0x83B7AA4 - .4byte gMapScripts_Route18 @ 0x81681F6 + .4byte Route18_MapEvents @ 0x83B7AA4 + .4byte Route18_MapScripts @ 0x81681F6 .4byte Route18_MapConnections @ 0x8352C20 .2byte BGM_FRLG_ROUTE_3 .2byte 106 diff --git a/data/maps/Route18_EastEntrance_1F/header.inc b/data/maps/Route18_EastEntrance_1F/header.inc index 74e8f827f..87cf71cf7 100644 --- a/data/maps/Route18_EastEntrance_1F/header.inc +++ b/data/maps/Route18_EastEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route18_EastEntrance_1F:: @ 8351A00 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route18_EastEntrance_1F @ 0x83BDED0 - .4byte gMapScripts_Route18_EastEntrance_1F @ 0x8170378 + .4byte Route18_EastEntrance_1F_MapEvents @ 0x83BDED0 + .4byte Route18_EastEntrance_1F_MapScripts @ 0x8170378 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 224 diff --git a/data/maps/Route18_EastEntrance_2F/header.inc b/data/maps/Route18_EastEntrance_2F/header.inc index ff41bf2da..56ed2a2a9 100644 --- a/data/maps/Route18_EastEntrance_2F/header.inc +++ b/data/maps/Route18_EastEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route18_EastEntrance_2F:: @ 8351A1C .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route18_EastEntrance_2F @ 0x83BDF1C - .4byte gMapScripts_Route18_EastEntrance_2F @ 0x817046B + .4byte Route18_EastEntrance_2F_MapEvents @ 0x83BDF1C + .4byte Route18_EastEntrance_2F_MapScripts @ 0x817046B .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route19/header.inc b/data/maps/Route19/header.inc index 6be186f94..a141f1f92 100644 --- a/data/maps/Route19/header.inc +++ b/data/maps/Route19/header.inc @@ -1,7 +1,7 @@ Route19:: @ 8350A24 .4byte Route19_Layout @ 0x82F42B4 - .4byte gMapEvents_Route19 @ 0x83B7BE4 - .4byte gMapScripts_Route19 @ 0x8168231 + .4byte Route19_MapEvents @ 0x83B7BE4 + .4byte Route19_MapScripts @ 0x8168231 .4byte Route19_MapConnections @ 0x8352C40 .2byte BGM_FRLG_ROUTE_3 .2byte 107 diff --git a/data/maps/Route2/header.inc b/data/maps/Route2/header.inc index 2d892eab9..985fe6d72 100644 --- a/data/maps/Route2/header.inc +++ b/data/maps/Route2/header.inc @@ -1,7 +1,7 @@ Route2:: @ 8350848 .4byte Route2_Layout @ 0x82E64F0 - .4byte gMapEvents_Route2 @ 0x83B676C - .4byte gMapScripts_Route2 @ 0x8167F64 + .4byte Route2_MapEvents @ 0x83B676C + .4byte Route2_MapScripts @ 0x8167F64 .4byte Route2_MapConnections @ 0x8352A14 .2byte BGM_FRLG_ROUTE_1 .2byte 90 diff --git a/data/maps/Route20/header.inc b/data/maps/Route20/header.inc index a4b1a19bc..1b832f0cd 100644 --- a/data/maps/Route20/header.inc +++ b/data/maps/Route20/header.inc @@ -1,7 +1,7 @@ Route20:: @ 8350A40 .4byte Route20_Layout @ 0x82F5598 - .4byte gMapEvents_Route20 @ 0x83B7D34 - .4byte gMapScripts_Route20 @ 0x816823B + .4byte Route20_MapEvents @ 0x83B7D34 + .4byte Route20_MapScripts @ 0x816823B .4byte Route20_MapConnections @ 0x8352C60 .2byte BGM_FRLG_ROUTE_3 .2byte 108 diff --git a/data/maps/Route21_North/header.inc b/data/maps/Route21_North/header.inc index 728a8f92c..cf0397e8a 100644 --- a/data/maps/Route21_North/header.inc +++ b/data/maps/Route21_North/header.inc @@ -1,7 +1,7 @@ Route21_North:: @ 8350A5C .4byte Route21_North_Layout @ 0x82F5F1C - .4byte gMapEvents_Route21_North @ 0x83B7DE4 - .4byte gMapScripts_Route21_North @ 0x8168289 + .4byte Route21_North_MapEvents @ 0x83B7DE4 + .4byte Route21_North_MapScripts @ 0x8168289 .4byte Route21_North_MapConnections @ 0x8352C80 .2byte BGM_FRLG_ROUTE_3 .2byte 109 diff --git a/data/maps/Route21_South/header.inc b/data/maps/Route21_South/header.inc index c2dd83782..b81f0ec6a 100644 --- a/data/maps/Route21_South/header.inc +++ b/data/maps/Route21_South/header.inc @@ -1,7 +1,7 @@ Route21_South:: @ 8350A78 .4byte Route21_South_Layout @ 0x83206C0 - .4byte gMapEvents_Route21_South @ 0x83B7E70 - .4byte gMapScripts_Route21_South @ 0x816828A + .4byte Route21_South_MapEvents @ 0x83B7E70 + .4byte Route21_South_MapScripts @ 0x816828A .4byte Route21_South_MapConnections @ 0x8352CA0 .2byte BGM_FRLG_ROUTE_3 .2byte 219 diff --git a/data/maps/Route22/header.inc b/data/maps/Route22/header.inc index c24992f76..70942583f 100644 --- a/data/maps/Route22/header.inc +++ b/data/maps/Route22/header.inc @@ -1,7 +1,7 @@ Route22:: @ 8350A94 .4byte Route22_Layout @ 0x82F6840 - .4byte gMapEvents_Route22 @ 0x83B7F18 - .4byte gMapScripts_Route22 @ 0x816828B + .4byte Route22_MapEvents @ 0x83B7F18 + .4byte Route22_MapScripts @ 0x816828B .4byte Route22_MapConnections @ 0x8352CC0 .2byte BGM_FRLG_ROUTE_3 .2byte 110 diff --git a/data/maps/Route22_NorthEntrance/header.inc b/data/maps/Route22_NorthEntrance/header.inc index 8daef5317..3f7b86142 100644 --- a/data/maps/Route22_NorthEntrance/header.inc +++ b/data/maps/Route22_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route22_NorthEntrance:: @ 8351A54 .4byte Route22_NorthEntrance_Layout @ 0x8320B1C - .4byte gMapEvents_Route22_NorthEntrance @ 0x83BDF8C - .4byte gMapScripts_Route22_NorthEntrance @ 0x81704FB + .4byte Route22_NorthEntrance_MapEvents @ 0x83BDF8C + .4byte Route22_NorthEntrance_MapScripts @ 0x81704FB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 222 diff --git a/data/maps/Route23/header.inc b/data/maps/Route23/header.inc index 3fc71fc59..2a6fa4b27 100644 --- a/data/maps/Route23/header.inc +++ b/data/maps/Route23/header.inc @@ -1,7 +1,7 @@ Route23:: @ 8350AB0 .4byte Route23_Layout @ 0x82F8664 - .4byte gMapEvents_Route23 @ 0x83B8300 - .4byte gMapScripts_Route23 @ 0x81684EB + .4byte Route23_MapEvents @ 0x83B8300 + .4byte Route23_MapScripts @ 0x81684EB .4byte Route23_MapConnections @ 0x8352CE0 .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 111 diff --git a/data/maps/Route24/header.inc b/data/maps/Route24/header.inc index 32b644009..298826eef 100644 --- a/data/maps/Route24/header.inc +++ b/data/maps/Route24/header.inc @@ -1,7 +1,7 @@ Route24:: @ 8350ACC .4byte Route24_Layout @ 0x82F8E08 - .4byte gMapEvents_Route24 @ 0x83B8400 - .4byte gMapScripts_Route24 @ 0x816861F + .4byte Route24_MapEvents @ 0x83B8400 + .4byte Route24_MapScripts @ 0x816861F .4byte Route24_MapConnections @ 0x8352D00 .2byte BGM_FRLG_ROUTE_24 .2byte 112 diff --git a/data/maps/Route25/header.inc b/data/maps/Route25/header.inc index 38df8e11d..f4525d40e 100644 --- a/data/maps/Route25/header.inc +++ b/data/maps/Route25/header.inc @@ -1,7 +1,7 @@ Route25:: @ 8350AE8 .4byte Route25_Layout @ 0x82F996C - .4byte gMapEvents_Route25 @ 0x83B8590 - .4byte gMapScripts_Route25 @ 0x8168745 + .4byte Route25_MapEvents @ 0x83B8590 + .4byte Route25_MapScripts @ 0x8168745 .4byte Route25_MapConnections @ 0x8352D14 .2byte BGM_FRLG_ROUTE_24 .2byte 113 diff --git a/data/maps/Route25_SeaCottage/header.inc b/data/maps/Route25_SeaCottage/header.inc index 9108278b2..268e6e59c 100644 --- a/data/maps/Route25_SeaCottage/header.inc +++ b/data/maps/Route25_SeaCottage/header.inc @@ -1,7 +1,7 @@ Route25_SeaCottage:: @ 8351A8C .4byte Route25_SeaCottage_Layout @ 0x8319030 - .4byte gMapEvents_Route25_SeaCottage @ 0x83BE008 - .4byte gMapScripts_Route25_SeaCottage @ 0x8170523 + .4byte Route25_SeaCottage_MapEvents @ 0x83BE008 + .4byte Route25_SeaCottage_MapScripts @ 0x8170523 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 169 diff --git a/data/maps/Route2_EastBuilding/header.inc b/data/maps/Route2_EastBuilding/header.inc index d6ffe1e28..02b30b483 100644 --- a/data/maps/Route2_EastBuilding/header.inc +++ b/data/maps/Route2_EastBuilding/header.inc @@ -1,7 +1,7 @@ Route2_EastBuilding:: @ 8351798 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_EastBuilding @ 0x83BD43C - .4byte gMapScripts_Route2_EastBuilding @ 0x816F67E + .4byte Route2_EastBuilding_MapEvents @ 0x83BD43C + .4byte Route2_EastBuilding_MapScripts @ 0x816F67E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route2_House/header.inc b/data/maps/Route2_House/header.inc index d59cf73bc..c04a3439c 100644 --- a/data/maps/Route2_House/header.inc +++ b/data/maps/Route2_House/header.inc @@ -1,7 +1,7 @@ Route2_House:: @ 835177C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_Route2_House @ 0x83BD3D8 - .4byte gMapScripts_Route2_House @ 0x816F5F8 + .4byte Route2_House_MapEvents @ 0x83BD3D8 + .4byte Route2_House_MapScripts @ 0x816F5F8 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc index 003e21340..c460e0cca 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route2_ViridianForest_NorthEntrance:: @ 83517B4 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_ViridianForest_NorthEntrance @ 0x83BD4B8 - .4byte gMapScripts_Route2_ViridianForest_NorthEntrance @ 0x816F71D + .4byte Route2_ViridianForest_NorthEntrance_MapEvents @ 0x83BD4B8 + .4byte Route2_ViridianForest_NorthEntrance_MapScripts @ 0x816F71D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc index 133c6a43c..936b17158 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc @@ -1,7 +1,7 @@ Route2_ViridianForest_SouthEntrance:: @ 8351760 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_ViridianForest_SouthEntrance @ 0x83BD37C - .4byte gMapScripts_Route2_ViridianForest_SouthEntrance @ 0x816F5E5 + .4byte Route2_ViridianForest_SouthEntrance_MapEvents @ 0x83BD37C + .4byte Route2_ViridianForest_SouthEntrance_MapScripts @ 0x816F5E5 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route3/header.inc b/data/maps/Route3/header.inc index 8c33a7801..ae86378c2 100644 --- a/data/maps/Route3/header.inc +++ b/data/maps/Route3/header.inc @@ -1,7 +1,7 @@ Route3:: @ 8350864 .4byte Route3_Layout @ 0x82E7234 - .4byte gMapEvents_Route3 @ 0x83B6870 - .4byte gMapScripts_Route3 @ 0x8167F77 + .4byte Route3_MapEvents @ 0x83B6870 + .4byte Route3_MapScripts @ 0x8167F77 .4byte Route3_MapConnections @ 0x8352A34 .2byte BGM_FRLG_ROUTE_3 .2byte 91 diff --git a/data/maps/Route4/header.inc b/data/maps/Route4/header.inc index ed68203b1..7156cf616 100644 --- a/data/maps/Route4/header.inc +++ b/data/maps/Route4/header.inc @@ -1,7 +1,7 @@ Route4:: @ 8350880 .4byte Route4_Layout @ 0x82E8338 - .4byte gMapEvents_Route4 @ 0x83B6980 - .4byte gMapScripts_Route4 @ 0x8167F8A + .4byte Route4_MapEvents @ 0x83B6980 + .4byte Route4_MapScripts @ 0x8167F8A .4byte Route4_MapConnections @ 0x8352A54 .2byte BGM_FRLG_ROUTE_3 .2byte 92 diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc index f48c8935e..fc36624b4 100644 --- a/data/maps/Route4_PokemonCenter_1F/header.inc +++ b/data/maps/Route4_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ Route4_PokemonCenter_1F:: @ 83517D0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C - .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 + .4byte Route4_PokemonCenter_1F_MapEvents @ 0x83BD57C + .4byte Route4_PokemonCenter_1F_MapScripts @ 0x816F739 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/Route4_PokemonCenter_2F/header.inc b/data/maps/Route4_PokemonCenter_2F/header.inc index 8ae29faa7..eb9d2796d 100644 --- a/data/maps/Route4_PokemonCenter_2F/header.inc +++ b/data/maps/Route4_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ Route4_PokemonCenter_2F:: @ 83517EC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 - .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 + .4byte Route4_PokemonCenter_2F_MapEvents @ 0x83BD608 + .4byte Route4_PokemonCenter_2F_MapScripts @ 0x816F8D8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/Route5/header.inc b/data/maps/Route5/header.inc index e688654a4..7092ca60b 100644 --- a/data/maps/Route5/header.inc +++ b/data/maps/Route5/header.inc @@ -1,7 +1,7 @@ Route5:: @ 835089C .4byte Route5_Layout @ 0x82E925C - .4byte gMapEvents_Route5 @ 0x83B69C0 - .4byte gMapScripts_Route5 @ 0x8167FA7 + .4byte Route5_MapEvents @ 0x83B69C0 + .4byte Route5_MapScripts @ 0x8167FA7 .4byte Route5_MapConnections @ 0x8352A74 .2byte BGM_FRLG_ROUTE_3 .2byte 93 diff --git a/data/maps/Route5_PokemonDayCare/header.inc b/data/maps/Route5_PokemonDayCare/header.inc index 5d2affab9..3fef23ccb 100644 --- a/data/maps/Route5_PokemonDayCare/header.inc +++ b/data/maps/Route5_PokemonDayCare/header.inc @@ -1,7 +1,7 @@ Route5_PokemonDayCare:: @ 8351808 .4byte Route5_PokemonDayCare_Layout @ 0x833ADC0 - .4byte gMapEvents_Route5_PokemonDayCare @ 0x83BD64C - .4byte gMapScripts_Route5_PokemonDayCare @ 0x816F8FF + .4byte Route5_PokemonDayCare_MapEvents @ 0x83BD64C + .4byte Route5_PokemonDayCare_MapScripts @ 0x816F8FF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 275 diff --git a/data/maps/Route5_SouthEntrance/header.inc b/data/maps/Route5_SouthEntrance/header.inc index 4617ef84b..c918b3b50 100644 --- a/data/maps/Route5_SouthEntrance/header.inc +++ b/data/maps/Route5_SouthEntrance/header.inc @@ -1,7 +1,7 @@ Route5_SouthEntrance:: @ 8351824 .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte gMapEvents_Route5_SouthEntrance @ 0x83BD6C8 - .4byte gMapScripts_Route5_SouthEntrance @ 0x816F900 + .4byte Route5_SouthEntrance_MapEvents @ 0x83BD6C8 + .4byte Route5_SouthEntrance_MapScripts @ 0x816F900 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 208 diff --git a/data/maps/Route6/header.inc b/data/maps/Route6/header.inc index 5d29ba552..8e2668411 100644 --- a/data/maps/Route6/header.inc +++ b/data/maps/Route6/header.inc @@ -1,7 +1,7 @@ Route6:: @ 83508B8 .4byte Route6_Layout @ 0x82E9A00 - .4byte gMapEvents_Route6 @ 0x83B6AA0 - .4byte gMapScripts_Route6 @ 0x8167FB1 + .4byte Route6_MapEvents @ 0x83B6AA0 + .4byte Route6_MapScripts @ 0x8167FB1 .4byte Route6_MapConnections @ 0x8352A94 .2byte BGM_FRLG_ROUTE_3 .2byte 94 diff --git a/data/maps/Route6_NorthEntrance/header.inc b/data/maps/Route6_NorthEntrance/header.inc index 1127ca878..6ef93a401 100644 --- a/data/maps/Route6_NorthEntrance/header.inc +++ b/data/maps/Route6_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route6_NorthEntrance:: @ 8351840 .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte gMapEvents_Route6_NorthEntrance @ 0x83BD744 - .4byte gMapScripts_Route6_NorthEntrance @ 0x816F9C6 + .4byte Route6_NorthEntrance_MapEvents @ 0x83BD744 + .4byte Route6_NorthEntrance_MapScripts @ 0x816F9C6 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 208 diff --git a/data/maps/Route7/header.inc b/data/maps/Route7/header.inc index 8e7e0472a..b7c432750 100644 --- a/data/maps/Route7/header.inc +++ b/data/maps/Route7/header.inc @@ -1,7 +1,7 @@ Route7:: @ 83508D4 .4byte Route7_Layout @ 0x82E9DE4 - .4byte gMapEvents_Route7 @ 0x83B6AF4 - .4byte gMapScripts_Route7 @ 0x8167FBB + .4byte Route7_MapEvents @ 0x83B6AF4 + .4byte Route7_MapScripts @ 0x8167FBB .4byte Route7_MapConnections @ 0x8352AB4 .2byte BGM_FRLG_ROUTE_3 .2byte 95 diff --git a/data/maps/Route7_EastEntrance/header.inc b/data/maps/Route7_EastEntrance/header.inc index 1a30930fa..6ceaa940e 100644 --- a/data/maps/Route7_EastEntrance/header.inc +++ b/data/maps/Route7_EastEntrance/header.inc @@ -1,7 +1,7 @@ Route7_EastEntrance:: @ 8351878 .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte gMapEvents_Route7_EastEntrance @ 0x83BD7D4 - .4byte gMapScripts_Route7_EastEntrance @ 0x816FA8D + .4byte Route7_EastEntrance_MapEvents @ 0x83BD7D4 + .4byte Route7_EastEntrance_MapScripts @ 0x816FA8D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 209 diff --git a/data/maps/Route8/header.inc b/data/maps/Route8/header.inc index 85bc28400..b4b9bec8d 100644 --- a/data/maps/Route8/header.inc +++ b/data/maps/Route8/header.inc @@ -1,7 +1,7 @@ Route8:: @ 83508F0 .4byte Route8_Layout @ 0x82EA948 - .4byte gMapEvents_Route8 @ 0x83B6CB0 - .4byte gMapScripts_Route8 @ 0x8167FC5 + .4byte Route8_MapEvents @ 0x83B6CB0 + .4byte Route8_MapScripts @ 0x8167FC5 .4byte Route8_MapConnections @ 0x8352AD4 .2byte BGM_FRLG_ROUTE_3 .2byte 96 diff --git a/data/maps/Route8_WestEntrance/header.inc b/data/maps/Route8_WestEntrance/header.inc index 4eb91b5bd..400f52c1c 100644 --- a/data/maps/Route8_WestEntrance/header.inc +++ b/data/maps/Route8_WestEntrance/header.inc @@ -1,7 +1,7 @@ Route8_WestEntrance:: @ 8351894 .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte gMapEvents_Route8_WestEntrance @ 0x83BD850 - .4byte gMapScripts_Route8_WestEntrance @ 0x816FB53 + .4byte Route8_WestEntrance_MapEvents @ 0x83BD850 + .4byte Route8_WestEntrance_MapScripts @ 0x816FB53 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 209 diff --git a/data/maps/Route9/header.inc b/data/maps/Route9/header.inc index 559f56a41..0066c2e2f 100644 --- a/data/maps/Route9/header.inc +++ b/data/maps/Route9/header.inc @@ -1,7 +1,7 @@ Route9:: @ 835090C .4byte Route9_Layout @ 0x82EB4AC - .4byte gMapEvents_Route9 @ 0x83B6E14 - .4byte gMapScripts_Route9 @ 0x8167FCF + .4byte Route9_MapEvents @ 0x83B6E14 + .4byte Route9_MapScripts @ 0x8167FCF .4byte Route9_MapConnections @ 0x8352AF4 .2byte BGM_FRLG_ROUTE_3 .2byte 97 diff --git a/data/maps/SSAnne_1F_Corridor/header.inc b/data/maps/SSAnne_1F_Corridor/header.inc index ee2523774..120c6e9b0 100644 --- a/data/maps/SSAnne_1F_Corridor/header.inc +++ b/data/maps/SSAnne_1F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Corridor:: @ 834F2A0 .4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C - .4byte gMapEvents_SSAnne_1F_Corridor @ 0x83AE974 - .4byte gMapScripts_SSAnne_1F_Corridor @ 0x81608CB + .4byte SSAnne_1F_Corridor_MapEvents @ 0x83AE974 + .4byte SSAnne_1F_Corridor_MapScripts @ 0x81608CB .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 119 diff --git a/data/maps/SSAnne_1F_Room1/header.inc b/data/maps/SSAnne_1F_Room1/header.inc index 1da716524..dfe367802 100644 --- a/data/maps/SSAnne_1F_Room1/header.inc +++ b/data/maps/SSAnne_1F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room1:: @ 834F364 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room1 @ 0x83AECEC - .4byte gMapScripts_SSAnne_1F_Room1 @ 0x8160BDB + .4byte SSAnne_1F_Room1_MapEvents @ 0x83AECEC + .4byte SSAnne_1F_Room1_MapScripts @ 0x8160BDB .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room11/header.inc b/data/maps/SSAnne_1F_Room11/header.inc index 86a4b43e3..b7daaaf24 100644 --- a/data/maps/SSAnne_1F_Room11/header.inc +++ b/data/maps/SSAnne_1F_Room11/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room11:: @ 834FF50 .4byte SSAnne_1F_Room11_Layout @ 0x8345030 - .4byte gMapEvents_SSAnne_1F_Room11 @ 0x83B3B34 - .4byte gMapScripts_SSAnne_1F_Room11 @ 0x8164559 + .4byte SSAnne_1F_Room11_MapEvents @ 0x83B3B34 + .4byte SSAnne_1F_Room11_MapScripts @ 0x8164559 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 317 diff --git a/data/maps/SSAnne_1F_Room12/header.inc b/data/maps/SSAnne_1F_Room12/header.inc index 0c1206221..067d21360 100644 --- a/data/maps/SSAnne_1F_Room12/header.inc +++ b/data/maps/SSAnne_1F_Room12/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room12:: @ 834FF6C .4byte SSAnne_1F_Room12_Layout @ 0x8347A50 - .4byte gMapEvents_SSAnne_1F_Room12 @ 0x83B3B50 - .4byte gMapScripts_SSAnne_1F_Room12 @ 0x81646A4 + .4byte SSAnne_1F_Room12_MapEvents @ 0x83B3B50 + .4byte SSAnne_1F_Room12_MapScripts @ 0x81646A4 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 340 diff --git a/data/maps/SSAnne_1F_Room2/header.inc b/data/maps/SSAnne_1F_Room2/header.inc index ff27c0fc5..051f27424 100644 --- a/data/maps/SSAnne_1F_Room2/header.inc +++ b/data/maps/SSAnne_1F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room2:: @ 834F380 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room2 @ 0x83AED68 - .4byte gMapScripts_SSAnne_1F_Room2 @ 0x8160BE5 + .4byte SSAnne_1F_Room2_MapEvents @ 0x83AED68 + .4byte SSAnne_1F_Room2_MapScripts @ 0x8160BE5 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room3/header.inc b/data/maps/SSAnne_1F_Room3/header.inc index 87fa83e15..0240062db 100644 --- a/data/maps/SSAnne_1F_Room3/header.inc +++ b/data/maps/SSAnne_1F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room3:: @ 834F39C .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room3 @ 0x83AEDCC - .4byte gMapScripts_SSAnne_1F_Room3 @ 0x8160C1D + .4byte SSAnne_1F_Room3_MapEvents @ 0x83AEDCC + .4byte SSAnne_1F_Room3_MapScripts @ 0x8160C1D .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room4/header.inc b/data/maps/SSAnne_1F_Room4/header.inc index 20e7592c8..18b679d2c 100644 --- a/data/maps/SSAnne_1F_Room4/header.inc +++ b/data/maps/SSAnne_1F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room4:: @ 834F3B8 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room4 @ 0x83AEE00 - .4byte gMapScripts_SSAnne_1F_Room4 @ 0x8160C43 + .4byte SSAnne_1F_Room4_MapEvents @ 0x83AEE00 + .4byte SSAnne_1F_Room4_MapScripts @ 0x8160C43 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room5/header.inc b/data/maps/SSAnne_1F_Room5/header.inc index 17e6e6177..c9e14fcab 100644 --- a/data/maps/SSAnne_1F_Room5/header.inc +++ b/data/maps/SSAnne_1F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room5:: @ 834F3D4 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room5 @ 0x83AEE34 - .4byte gMapScripts_SSAnne_1F_Room5 @ 0x8160C66 + .4byte SSAnne_1F_Room5_MapEvents @ 0x83AEE34 + .4byte SSAnne_1F_Room5_MapScripts @ 0x8160C66 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room6/header.inc b/data/maps/SSAnne_1F_Room6/header.inc index 21e7d4adf..689a053ef 100644 --- a/data/maps/SSAnne_1F_Room6/header.inc +++ b/data/maps/SSAnne_1F_Room6/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room6:: @ 834F540 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room6 @ 0x83AF210 - .4byte gMapScripts_SSAnne_1F_Room6 @ 0x8160DF2 + .4byte SSAnne_1F_Room6_MapEvents @ 0x83AF210 + .4byte SSAnne_1F_Room6_MapScripts @ 0x8160DF2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room7/header.inc b/data/maps/SSAnne_1F_Room7/header.inc index 04752a2a5..218ed0557 100644 --- a/data/maps/SSAnne_1F_Room7/header.inc +++ b/data/maps/SSAnne_1F_Room7/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room7:: @ 834F3F0 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room7 @ 0x83AEE68 - .4byte gMapScripts_SSAnne_1F_Room7 @ 0x8160C7E + .4byte SSAnne_1F_Room7_MapEvents @ 0x83AEE68 + .4byte SSAnne_1F_Room7_MapScripts @ 0x8160C7E .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_2F_Corridor/header.inc b/data/maps/SSAnne_2F_Corridor/header.inc index 6269a69a2..6321b0246 100644 --- a/data/maps/SSAnne_2F_Corridor/header.inc +++ b/data/maps/SSAnne_2F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Corridor:: @ 834F2BC .4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0 - .4byte gMapEvents_SSAnne_2F_Corridor @ 0x83AEA30 - .4byte gMapScripts_SSAnne_2F_Corridor @ 0x81608DE + .4byte SSAnne_2F_Corridor_MapEvents @ 0x83AEA30 + .4byte SSAnne_2F_Corridor_MapScripts @ 0x81608DE .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 120 diff --git a/data/maps/SSAnne_2F_Room1/header.inc b/data/maps/SSAnne_2F_Room1/header.inc index 0c430c47e..4960880c9 100644 --- a/data/maps/SSAnne_2F_Room1/header.inc +++ b/data/maps/SSAnne_2F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room1:: @ 834F40C .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room1 @ 0x83AEE9C - .4byte gMapScripts_SSAnne_2F_Room1 @ 0x8160C96 + .4byte SSAnne_2F_Room1_MapEvents @ 0x83AEE9C + .4byte SSAnne_2F_Room1_MapScripts @ 0x8160C96 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room2/header.inc b/data/maps/SSAnne_2F_Room2/header.inc index 9a9e944e1..df8bd334f 100644 --- a/data/maps/SSAnne_2F_Room2/header.inc +++ b/data/maps/SSAnne_2F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room2:: @ 834F428 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room2 @ 0x83AEF00 - .4byte gMapScripts_SSAnne_2F_Room2 @ 0x8160CB0 + .4byte SSAnne_2F_Room2_MapEvents @ 0x83AEF00 + .4byte SSAnne_2F_Room2_MapScripts @ 0x8160CB0 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room3/header.inc b/data/maps/SSAnne_2F_Room3/header.inc index 6d749d6e0..9d3cb6e63 100644 --- a/data/maps/SSAnne_2F_Room3/header.inc +++ b/data/maps/SSAnne_2F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room3:: @ 834F444 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room3 @ 0x83AEF4C - .4byte gMapScripts_SSAnne_2F_Room3 @ 0x8160CDF + .4byte SSAnne_2F_Room3_MapEvents @ 0x83AEF4C + .4byte SSAnne_2F_Room3_MapScripts @ 0x8160CDF .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room4/header.inc b/data/maps/SSAnne_2F_Room4/header.inc index 20b40d53a..d71a41336 100644 --- a/data/maps/SSAnne_2F_Room4/header.inc +++ b/data/maps/SSAnne_2F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room4:: @ 834F460 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room4 @ 0x83AEFB0 - .4byte gMapScripts_SSAnne_2F_Room4 @ 0x8160CF2 + .4byte SSAnne_2F_Room4_MapEvents @ 0x83AEFB0 + .4byte SSAnne_2F_Room4_MapScripts @ 0x8160CF2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room5/header.inc b/data/maps/SSAnne_2F_Room5/header.inc index f85f59058..76b09d983 100644 --- a/data/maps/SSAnne_2F_Room5/header.inc +++ b/data/maps/SSAnne_2F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room5:: @ 834F47C .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room5 @ 0x83AEFFC - .4byte gMapScripts_SSAnne_2F_Room5 @ 0x8160D21 + .4byte SSAnne_2F_Room5_MapEvents @ 0x83AEFFC + .4byte SSAnne_2F_Room5_MapScripts @ 0x8160D21 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room6/header.inc b/data/maps/SSAnne_2F_Room6/header.inc index b469ade44..29cb434c7 100644 --- a/data/maps/SSAnne_2F_Room6/header.inc +++ b/data/maps/SSAnne_2F_Room6/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room6:: @ 834F498 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room6 @ 0x83AF048 - .4byte gMapScripts_SSAnne_2F_Room6 @ 0x8160D34 + .4byte SSAnne_2F_Room6_MapEvents @ 0x83AF048 + .4byte SSAnne_2F_Room6_MapScripts @ 0x8160D34 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_3F_Corridor/header.inc b/data/maps/SSAnne_3F_Corridor/header.inc index 542dd9301..e5285ffe9 100644 --- a/data/maps/SSAnne_3F_Corridor/header.inc +++ b/data/maps/SSAnne_3F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_3F_Corridor:: @ 834F2D8 .4byte SSAnne_3F_Corridor_Layout @ 0x8300108 - .4byte gMapEvents_SSAnne_3F_Corridor @ 0x83AEA74 - .4byte gMapScripts_SSAnne_3F_Corridor @ 0x8160A5D + .4byte SSAnne_3F_Corridor_MapEvents @ 0x83AEA74 + .4byte SSAnne_3F_Corridor_MapScripts @ 0x8160A5D .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 121 diff --git a/data/maps/SSAnne_B1F_Corridor/header.inc b/data/maps/SSAnne_B1F_Corridor/header.inc index af25e7b96..020aa1ad4 100644 --- a/data/maps/SSAnne_B1F_Corridor/header.inc +++ b/data/maps/SSAnne_B1F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Corridor:: @ 834F2F4 .4byte SSAnne_B1F_Corridor_Layout @ 0x8300270 - .4byte gMapEvents_SSAnne_B1F_Corridor @ 0x83AEAC4 - .4byte gMapScripts_SSAnne_B1F_Corridor @ 0x8160A67 + .4byte SSAnne_B1F_Corridor_MapEvents @ 0x83AEAC4 + .4byte SSAnne_B1F_Corridor_MapScripts @ 0x8160A67 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 122 diff --git a/data/maps/SSAnne_B1F_Room1/header.inc b/data/maps/SSAnne_B1F_Room1/header.inc index 33e35bdf8..609acf59e 100644 --- a/data/maps/SSAnne_B1F_Room1/header.inc +++ b/data/maps/SSAnne_B1F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room1:: @ 834F4B4 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room1 @ 0x83AF094 - .4byte gMapScripts_SSAnne_B1F_Room1 @ 0x8160D47 + .4byte SSAnne_B1F_Room1_MapEvents @ 0x83AF094 + .4byte SSAnne_B1F_Room1_MapScripts @ 0x8160D47 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room2/header.inc b/data/maps/SSAnne_B1F_Room2/header.inc index 86a3cac32..d7a4a9e7f 100644 --- a/data/maps/SSAnne_B1F_Room2/header.inc +++ b/data/maps/SSAnne_B1F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room2:: @ 834F4D0 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room2 @ 0x83AF0E0 - .4byte gMapScripts_SSAnne_B1F_Room2 @ 0x8160D76 + .4byte SSAnne_B1F_Room2_MapEvents @ 0x83AF0E0 + .4byte SSAnne_B1F_Room2_MapScripts @ 0x8160D76 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room3/header.inc b/data/maps/SSAnne_B1F_Room3/header.inc index f5ab0a506..67e43de94 100644 --- a/data/maps/SSAnne_B1F_Room3/header.inc +++ b/data/maps/SSAnne_B1F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room3:: @ 834F4EC .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room3 @ 0x83AF12C - .4byte gMapScripts_SSAnne_B1F_Room3 @ 0x8160D8E + .4byte SSAnne_B1F_Room3_MapEvents @ 0x83AF12C + .4byte SSAnne_B1F_Room3_MapScripts @ 0x8160D8E .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room4/header.inc b/data/maps/SSAnne_B1F_Room4/header.inc index 9b8dc59c7..8a23b71f2 100644 --- a/data/maps/SSAnne_B1F_Room4/header.inc +++ b/data/maps/SSAnne_B1F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room4:: @ 834F508 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room4 @ 0x83AF178 - .4byte gMapScripts_SSAnne_B1F_Room4 @ 0x8160DA6 + .4byte SSAnne_B1F_Room4_MapEvents @ 0x83AF178 + .4byte SSAnne_B1F_Room4_MapScripts @ 0x8160DA6 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room5/header.inc b/data/maps/SSAnne_B1F_Room5/header.inc index 82dd62873..86c82dabe 100644 --- a/data/maps/SSAnne_B1F_Room5/header.inc +++ b/data/maps/SSAnne_B1F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room5:: @ 834F524 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room5 @ 0x83AF1DC - .4byte gMapScripts_SSAnne_B1F_Room5 @ 0x8160DD5 + .4byte SSAnne_B1F_Room5_MapEvents @ 0x83AF1DC + .4byte SSAnne_B1F_Room5_MapScripts @ 0x8160DD5 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_CaptainsOffice/header.inc b/data/maps/SSAnne_CaptainsOffice/header.inc index 34c346691..b9f3fba89 100644 --- a/data/maps/SSAnne_CaptainsOffice/header.inc +++ b/data/maps/SSAnne_CaptainsOffice/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice:: @ 834F348 .4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC - .4byte gMapEvents_SSAnne_CaptainsOffice @ 0x83AECB8 - .4byte gMapScripts_SSAnne_CaptainsOffice @ 0x8160B39 + .4byte SSAnne_CaptainsOffice_MapEvents @ 0x83AECB8 + .4byte SSAnne_CaptainsOffice_MapScripts @ 0x8160B39 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 171 diff --git a/data/maps/SSAnne_CaptainsOffice2/header.inc b/data/maps/SSAnne_CaptainsOffice2/header.inc index de121229e..9d29a439b 100644 --- a/data/maps/SSAnne_CaptainsOffice2/header.inc +++ b/data/maps/SSAnne_CaptainsOffice2/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice2:: @ 834FE54 .4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560 - .4byte gMapEvents_SSAnne_CaptainsOffice2 @ 0x83B3508 - .4byte gMapScripts_SSAnne_CaptainsOffice2 @ 0x8163D81 + .4byte SSAnne_CaptainsOffice2_MapEvents @ 0x83B3508 + .4byte SSAnne_CaptainsOffice2_MapScripts @ 0x8163D81 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 295 diff --git a/data/maps/SSAnne_CaptainsOffice3/header.inc b/data/maps/SSAnne_CaptainsOffice3/header.inc index 393ee9983..47d48f1ec 100644 --- a/data/maps/SSAnne_CaptainsOffice3/header.inc +++ b/data/maps/SSAnne_CaptainsOffice3/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice3:: @ 834FE70 .4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98 - .4byte gMapEvents_SSAnne_CaptainsOffice3 @ 0x83B35B4 - .4byte gMapScripts_SSAnne_CaptainsOffice3 @ 0x8163D82 + .4byte SSAnne_CaptainsOffice3_MapEvents @ 0x83B35B4 + .4byte SSAnne_CaptainsOffice3_MapScripts @ 0x8163D82 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 296 diff --git a/data/maps/SSAnne_CaptainsOffice4/header.inc b/data/maps/SSAnne_CaptainsOffice4/header.inc index 2f10ad142..933c78555 100644 --- a/data/maps/SSAnne_CaptainsOffice4/header.inc +++ b/data/maps/SSAnne_CaptainsOffice4/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice4:: @ 834FE8C .4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4 - .4byte gMapEvents_SSAnne_CaptainsOffice4 @ 0x83B381C - .4byte gMapScripts_SSAnne_CaptainsOffice4 @ 0x8163F2E + .4byte SSAnne_CaptainsOffice4_MapEvents @ 0x83B381C + .4byte SSAnne_CaptainsOffice4_MapScripts @ 0x8163F2E .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 292 diff --git a/data/maps/SSAnne_CaptainsOffice5/header.inc b/data/maps/SSAnne_CaptainsOffice5/header.inc index c603c103d..c735393a0 100644 --- a/data/maps/SSAnne_CaptainsOffice5/header.inc +++ b/data/maps/SSAnne_CaptainsOffice5/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice5:: @ 834FEA8 .4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4 - .4byte gMapEvents_SSAnne_CaptainsOffice5 @ 0x83B3850 - .4byte gMapScripts_SSAnne_CaptainsOffice5 @ 0x8164182 + .4byte SSAnne_CaptainsOffice5_MapEvents @ 0x83B3850 + .4byte SSAnne_CaptainsOffice5_MapScripts @ 0x8164182 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 309 diff --git a/data/maps/SSAnne_CaptainsOffice9/header.inc b/data/maps/SSAnne_CaptainsOffice9/header.inc index 3354834a2..5d4aad26b 100644 --- a/data/maps/SSAnne_CaptainsOffice9/header.inc +++ b/data/maps/SSAnne_CaptainsOffice9/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice9:: @ 834FF18 .4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4 - .4byte gMapEvents_SSAnne_CaptainsOffice9 @ 0x83B3970 - .4byte gMapScripts_SSAnne_CaptainsOffice9 @ 0x81641B3 + .4byte SSAnne_CaptainsOffice9_MapEvents @ 0x83B3970 + .4byte SSAnne_CaptainsOffice9_MapScripts @ 0x81641B3 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 313 diff --git a/data/maps/SSAnne_Deck/header.inc b/data/maps/SSAnne_Deck/header.inc index 5c38770bd..ae12f7727 100644 --- a/data/maps/SSAnne_Deck/header.inc +++ b/data/maps/SSAnne_Deck/header.inc @@ -1,7 +1,7 @@ SSAnne_Deck:: @ 834F310 .4byte SSAnne_Deck_Layout @ 0x8300624 - .4byte gMapEvents_SSAnne_Deck @ 0x83AEB60 - .4byte gMapScripts_SSAnne_Deck @ 0x8160A68 + .4byte SSAnne_Deck_MapEvents @ 0x83AEB60 + .4byte SSAnne_Deck_MapScripts @ 0x8160A68 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 123 diff --git a/data/maps/SSAnne_Exterior/header.inc b/data/maps/SSAnne_Exterior/header.inc index 9ad5649b9..a16473ca7 100644 --- a/data/maps/SSAnne_Exterior/header.inc +++ b/data/maps/SSAnne_Exterior/header.inc @@ -1,7 +1,7 @@ SSAnne_Exterior:: @ 834F284 .4byte SSAnne_Exterior_Layout @ 0x82FF610 - .4byte gMapEvents_SSAnne_Exterior @ 0x83AE8C8 - .4byte gMapScripts_SSAnne_Exterior @ 0x8160840 + .4byte SSAnne_Exterior_MapEvents @ 0x83AE8C8 + .4byte SSAnne_Exterior_MapScripts @ 0x8160840 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 118 diff --git a/data/maps/SSAnne_Kitchen/header.inc b/data/maps/SSAnne_Kitchen/header.inc index ca1ae5f2f..a2128fe93 100644 --- a/data/maps/SSAnne_Kitchen/header.inc +++ b/data/maps/SSAnne_Kitchen/header.inc @@ -1,7 +1,7 @@ SSAnne_Kitchen:: @ 834F32C .4byte SSAnne_Kitchen_Layout @ 0x8319214 - .4byte gMapEvents_SSAnne_Kitchen @ 0x83AEC60 - .4byte gMapScripts_SSAnne_Kitchen @ 0x8160AB2 + .4byte SSAnne_Kitchen_MapEvents @ 0x83AEC60 + .4byte SSAnne_Kitchen_MapScripts @ 0x8160AB2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 170 diff --git a/data/maps/SSAnne_Kitchen3/header.inc b/data/maps/SSAnne_Kitchen3/header.inc index c017888c2..de8d49593 100644 --- a/data/maps/SSAnne_Kitchen3/header.inc +++ b/data/maps/SSAnne_Kitchen3/header.inc @@ -1,7 +1,7 @@ SSAnne_Kitchen3:: @ 834FD58 .4byte SSAnne_Kitchen3_Layout @ 0x833F304 - .4byte gMapEvents_SSAnne_Kitchen3 @ 0x83B2EE0 - .4byte gMapScripts_SSAnne_Kitchen3 @ 0x8163C45 + .4byte SSAnne_Kitchen3_MapEvents @ 0x83B2EE0 + .4byte SSAnne_Kitchen3_MapScripts @ 0x8163C45 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 285 diff --git a/data/maps/SafariZone_Building1/header.inc b/data/maps/SafariZone_Building1/header.inc index 039fab75c..e65a0ceb1 100644 --- a/data/maps/SafariZone_Building1/header.inc +++ b/data/maps/SafariZone_Building1/header.inc @@ -1,7 +1,7 @@ SafariZone_Building1:: @ 834F968 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building1 @ 0x83B12CC - .4byte gMapScripts_SafariZone_Building1 @ 0x81623EB + .4byte SafariZone_Building1_MapEvents @ 0x83B12CC + .4byte SafariZone_Building1_MapScripts @ 0x81623EB .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building2/header.inc b/data/maps/SafariZone_Building2/header.inc index c9d80e2c9..706671bbb 100644 --- a/data/maps/SafariZone_Building2/header.inc +++ b/data/maps/SafariZone_Building2/header.inc @@ -1,7 +1,7 @@ SafariZone_Building2:: @ 834F984 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building2 @ 0x83B1340 - .4byte gMapScripts_SafariZone_Building2 @ 0x81623FE + .4byte SafariZone_Building2_MapEvents @ 0x83B1340 + .4byte SafariZone_Building2_MapScripts @ 0x81623FE .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building3/header.inc b/data/maps/SafariZone_Building3/header.inc index 3439dc9a8..219c3a1a4 100644 --- a/data/maps/SafariZone_Building3/header.inc +++ b/data/maps/SafariZone_Building3/header.inc @@ -1,7 +1,7 @@ SafariZone_Building3:: @ 834F9A0 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building3 @ 0x83B13CC - .4byte gMapScripts_SafariZone_Building3 @ 0x816241A + .4byte SafariZone_Building3_MapEvents @ 0x83B13CC + .4byte SafariZone_Building3_MapScripts @ 0x816241A .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building4/header.inc b/data/maps/SafariZone_Building4/header.inc index 5f783687e..60fa37573 100644 --- a/data/maps/SafariZone_Building4/header.inc +++ b/data/maps/SafariZone_Building4/header.inc @@ -1,7 +1,7 @@ SafariZone_Building4:: @ 834F9BC .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building4 @ 0x83B1440 - .4byte gMapScripts_SafariZone_Building4 @ 0x8162436 + .4byte SafariZone_Building4_MapEvents @ 0x83B1440 + .4byte SafariZone_Building4_MapScripts @ 0x8162436 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Center/header.inc b/data/maps/SafariZone_Center/header.inc index 357564a36..9a2b3f5cc 100644 --- a/data/maps/SafariZone_Center/header.inc +++ b/data/maps/SafariZone_Center/header.inc @@ -1,7 +1,7 @@ SafariZone_Center:: @ 834F8F8 .4byte SafariZone_Center_Layout @ 0x830DD38 - .4byte gMapEvents_SafariZone_Center @ 0x83B0F98 - .4byte gMapScripts_SafariZone_Center @ 0x8162357 + .4byte SafariZone_Center_MapEvents @ 0x83B0F98 + .4byte SafariZone_Center_MapScripts @ 0x8162357 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 147 diff --git a/data/maps/SafariZone_East/header.inc b/data/maps/SafariZone_East/header.inc index 4a1093a74..63835d624 100644 --- a/data/maps/SafariZone_East/header.inc +++ b/data/maps/SafariZone_East/header.inc @@ -1,7 +1,7 @@ SafariZone_East:: @ 834F914 .4byte SafariZone_East_Layout @ 0x830EC24 - .4byte gMapEvents_SafariZone_East @ 0x83B1068 - .4byte gMapScripts_SafariZone_East @ 0x816237C + .4byte SafariZone_East_MapEvents @ 0x83B1068 + .4byte SafariZone_East_MapScripts @ 0x816237C .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 148 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 76f71d005..35ceb0989 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -1,7 +1,7 @@ SafariZone_North:: @ 834F930 .4byte SafariZone_North_Layout @ 0x830FE1C - .4byte gMapEvents_SafariZone_North @ 0x83B1168 - .4byte gMapScripts_SafariZone_North @ 0x8162398 + .4byte SafariZone_North_MapEvents @ 0x83B1168 + .4byte SafariZone_North_MapScripts @ 0x8162398 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 149 diff --git a/data/maps/SafariZone_SecretHouse/header.inc b/data/maps/SafariZone_SecretHouse/header.inc index 61593dc82..f91bc7a7b 100644 --- a/data/maps/SafariZone_SecretHouse/header.inc +++ b/data/maps/SafariZone_SecretHouse/header.inc @@ -1,7 +1,7 @@ SafariZone_SecretHouse:: @ 834F9D8 .4byte SafariZone_SecretHouse_Layout @ 0x831C16C - .4byte gMapEvents_SafariZone_SecretHouse @ 0x83B1484 - .4byte gMapScripts_SafariZone_SecretHouse @ 0x8162452 + .4byte SafariZone_SecretHouse_MapEvents @ 0x83B1484 + .4byte SafariZone_SecretHouse_MapScripts @ 0x8162452 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 199 diff --git a/data/maps/SafariZone_West/header.inc b/data/maps/SafariZone_West/header.inc index 2b2fd6450..69547c067 100644 --- a/data/maps/SafariZone_West/header.inc +++ b/data/maps/SafariZone_West/header.inc @@ -1,7 +1,7 @@ SafariZone_West:: @ 834F94C .4byte SafariZone_West_Layout @ 0x8310BC4 - .4byte gMapEvents_SafariZone_West @ 0x83B1270 - .4byte gMapScripts_SafariZone_West @ 0x81623C6 + .4byte SafariZone_West_MapEvents @ 0x83B1270 + .4byte SafariZone_West_MapScripts @ 0x81623C6 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 150 diff --git a/data/maps/SaffronCity/header.inc b/data/maps/SaffronCity/header.inc index d2f20906d..79a6bb684 100644 --- a/data/maps/SaffronCity/header.inc +++ b/data/maps/SaffronCity/header.inc @@ -1,7 +1,7 @@ SaffronCity:: @ 835074C .4byte SaffronCity_Layout @ 0x82E4E28 - .4byte gMapEvents_SaffronCity @ 0x83B5EB0 - .4byte gMapScripts_SaffronCity @ 0x8167483 + .4byte SaffronCity_MapEvents @ 0x83B5EB0 + .4byte SaffronCity_MapScripts @ 0x8167483 .4byte SaffronCity_MapConnections @ 0x835292C .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 88 diff --git a/data/maps/SaffronCity_Dojo/header.inc b/data/maps/SaffronCity_Dojo/header.inc index 6710c616d..a56af7e4a 100644 --- a/data/maps/SaffronCity_Dojo/header.inc +++ b/data/maps/SaffronCity_Dojo/header.inc @@ -1,7 +1,7 @@ SaffronCity_Dojo:: @ 8351680 .4byte SaffronCity_Dojo_Layout @ 0x83212C4 - .4byte gMapEvents_SaffronCity_Dojo @ 0x83BCD60 - .4byte gMapScripts_SaffronCity_Dojo @ 0x816EBDB + .4byte SaffronCity_Dojo_MapEvents @ 0x83BCD60 + .4byte SaffronCity_Dojo_MapScripts @ 0x816EBDB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 228 diff --git a/data/maps/SaffronCity_Duplicate/header.inc b/data/maps/SaffronCity_Duplicate/header.inc index 62cb00b04..071683449 100644 --- a/data/maps/SaffronCity_Duplicate/header.inc +++ b/data/maps/SaffronCity_Duplicate/header.inc @@ -1,7 +1,7 @@ SaffronCity_Duplicate:: @ 8350730 .4byte SaffronCity_Duplicate_Layout @ 0x831E8D4 - .4byte gMapEvents_SaffronCity_Duplicate @ 0x83B5E9C - .4byte gMapScripts_SaffronCity_Duplicate @ 0x816735F + .4byte SaffronCity_Duplicate_MapEvents @ 0x83B5E9C + .4byte SaffronCity_Duplicate_MapScripts @ 0x816735F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 207 diff --git a/data/maps/SaffronCity_Gym/header.inc b/data/maps/SaffronCity_Gym/header.inc index 78f092724..98450bd26 100644 --- a/data/maps/SaffronCity_Gym/header.inc +++ b/data/maps/SaffronCity_Gym/header.inc @@ -1,7 +1,7 @@ SaffronCity_Gym:: @ 835169C .4byte SaffronCity_Gym_Layout @ 0x82D7C44 - .4byte gMapEvents_SaffronCity_Gym @ 0x83BCF6C - .4byte gMapScripts_SaffronCity_Gym @ 0x816EDD7 + .4byte SaffronCity_Gym_MapEvents @ 0x83BCF6C + .4byte SaffronCity_Gym_MapScripts @ 0x816EDD7 .4byte NULL .2byte BGM_FRLG_GYM .2byte 34 diff --git a/data/maps/SaffronCity_House1_1F/header.inc b/data/maps/SaffronCity_House1_1F/header.inc index 594ddd6c5..a2d14cf5d 100644 --- a/data/maps/SaffronCity_House1_1F/header.inc +++ b/data/maps/SaffronCity_House1_1F/header.inc @@ -1,7 +1,7 @@ SaffronCity_House1_1F:: @ 8351648 .4byte SaffronCity_House1_1F_Layout @ 0x8321004 - .4byte gMapEvents_SaffronCity_House1_1F @ 0x83BCB9C - .4byte gMapScripts_SaffronCity_House1_1F @ 0x816EB36 + .4byte SaffronCity_House1_1F_MapEvents @ 0x83BCB9C + .4byte SaffronCity_House1_1F_MapScripts @ 0x816EB36 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 226 diff --git a/data/maps/SaffronCity_House1_2F/header.inc b/data/maps/SaffronCity_House1_2F/header.inc index 00dbee440..ceb4cf6c4 100644 --- a/data/maps/SaffronCity_House1_2F/header.inc +++ b/data/maps/SaffronCity_House1_2F/header.inc @@ -1,7 +1,7 @@ SaffronCity_House1_2F:: @ 8351664 .4byte SaffronCity_House1_2F_Layout @ 0x8321100 - .4byte gMapEvents_SaffronCity_House1_2F @ 0x83BCC3C - .4byte gMapScripts_SaffronCity_House1_2F @ 0x816EB5C + .4byte SaffronCity_House1_2F_MapEvents @ 0x83BCC3C + .4byte SaffronCity_House1_2F_MapScripts @ 0x816EB5C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 227 diff --git a/data/maps/SaffronCity_House2/header.inc b/data/maps/SaffronCity_House2/header.inc index e41fc17e7..06c30be07 100644 --- a/data/maps/SaffronCity_House2/header.inc +++ b/data/maps/SaffronCity_House2/header.inc @@ -1,7 +1,7 @@ SaffronCity_House2:: @ 83516B8 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_SaffronCity_House2 @ 0x83BD004 - .4byte gMapScripts_SaffronCity_House2 @ 0x816EF73 + .4byte SaffronCity_House2_MapEvents @ 0x83BD004 + .4byte SaffronCity_House2_MapScripts @ 0x816EF73 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 21 diff --git a/data/maps/SaffronCity_House3/header.inc b/data/maps/SaffronCity_House3/header.inc index 3662663c9..94193549c 100644 --- a/data/maps/SaffronCity_House3/header.inc +++ b/data/maps/SaffronCity_House3/header.inc @@ -1,7 +1,7 @@ SaffronCity_House3:: @ 8351728 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_SaffronCity_House3 @ 0x83BD20C - .4byte gMapScripts_SaffronCity_House3 @ 0x816F05E + .4byte SaffronCity_House3_MapEvents @ 0x83BD20C + .4byte SaffronCity_House3_MapScripts @ 0x816F05E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 21 diff --git a/data/maps/SaffronCity_Mart/header.inc b/data/maps/SaffronCity_Mart/header.inc index 55164d967..77c8555ec 100644 --- a/data/maps/SaffronCity_Mart/header.inc +++ b/data/maps/SaffronCity_Mart/header.inc @@ -1,7 +1,7 @@ SaffronCity_Mart:: @ 83516D4 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SaffronCity_Mart @ 0x83BD078 - .4byte gMapScripts_SaffronCity_Mart @ 0x816EFA2 + .4byte SaffronCity_Mart_MapEvents @ 0x83BD078 + .4byte SaffronCity_Mart_MapScripts @ 0x816EFA2 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/header.inc b/data/maps/SaffronCity_PokemonCenter_1F/header.inc index 671ea67b2..1e2198879 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/header.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonCenter_1F:: @ 83516F0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SaffronCity_PokemonCenter_1F @ 0x83BD13C - .4byte gMapScripts_SaffronCity_PokemonCenter_1F @ 0x816EFEC + .4byte SaffronCity_PokemonCenter_1F_MapEvents @ 0x83BD13C + .4byte SaffronCity_PokemonCenter_1F_MapScripts @ 0x816EFEC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/header.inc b/data/maps/SaffronCity_PokemonCenter_2F/header.inc index 7ed9818d9..8c649319e 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/header.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonCenter_2F:: @ 835170C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SaffronCity_PokemonCenter_2F @ 0x83BD1C8 - .4byte gMapScripts_SaffronCity_PokemonCenter_2F @ 0x816F037 + .4byte SaffronCity_PokemonCenter_2F_MapEvents @ 0x83BD1C8 + .4byte SaffronCity_PokemonCenter_2F_MapScripts @ 0x816F037 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc index dd5d8195f..9adb9fbb0 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonTrainerFanClub:: @ 8351744 .4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60 - .4byte gMapEvents_SaffronCity_PokemonTrainerFanClub @ 0x83BD318 - .4byte gMapScripts_SaffronCity_PokemonTrainerFanClub @ 0x816F0BF + .4byte SaffronCity_PokemonTrainerFanClub_MapEvents @ 0x83BD318 + .4byte SaffronCity_PokemonTrainerFanClub_MapScripts @ 0x816F0BF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 263 diff --git a/data/maps/SeafoamIslands_1F/header.inc b/data/maps/SeafoamIslands_1F/header.inc index d6ee69b5e..f95429a3f 100644 --- a/data/maps/SeafoamIslands_1F/header.inc +++ b/data/maps/SeafoamIslands_1F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_1F:: @ 834FB28 .4byte SeafoamIslands_1F_Layout @ 0x831474C - .4byte gMapEvents_SeafoamIslands_1F @ 0x83B1E64 - .4byte gMapScripts_SeafoamIslands_1F @ 0x8162F43 + .4byte SeafoamIslands_1F_MapEvents @ 0x83B1E64 + .4byte SeafoamIslands_1F_MapScripts @ 0x8162F43 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 156 diff --git a/data/maps/SeafoamIslands_B1F/header.inc b/data/maps/SeafoamIslands_B1F/header.inc index 975adc757..b81544b6f 100644 --- a/data/maps/SeafoamIslands_B1F/header.inc +++ b/data/maps/SeafoamIslands_B1F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B1F:: @ 834FB44 .4byte SeafoamIslands_B1F_Layout @ 0x8314E44 - .4byte gMapEvents_SeafoamIslands_B1F @ 0x83B1F30 - .4byte gMapScripts_SeafoamIslands_B1F @ 0x8162F4D + .4byte SeafoamIslands_B1F_MapEvents @ 0x83B1F30 + .4byte SeafoamIslands_B1F_MapScripts @ 0x8162F4D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 157 diff --git a/data/maps/SeafoamIslands_B2F/header.inc b/data/maps/SeafoamIslands_B2F/header.inc index 7d7f353f4..320d37873 100644 --- a/data/maps/SeafoamIslands_B2F/header.inc +++ b/data/maps/SeafoamIslands_B2F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B2F:: @ 834FB60 .4byte SeafoamIslands_B2F_Layout @ 0x8315588 - .4byte gMapEvents_SeafoamIslands_B2F @ 0x83B1FE4 - .4byte gMapScripts_SeafoamIslands_B2F @ 0x8162F4E + .4byte SeafoamIslands_B2F_MapEvents @ 0x83B1FE4 + .4byte SeafoamIslands_B2F_MapScripts @ 0x8162F4E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 158 diff --git a/data/maps/SeafoamIslands_B3F/header.inc b/data/maps/SeafoamIslands_B3F/header.inc index e19764b74..9b61d401a 100644 --- a/data/maps/SeafoamIslands_B3F/header.inc +++ b/data/maps/SeafoamIslands_B3F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B3F:: @ 834FB7C .4byte SeafoamIslands_B3F_Layout @ 0x8315CCC - .4byte gMapEvents_SeafoamIslands_B3F @ 0x83B20DC - .4byte gMapScripts_SeafoamIslands_B3F @ 0x8162F4F + .4byte SeafoamIslands_B3F_MapEvents @ 0x83B20DC + .4byte SeafoamIslands_B3F_MapScripts @ 0x8162F4F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 159 diff --git a/data/maps/SeafoamIslands_B4F/header.inc b/data/maps/SeafoamIslands_B4F/header.inc index b847158b7..67c545838 100644 --- a/data/maps/SeafoamIslands_B4F/header.inc +++ b/data/maps/SeafoamIslands_B4F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B4F:: @ 834FB98 .4byte SeafoamIslands_B4F_Layout @ 0x8316410 - .4byte gMapEvents_SeafoamIslands_B4F @ 0x83B21C4 - .4byte gMapScripts_SeafoamIslands_B4F @ 0x816302E + .4byte SeafoamIslands_B4F_MapEvents @ 0x83B21C4 + .4byte SeafoamIslands_B4F_MapScripts @ 0x816302E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 160 diff --git a/data/maps/SevenIsland/header.inc b/data/maps/SevenIsland/header.inc index 5838c3499..e9e478fd1 100644 --- a/data/maps/SevenIsland/header.inc +++ b/data/maps/SevenIsland/header.inc @@ -1,7 +1,7 @@ SevenIsland:: @ 83507F4 .4byte SevenIsland_Layout @ 0x8323D48 - .4byte gMapEvents_SevenIsland @ 0x83B657C - .4byte gMapScripts_SevenIsland @ 0x8167EB3 + .4byte SevenIsland_MapEvents @ 0x83B657C + .4byte SevenIsland_MapScripts @ 0x8167EB3 .4byte SevenIsland_MapConnections @ 0x83529C0 .2byte BGM_FRLG_ISLAND_SIX .2byte 235 diff --git a/data/maps/SevenIsland_Harbor/header.inc b/data/maps/SevenIsland_Harbor/header.inc index 569b25fad..fe1165d84 100644 --- a/data/maps/SevenIsland_Harbor/header.inc +++ b/data/maps/SevenIsland_Harbor/header.inc @@ -1,7 +1,7 @@ SevenIsland_Harbor:: @ 8351B50 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_SevenIsland_Harbor @ 0x83BE2A0 - .4byte gMapScripts_SevenIsland_Harbor @ 0x8170BE4 + .4byte SevenIsland_Harbor_MapEvents @ 0x83BE2A0 + .4byte SevenIsland_Harbor_MapScripts @ 0x8170BE4 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 315 diff --git a/data/maps/SevenIsland_House_Room1/header.inc b/data/maps/SevenIsland_House_Room1/header.inc index 5fd335a2d..0eeb9bc0f 100644 --- a/data/maps/SevenIsland_House_Room1/header.inc +++ b/data/maps/SevenIsland_House_Room1/header.inc @@ -1,7 +1,7 @@ SevenIsland_House_Room1:: @ 8351AA8 .4byte SevenIsland_House_Room1_Layout @ 0x834E310 - .4byte gMapEvents_SevenIsland_House_Room1 @ 0x83BE050 - .4byte gMapScripts_SevenIsland_House_Room1 @ 0x817088A + .4byte SevenIsland_House_Room1_MapEvents @ 0x83BE050 + .4byte SevenIsland_House_Room1_MapScripts @ 0x817088A .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 382 diff --git a/data/maps/SevenIsland_House_Room2/header.inc b/data/maps/SevenIsland_House_Room2/header.inc index 961157d4a..90d980166 100644 --- a/data/maps/SevenIsland_House_Room2/header.inc +++ b/data/maps/SevenIsland_House_Room2/header.inc @@ -1,7 +1,7 @@ SevenIsland_House_Room2:: @ 8351AC4 .4byte SevenIsland_House_Room2_Layout @ 0x8338C48 - .4byte gMapEvents_SevenIsland_House_Room2 @ 0x83BE084 - .4byte gMapScripts_SevenIsland_House_Room2 @ 0x8170A7E + .4byte SevenIsland_House_Room2_MapEvents @ 0x83BE084 + .4byte SevenIsland_House_Room2_MapScripts @ 0x8170A7E .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 265 diff --git a/data/maps/SevenIsland_Mart/header.inc b/data/maps/SevenIsland_Mart/header.inc index e9a0c01cd..9f2aa5ca1 100644 --- a/data/maps/SevenIsland_Mart/header.inc +++ b/data/maps/SevenIsland_Mart/header.inc @@ -1,7 +1,7 @@ SevenIsland_Mart:: @ 8351AE0 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SevenIsland_Mart @ 0x83BE100 - .4byte gMapScripts_SevenIsland_Mart @ 0x8170B30 + .4byte SevenIsland_Mart_MapEvents @ 0x83BE100 + .4byte SevenIsland_Mart_MapScripts @ 0x8170B30 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/header.inc b/data/maps/SevenIsland_PokemonCenter_1F/header.inc index edf42476e..feef23d0e 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/header.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SevenIsland_PokemonCenter_1F:: @ 8351AFC .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SevenIsland_PokemonCenter_1F @ 0x83BE1B4 - .4byte gMapScripts_SevenIsland_PokemonCenter_1F @ 0x8170B89 + .4byte SevenIsland_PokemonCenter_1F_MapEvents @ 0x83BE1B4 + .4byte SevenIsland_PokemonCenter_1F_MapScripts @ 0x8170B89 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/header.inc b/data/maps/SevenIsland_PokemonCenter_2F/header.inc index 1f5a7e0b1..523401267 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/header.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SevenIsland_PokemonCenter_2F:: @ 8351B18 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SevenIsland_PokemonCenter_2F @ 0x83BE240 - .4byte gMapScripts_SevenIsland_PokemonCenter_2F @ 0x8170BBC + .4byte SevenIsland_PokemonCenter_2F_MapEvents @ 0x83BE240 + .4byte SevenIsland_PokemonCenter_2F_MapScripts @ 0x8170BBC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc index 29b6312f3..dc6bc05ff 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc @@ -1,7 +1,7 @@ SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54 - .4byte gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey @ 0x83B48BC - .4byte gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8164DCC + .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapEvents @ 0x83B48BC + .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapScripts @ 0x8164DCC .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 341 diff --git a/data/maps/SevenIsland_SevaultCanyon/header.inc b/data/maps/SevenIsland_SevaultCanyon/header.inc index d9ac12b23..52ca532e5 100644 --- a/data/maps/SevenIsland_SevaultCanyon/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon:: @ 8350D18 .4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44 - .4byte gMapEvents_SevenIsland_SevaultCanyon @ 0x83B9618 - .4byte gMapScripts_SevenIsland_SevaultCanyon @ 0x8168BFD + .4byte SevenIsland_SevaultCanyon_MapEvents @ 0x83B9618 + .4byte SevenIsland_SevaultCanyon_MapScripts @ 0x8168BFD .4byte SevenIsland_SevaultCanyon_MapConnections @ 0x8352ED0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 256 diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc index 370efc530..5564b0943 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC .4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020 - .4byte gMapEvents_SevenIsland_SevaultCanyon_Entrance @ 0x83B93FC - .4byte gMapScripts_SevenIsland_SevaultCanyon_Entrance @ 0x8168BF3 + .4byte SevenIsland_SevaultCanyon_Entrance_MapEvents @ 0x83B93FC + .4byte SevenIsland_SevaultCanyon_Entrance_MapScripts @ 0x8168BF3 .4byte SevenIsland_SevaultCanyon_Entrance_MapConnections @ 0x8352EB0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 255 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/header.inc b/data/maps/SevenIsland_SevaultCanyon_House/header.inc index 7c3db6084..2adfd6a6e 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon_House:: @ 8351FE8 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SevenIsland_SevaultCanyon_House @ 0x83BF3CC - .4byte gMapScripts_SevenIsland_SevaultCanyon_House @ 0x8172182 + .4byte SevenIsland_SevaultCanyon_House_MapEvents @ 0x83BF3CC + .4byte SevenIsland_SevaultCanyon_House_MapScripts @ 0x8172182 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 11 diff --git a/data/maps/SevenIsland_TanobyRuins/header.inc b/data/maps/SevenIsland_TanobyRuins/header.inc index 3593aa312..1af4d7470 100644 --- a/data/maps/SevenIsland_TanobyRuins/header.inc +++ b/data/maps/SevenIsland_TanobyRuins/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins:: @ 8350D34 .4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8 - .4byte gMapEvents_SevenIsland_TanobyRuins @ 0x83B96F4 - .4byte gMapScripts_SevenIsland_TanobyRuins @ 0x8168C07 + .4byte SevenIsland_TanobyRuins_MapEvents @ 0x83B96F4 + .4byte SevenIsland_TanobyRuins_MapScripts @ 0x8168C07 .4byte SevenIsland_TanobyRuins_MapConnections @ 0x8352EE4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 257 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc index b2409df20..ff5d89664 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8 - .4byte gMapEvents_SevenIsland_TanobyRuins_DilfordChamber @ 0x83B46EC - .4byte gMapScripts_SevenIsland_TanobyRuins_DilfordChamber @ 0x8164CF6 + .4byte SevenIsland_TanobyRuins_DilfordChamber_MapEvents @ 0x83B46EC + .4byte SevenIsland_TanobyRuins_DilfordChamber_MapScripts @ 0x8164CF6 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 338 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc index 5e2639df1..f25b6c7b4 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90 - .4byte gMapEvents_SevenIsland_TanobyRuins_LiptooChamber @ 0x83B46B4 - .4byte gMapScripts_SevenIsland_TanobyRuins_LiptooChamber @ 0x8164CDE + .4byte SevenIsland_TanobyRuins_LiptooChamber_MapEvents @ 0x83B46B4 + .4byte SevenIsland_TanobyRuins_LiptooChamber_MapScripts @ 0x8164CDE .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 336 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc index 2be9dff00..b193feafc 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C - .4byte gMapEvents_SevenIsland_TanobyRuins_MoneanChamber @ 0x83B4698 - .4byte gMapScripts_SevenIsland_TanobyRuins_MoneanChamber @ 0x8164CCF + .4byte SevenIsland_TanobyRuins_MoneanChamber_MapEvents @ 0x83B4698 + .4byte SevenIsland_TanobyRuins_MoneanChamber_MapScripts @ 0x8164CCF .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 335 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc index 923ab442a..815c894ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 .4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8 - .4byte gMapEvents_SevenIsland_TanobyRuins_RixyChamber @ 0x83B4724 - .4byte gMapScripts_SevenIsland_TanobyRuins_RixyChamber @ 0x8164D0E + .4byte SevenIsland_TanobyRuins_RixyChamber_MapEvents @ 0x83B4724 + .4byte SevenIsland_TanobyRuins_RixyChamber_MapScripts @ 0x8164D0E .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 362 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc index 755f02e6d..66680e148 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C - .4byte gMapEvents_SevenIsland_TanobyRuins_ScufibChamber @ 0x83B4708 - .4byte gMapScripts_SevenIsland_TanobyRuins_ScufibChamber @ 0x8164D02 + .4byte SevenIsland_TanobyRuins_ScufibChamber_MapEvents @ 0x83B4708 + .4byte SevenIsland_TanobyRuins_ScufibChamber_MapScripts @ 0x8164D02 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 339 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc index 7d1793415..1f29dbb8f 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC - .4byte gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber @ 0x83B4740 - .4byte gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber @ 0x8164D1A + .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapEvents @ 0x83B4740 + .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapScripts @ 0x8164D1A .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 363 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc index dab134f18..a6ad1c938 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4 - .4byte gMapEvents_SevenIsland_TanobyRuins_WeepthChamber @ 0x83B46D0 - .4byte gMapScripts_SevenIsland_TanobyRuins_WeepthChamber @ 0x8164CEA + .4byte SevenIsland_TanobyRuins_WeepthChamber_MapEvents @ 0x83B46D0 + .4byte SevenIsland_TanobyRuins_WeepthChamber_MapScripts @ 0x8164CEA .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 337 diff --git a/data/maps/SevenIsland_TrainerTower/header.inc b/data/maps/SevenIsland_TrainerTower/header.inc index 41319d0b9..70ebb690e 100644 --- a/data/maps/SevenIsland_TrainerTower/header.inc +++ b/data/maps/SevenIsland_TrainerTower/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower:: @ 8350CE0 .4byte SevenIsland_TrainerTower_Layout @ 0x833287C - .4byte gMapEvents_SevenIsland_TrainerTower @ 0x83B9328 - .4byte gMapScripts_SevenIsland_TrainerTower @ 0x8168BD5 + .4byte SevenIsland_TrainerTower_MapEvents @ 0x83B9328 + .4byte SevenIsland_TrainerTower_MapScripts @ 0x8168BD5 .4byte SevenIsland_TrainerTower_MapConnections @ 0x8352E90 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 254 diff --git a/data/maps/SevenIsland_TrainerTower_1F/header.inc b/data/maps/SevenIsland_TrainerTower_1F/header.inc index 03addfd0a..5e7e742ab 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_1F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_1F:: @ 834FFA4 .4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC - .4byte gMapEvents_SevenIsland_TrainerTower_1F @ 0x83B3C40 - .4byte gMapScripts_SevenIsland_TrainerTower_1F @ 0x81646B8 + .4byte SevenIsland_TrainerTower_1F_MapEvents @ 0x83B3C40 + .4byte SevenIsland_TrainerTower_1F_MapScripts @ 0x81646B8 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 298 diff --git a/data/maps/SevenIsland_TrainerTower_2F/header.inc b/data/maps/SevenIsland_TrainerTower_2F/header.inc index ef4663130..b5289b39a 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_2F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_2F:: @ 834FFC0 .4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254 - .4byte gMapEvents_SevenIsland_TrainerTower_2F @ 0x83B3D14 - .4byte gMapScripts_SevenIsland_TrainerTower_2F @ 0x81646E6 + .4byte SevenIsland_TrainerTower_2F_MapEvents @ 0x83B3D14 + .4byte SevenIsland_TrainerTower_2F_MapScripts @ 0x81646E6 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 299 diff --git a/data/maps/SevenIsland_TrainerTower_3F/header.inc b/data/maps/SevenIsland_TrainerTower_3F/header.inc index f9400b21e..022a5c1d1 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_3F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_3F:: @ 834FFDC .4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC - .4byte gMapEvents_SevenIsland_TrainerTower_3F @ 0x83B3DE8 - .4byte gMapScripts_SevenIsland_TrainerTower_3F @ 0x8164714 + .4byte SevenIsland_TrainerTower_3F_MapEvents @ 0x83B3DE8 + .4byte SevenIsland_TrainerTower_3F_MapScripts @ 0x8164714 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 300 diff --git a/data/maps/SevenIsland_TrainerTower_4F/header.inc b/data/maps/SevenIsland_TrainerTower_4F/header.inc index 82b4c0d87..cdcedee7f 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_4F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_4F:: @ 834FFF8 .4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764 - .4byte gMapEvents_SevenIsland_TrainerTower_4F @ 0x83B3EBC - .4byte gMapScripts_SevenIsland_TrainerTower_4F @ 0x8164742 + .4byte SevenIsland_TrainerTower_4F_MapEvents @ 0x83B3EBC + .4byte SevenIsland_TrainerTower_4F_MapScripts @ 0x8164742 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 301 diff --git a/data/maps/SevenIsland_TrainerTower_5F/header.inc b/data/maps/SevenIsland_TrainerTower_5F/header.inc index 9e894806f..0192b30be 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_5F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_5F:: @ 8350014 .4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC - .4byte gMapEvents_SevenIsland_TrainerTower_5F @ 0x83B3F90 - .4byte gMapScripts_SevenIsland_TrainerTower_5F @ 0x8164770 + .4byte SevenIsland_TrainerTower_5F_MapEvents @ 0x83B3F90 + .4byte SevenIsland_TrainerTower_5F_MapScripts @ 0x8164770 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 302 diff --git a/data/maps/SevenIsland_TrainerTower_6F/header.inc b/data/maps/SevenIsland_TrainerTower_6F/header.inc index e16b71ffa..3835015a0 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_6F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_6F:: @ 8350030 .4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74 - .4byte gMapEvents_SevenIsland_TrainerTower_6F @ 0x83B4064 - .4byte gMapScripts_SevenIsland_TrainerTower_6F @ 0x816479E + .4byte SevenIsland_TrainerTower_6F_MapEvents @ 0x83B4064 + .4byte SevenIsland_TrainerTower_6F_MapScripts @ 0x816479E .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 303 diff --git a/data/maps/SevenIsland_TrainerTower_7F/header.inc b/data/maps/SevenIsland_TrainerTower_7F/header.inc index 804576d94..2c0d405a9 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_7F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_7F:: @ 835004C .4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC - .4byte gMapEvents_SevenIsland_TrainerTower_7F @ 0x83B4138 - .4byte gMapScripts_SevenIsland_TrainerTower_7F @ 0x81647CC + .4byte SevenIsland_TrainerTower_7F_MapEvents @ 0x83B4138 + .4byte SevenIsland_TrainerTower_7F_MapScripts @ 0x81647CC .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 304 diff --git a/data/maps/SevenIsland_TrainerTower_8F/header.inc b/data/maps/SevenIsland_TrainerTower_8F/header.inc index a395e6b49..31ff1d39b 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_8F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_8F:: @ 8350068 .4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184 - .4byte gMapEvents_SevenIsland_TrainerTower_8F @ 0x83B420C - .4byte gMapScripts_SevenIsland_TrainerTower_8F @ 0x81647FA + .4byte SevenIsland_TrainerTower_8F_MapEvents @ 0x83B420C + .4byte SevenIsland_TrainerTower_8F_MapScripts @ 0x81647FA .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 305 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc index da5559773..024a3656b 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Elevator:: @ 83500BC .4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454 - .4byte gMapEvents_SevenIsland_TrainerTower_Elevator @ 0x83B4330 - .4byte gMapScripts_SevenIsland_TrainerTower_Elevator @ 0x8164AF8 + .4byte SevenIsland_TrainerTower_Elevator_MapEvents @ 0x83B4330 + .4byte SevenIsland_TrainerTower_Elevator_MapScripts @ 0x8164AF8 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 307 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc index f62c7dfec..243fe1a15 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Lobby:: @ 83500A0 .4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44 - .4byte gMapEvents_SevenIsland_TrainerTower_Lobby @ 0x83B4308 - .4byte gMapScripts_SevenIsland_TrainerTower_Lobby @ 0x8164839 + .4byte SevenIsland_TrainerTower_Lobby_MapEvents @ 0x83B4308 + .4byte SevenIsland_TrainerTower_Lobby_MapScripts @ 0x8164839 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 297 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/header.inc b/data/maps/SevenIsland_TrainerTower_Roof/header.inc index 3fdaad52f..da106ecba 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Roof/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Roof:: @ 8350084 .4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8 - .4byte gMapEvents_SevenIsland_TrainerTower_Roof @ 0x83B4248 - .4byte gMapScripts_SevenIsland_TrainerTower_Roof @ 0x8164828 + .4byte SevenIsland_TrainerTower_Roof_MapEvents @ 0x83B4248 + .4byte SevenIsland_TrainerTower_Roof_MapScripts @ 0x8164828 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 306 diff --git a/data/maps/SilphCo_10F/header.inc b/data/maps/SilphCo_10F/header.inc index b211cc14d..32d229ed3 100644 --- a/data/maps/SilphCo_10F/header.inc +++ b/data/maps/SilphCo_10F/header.inc @@ -1,7 +1,7 @@ SilphCo_10F:: @ 834F834 .4byte SilphCo_10F_Layout @ 0x830A0E8 - .4byte gMapEvents_SilphCo_10F @ 0x83B0A20 - .4byte gMapScripts_SilphCo_10F @ 0x8161D86 + .4byte SilphCo_10F_MapEvents @ 0x83B0A20 + .4byte SilphCo_10F_MapScripts @ 0x8161D86 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 141 diff --git a/data/maps/SilphCo_11F/header.inc b/data/maps/SilphCo_11F/header.inc index 6121495c4..d451aa3bf 100644 --- a/data/maps/SilphCo_11F/header.inc +++ b/data/maps/SilphCo_11F/header.inc @@ -1,7 +1,7 @@ SilphCo_11F:: @ 834F850 .4byte SilphCo_11F_Layout @ 0x830A3B4 - .4byte gMapEvents_SilphCo_11F @ 0x83B0B44 - .4byte gMapScripts_SilphCo_11F @ 0x8161DEE + .4byte SilphCo_11F_MapEvents @ 0x83B0B44 + .4byte SilphCo_11F_MapScripts @ 0x8161DEE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 142 diff --git a/data/maps/SilphCo_1F/header.inc b/data/maps/SilphCo_1F/header.inc index df174f19c..e1dca1251 100644 --- a/data/maps/SilphCo_1F/header.inc +++ b/data/maps/SilphCo_1F/header.inc @@ -1,7 +1,7 @@ SilphCo_1F:: @ 834F738 .4byte SilphCo_1F_Layout @ 0x83071EC - .4byte gMapEvents_SilphCo_1F @ 0x83AFCE0 - .4byte gMapScripts_SilphCo_1F @ 0x8161625 + .4byte SilphCo_1F_MapEvents @ 0x83AFCE0 + .4byte SilphCo_1F_MapScripts @ 0x8161625 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 132 diff --git a/data/maps/SilphCo_2F/header.inc b/data/maps/SilphCo_2F/header.inc index 870637ea8..17274ac84 100644 --- a/data/maps/SilphCo_2F/header.inc +++ b/data/maps/SilphCo_2F/header.inc @@ -1,7 +1,7 @@ SilphCo_2F:: @ 834F754 .4byte SilphCo_2F_Layout @ 0x8307840 - .4byte gMapEvents_SilphCo_2F @ 0x83AFE1C - .4byte gMapScripts_SilphCo_2F @ 0x8161641 + .4byte SilphCo_2F_MapEvents @ 0x83AFE1C + .4byte SilphCo_2F_MapScripts @ 0x8161641 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 133 diff --git a/data/maps/SilphCo_3F/header.inc b/data/maps/SilphCo_3F/header.inc index 6117e9567..823d84c46 100644 --- a/data/maps/SilphCo_3F/header.inc +++ b/data/maps/SilphCo_3F/header.inc @@ -1,7 +1,7 @@ SilphCo_3F:: @ 834F770 .4byte SilphCo_3F_Layout @ 0x8307E94 - .4byte gMapEvents_SilphCo_3F @ 0x83AFF58 - .4byte gMapScripts_SilphCo_3F @ 0x81616C5 + .4byte SilphCo_3F_MapEvents @ 0x83AFF58 + .4byte SilphCo_3F_MapScripts @ 0x81616C5 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 134 diff --git a/data/maps/SilphCo_4F/header.inc b/data/maps/SilphCo_4F/header.inc index bbbc5688e..a59872690 100644 --- a/data/maps/SilphCo_4F/header.inc +++ b/data/maps/SilphCo_4F/header.inc @@ -1,7 +1,7 @@ SilphCo_4F:: @ 834F78C .4byte SilphCo_4F_Layout @ 0x83084E8 - .4byte gMapEvents_SilphCo_4F @ 0x83B00DC - .4byte gMapScripts_SilphCo_4F @ 0x8161736 + .4byte SilphCo_4F_MapEvents @ 0x83B00DC + .4byte SilphCo_4F_MapScripts @ 0x8161736 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 135 diff --git a/data/maps/SilphCo_5F/header.inc b/data/maps/SilphCo_5F/header.inc index 803d7b377..2c0d61a47 100644 --- a/data/maps/SilphCo_5F/header.inc +++ b/data/maps/SilphCo_5F/header.inc @@ -1,7 +1,7 @@ SilphCo_5F:: @ 834F7A8 .4byte SilphCo_5F_Layout @ 0x8308B3C - .4byte gMapEvents_SilphCo_5F @ 0x83B02D8 - .4byte gMapScripts_SilphCo_5F @ 0x81617BE + .4byte SilphCo_5F_MapEvents @ 0x83B02D8 + .4byte SilphCo_5F_MapScripts @ 0x81617BE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 136 diff --git a/data/maps/SilphCo_6F/header.inc b/data/maps/SilphCo_6F/header.inc index 0098e49e4..d9c522f9c 100644 --- a/data/maps/SilphCo_6F/header.inc +++ b/data/maps/SilphCo_6F/header.inc @@ -1,7 +1,7 @@ SilphCo_6F:: @ 834F7C4 .4byte SilphCo_6F_Layout @ 0x8308FFC - .4byte gMapEvents_SilphCo_6F @ 0x83B044C - .4byte gMapScripts_SilphCo_6F @ 0x8161881 + .4byte SilphCo_6F_MapEvents @ 0x83B044C + .4byte SilphCo_6F_MapScripts @ 0x8161881 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 137 diff --git a/data/maps/SilphCo_7F/header.inc b/data/maps/SilphCo_7F/header.inc index 9c4b5225b..8208b4ad1 100644 --- a/data/maps/SilphCo_7F/header.inc +++ b/data/maps/SilphCo_7F/header.inc @@ -1,7 +1,7 @@ SilphCo_7F:: @ 834F7E0 .4byte SilphCo_7F_Layout @ 0x83094BC - .4byte gMapEvents_SilphCo_7F @ 0x83B0660 - .4byte gMapScripts_SilphCo_7F @ 0x8161984 + .4byte SilphCo_7F_MapEvents @ 0x83B0660 + .4byte SilphCo_7F_MapScripts @ 0x8161984 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 138 diff --git a/data/maps/SilphCo_8F/header.inc b/data/maps/SilphCo_8F/header.inc index 8a46b7924..5614c0a35 100644 --- a/data/maps/SilphCo_8F/header.inc +++ b/data/maps/SilphCo_8F/header.inc @@ -1,7 +1,7 @@ SilphCo_8F:: @ 834F7FC .4byte SilphCo_8F_Layout @ 0x830997C - .4byte gMapEvents_SilphCo_8F @ 0x83B0784 - .4byte gMapScripts_SilphCo_8F @ 0x8161C5F + .4byte SilphCo_8F_MapEvents @ 0x83B0784 + .4byte SilphCo_8F_MapScripts @ 0x8161C5F .4byte NULL .2byte BGM_FRLG_SILPH .2byte 139 diff --git a/data/maps/SilphCo_9F/header.inc b/data/maps/SilphCo_9F/header.inc index d5805078a..a89767234 100644 --- a/data/maps/SilphCo_9F/header.inc +++ b/data/maps/SilphCo_9F/header.inc @@ -1,7 +1,7 @@ SilphCo_9F:: @ 834F818 .4byte SilphCo_9F_Layout @ 0x8309E3C - .4byte gMapEvents_SilphCo_9F @ 0x83B0904 - .4byte gMapScripts_SilphCo_9F @ 0x8161CDE + .4byte SilphCo_9F_MapEvents @ 0x83B0904 + .4byte SilphCo_9F_MapScripts @ 0x8161CDE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 140 diff --git a/data/maps/SilphCo_Elevator/header.inc b/data/maps/SilphCo_Elevator/header.inc index 9a107fb1d..abfebcfd4 100644 --- a/data/maps/SilphCo_Elevator/header.inc +++ b/data/maps/SilphCo_Elevator/header.inc @@ -1,7 +1,7 @@ SilphCo_Elevator:: @ 834F86C .4byte SilphCo_Elevator_Layout @ 0x8321330 - .4byte gMapEvents_SilphCo_Elevator @ 0x83B0B6C - .4byte gMapScripts_SilphCo_Elevator @ 0x8161F6E + .4byte SilphCo_Elevator_MapEvents @ 0x83B0B6C + .4byte SilphCo_Elevator_MapScripts @ 0x8161F6E .4byte NULL .2byte BGM_FRLG_SILPH .2byte 229 diff --git a/data/maps/SixIsland/header.inc b/data/maps/SixIsland/header.inc index 561cad4ce..3c6a68277 100644 --- a/data/maps/SixIsland/header.inc +++ b/data/maps/SixIsland/header.inc @@ -1,7 +1,7 @@ SixIsland:: @ 8350810 .4byte SixIsland_Layout @ 0x832430C - .4byte gMapEvents_SixIsland @ 0x83B65F8 - .4byte gMapScripts_SixIsland @ 0x8167ED8 + .4byte SixIsland_MapEvents @ 0x83B65F8 + .4byte SixIsland_MapScripts @ 0x8167ED8 .4byte SixIsland_MapConnections @ 0x83529D4 .2byte BGM_FRLG_ISLAND_SIX .2byte 236 diff --git a/data/maps/SixIsland_DottedHole_B1F/header.inc b/data/maps/SixIsland_DottedHole_B1F/header.inc index 5bcf69805..e6781f0e2 100644 --- a/data/maps/SixIsland_DottedHole_B1F/header.inc +++ b/data/maps/SixIsland_DottedHole_B1F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B1F:: @ 834FEC4 .4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808 - .4byte gMapEvents_SixIsland_DottedHole_B1F @ 0x83B3898 - .4byte gMapScripts_SixIsland_DottedHole_B1F @ 0x81641B0 + .4byte SixIsland_DottedHole_B1F_MapEvents @ 0x83B3898 + .4byte SixIsland_DottedHole_B1F_MapScripts @ 0x81641B0 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 310 diff --git a/data/maps/SixIsland_DottedHole_B2F/header.inc b/data/maps/SixIsland_DottedHole_B2F/header.inc index f5d6a6b1e..5b02b306b 100644 --- a/data/maps/SixIsland_DottedHole_B2F/header.inc +++ b/data/maps/SixIsland_DottedHole_B2F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B2F:: @ 834FEE0 .4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C - .4byte gMapEvents_SixIsland_DottedHole_B2F @ 0x83B38E0 - .4byte gMapScripts_SixIsland_DottedHole_B2F @ 0x81641B1 + .4byte SixIsland_DottedHole_B2F_MapEvents @ 0x83B38E0 + .4byte SixIsland_DottedHole_B2F_MapScripts @ 0x81641B1 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 311 diff --git a/data/maps/SixIsland_DottedHole_B3F/header.inc b/data/maps/SixIsland_DottedHole_B3F/header.inc index e30ffe292..0484d6fb4 100644 --- a/data/maps/SixIsland_DottedHole_B3F/header.inc +++ b/data/maps/SixIsland_DottedHole_B3F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B3F:: @ 834FEFC .4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90 - .4byte gMapEvents_SixIsland_DottedHole_B3F @ 0x83B3928 - .4byte gMapScripts_SixIsland_DottedHole_B3F @ 0x81641B2 + .4byte SixIsland_DottedHole_B3F_MapEvents @ 0x83B3928 + .4byte SixIsland_DottedHole_B3F_MapScripts @ 0x81641B2 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 312 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc index 8752ac442..cb34017a5 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_SapphireRoom:: @ 834FF34 .4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8 - .4byte gMapEvents_SixIsland_DottedHole_SapphireRoom @ 0x83B39D0 - .4byte gMapScripts_SixIsland_DottedHole_SapphireRoom @ 0x81641B4 + .4byte SixIsland_DottedHole_SapphireRoom_MapEvents @ 0x83B39D0 + .4byte SixIsland_DottedHole_SapphireRoom_MapScripts @ 0x81641B4 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 314 diff --git a/data/maps/SixIsland_GreenPath/header.inc b/data/maps/SixIsland_GreenPath/header.inc index 091dd662a..7e378de71 100644 --- a/data/maps/SixIsland_GreenPath/header.inc +++ b/data/maps/SixIsland_GreenPath/header.inc @@ -1,7 +1,7 @@ SixIsland_GreenPath:: @ 8350C8C .4byte SixIsland_GreenPath_Layout @ 0x832E0D0 - .4byte gMapEvents_SixIsland_GreenPath @ 0x83B8FA8 - .4byte gMapScripts_SixIsland_GreenPath @ 0x8168B2D + .4byte SixIsland_GreenPath_MapEvents @ 0x83B8FA8 + .4byte SixIsland_GreenPath_MapScripts @ 0x8168B2D .4byte SixIsland_GreenPath_MapConnections @ 0x8352E3C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 251 diff --git a/data/maps/SixIsland_Harbor/header.inc b/data/maps/SixIsland_Harbor/header.inc index cd468e7ce..edbb428b0 100644 --- a/data/maps/SixIsland_Harbor/header.inc +++ b/data/maps/SixIsland_Harbor/header.inc @@ -1,7 +1,7 @@ SixIsland_Harbor:: @ 8351F08 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_SixIsland_Harbor @ 0x83BF178 - .4byte gMapScripts_SixIsland_Harbor @ 0x8171E47 + .4byte SixIsland_Harbor_MapEvents @ 0x83BF178 + .4byte SixIsland_Harbor_MapScripts @ 0x8171E47 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 315 diff --git a/data/maps/SixIsland_House/header.inc b/data/maps/SixIsland_House/header.inc index 80be57344..a98057971 100644 --- a/data/maps/SixIsland_House/header.inc +++ b/data/maps/SixIsland_House/header.inc @@ -1,7 +1,7 @@ SixIsland_House:: @ 8351F24 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SixIsland_House @ 0x83BF1AC - .4byte gMapScripts_SixIsland_House @ 0x8171E5B + .4byte SixIsland_House_MapEvents @ 0x83BF1AC + .4byte SixIsland_House_MapScripts @ 0x8171E5B .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 11 diff --git a/data/maps/SixIsland_Mart/header.inc b/data/maps/SixIsland_Mart/header.inc index ff490a115..d7483ec18 100644 --- a/data/maps/SixIsland_Mart/header.inc +++ b/data/maps/SixIsland_Mart/header.inc @@ -1,7 +1,7 @@ SixIsland_Mart:: @ 8351F40 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SixIsland_Mart @ 0x83BF210 - .4byte gMapScripts_SixIsland_Mart @ 0x8171E65 + .4byte SixIsland_Mart_MapEvents @ 0x83BF210 + .4byte SixIsland_Mart_MapScripts @ 0x8171E65 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SixIsland_OutcastIsland/header.inc b/data/maps/SixIsland_OutcastIsland/header.inc index 70ba73f2b..e6cc6186d 100644 --- a/data/maps/SixIsland_OutcastIsland/header.inc +++ b/data/maps/SixIsland_OutcastIsland/header.inc @@ -1,7 +1,7 @@ SixIsland_OutcastIsland:: @ 8350C70 .4byte SixIsland_OutcastIsland_Layout @ 0x832D56C - .4byte gMapEvents_SixIsland_OutcastIsland @ 0x83B8F38 - .4byte gMapScripts_SixIsland_OutcastIsland @ 0x8168B15 + .4byte SixIsland_OutcastIsland_MapEvents @ 0x83B8F38 + .4byte SixIsland_OutcastIsland_MapScripts @ 0x8168B15 .4byte SixIsland_OutcastIsland_MapConnections @ 0x8352E1C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 250 diff --git a/data/maps/SixIsland_PokemonCenter_1F/header.inc b/data/maps/SixIsland_PokemonCenter_1F/header.inc index c26a336c6..e2d7f3aa9 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/header.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SixIsland_PokemonCenter_1F:: @ 8351ED0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SixIsland_PokemonCenter_1F @ 0x83BF0A0 - .4byte gMapScripts_SixIsland_PokemonCenter_1F @ 0x8171D6A + .4byte SixIsland_PokemonCenter_1F_MapEvents @ 0x83BF0A0 + .4byte SixIsland_PokemonCenter_1F_MapScripts @ 0x8171D6A .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SixIsland_PokemonCenter_2F/header.inc b/data/maps/SixIsland_PokemonCenter_2F/header.inc index 16784fe32..f11114273 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/header.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SixIsland_PokemonCenter_2F:: @ 8351EEC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SixIsland_PokemonCenter_2F @ 0x83BF12C - .4byte gMapScripts_SixIsland_PokemonCenter_2F @ 0x8171E20 + .4byte SixIsland_PokemonCenter_2F_MapEvents @ 0x83BF12C + .4byte SixIsland_PokemonCenter_2F_MapScripts @ 0x8171E20 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SixIsland_RuinValley/header.inc b/data/maps/SixIsland_RuinValley/header.inc index bd8cd251b..31ec9bc84 100644 --- a/data/maps/SixIsland_RuinValley/header.inc +++ b/data/maps/SixIsland_RuinValley/header.inc @@ -1,7 +1,7 @@ SixIsland_RuinValley:: @ 8350CC4 .4byte SixIsland_RuinValley_Layout @ 0x83302D8 - .4byte gMapEvents_SixIsland_RuinValley @ 0x83B92A0 - .4byte gMapScripts_SixIsland_RuinValley @ 0x8168B53 + .4byte SixIsland_RuinValley_MapEvents @ 0x83B92A0 + .4byte SixIsland_RuinValley_MapScripts @ 0x8168B53 .4byte SixIsland_RuinValley_MapConnections @ 0x8352E7C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 253 diff --git a/data/maps/SixIsland_WaterPath/header.inc b/data/maps/SixIsland_WaterPath/header.inc index f226d3856..4538a40a2 100644 --- a/data/maps/SixIsland_WaterPath/header.inc +++ b/data/maps/SixIsland_WaterPath/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath:: @ 8350CA8 .4byte SixIsland_WaterPath_Layout @ 0x832F3B4 - .4byte gMapEvents_SixIsland_WaterPath @ 0x83B90E0 - .4byte gMapScripts_SixIsland_WaterPath @ 0x8168B40 + .4byte SixIsland_WaterPath_MapEvents @ 0x83B90E0 + .4byte SixIsland_WaterPath_MapScripts @ 0x8168B40 .4byte SixIsland_WaterPath_MapConnections @ 0x8352E68 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 252 diff --git a/data/maps/SixIsland_WaterPath_House1/header.inc b/data/maps/SixIsland_WaterPath_House1/header.inc index 45482e174..dbd7e3ece 100644 --- a/data/maps/SixIsland_WaterPath_House1/header.inc +++ b/data/maps/SixIsland_WaterPath_House1/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_House1:: @ 8351FB0 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_SixIsland_WaterPath_House1 @ 0x83BF334 - .4byte gMapScripts_SixIsland_WaterPath_House1 @ 0x817206C + .4byte SixIsland_WaterPath_House1_MapEvents @ 0x83BF334 + .4byte SixIsland_WaterPath_House1_MapScripts @ 0x817206C .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 13 diff --git a/data/maps/SixIsland_WaterPath_House2/header.inc b/data/maps/SixIsland_WaterPath_House2/header.inc index 47c53fc7d..e0d5408a6 100644 --- a/data/maps/SixIsland_WaterPath_House2/header.inc +++ b/data/maps/SixIsland_WaterPath_House2/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_House2:: @ 8351FCC .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SixIsland_WaterPath_House2 @ 0x83BF368 - .4byte gMapScripts_SixIsland_WaterPath_House2 @ 0x8172178 + .4byte SixIsland_WaterPath_House2_MapEvents @ 0x83BF368 + .4byte SixIsland_WaterPath_House2_MapScripts @ 0x8172178 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 11 diff --git a/data/maps/ThreeIsland/header.inc b/data/maps/ThreeIsland/header.inc index a73e32050..e49570fa4 100644 --- a/data/maps/ThreeIsland/header.inc +++ b/data/maps/ThreeIsland/header.inc @@ -1,7 +1,7 @@ ThreeIsland:: @ 83507A0 .4byte ThreeIsland_Layout @ 0x832265C - .4byte gMapEvents_ThreeIsland @ 0x83B62C8 - .4byte gMapScripts_ThreeIsland @ 0x81677AD + .4byte ThreeIsland_MapEvents @ 0x83B62C8 + .4byte ThreeIsland_MapScripts @ 0x81677AD .4byte ThreeIsland_MapConnections @ 0x8352980 .2byte BGM_FRLG_ISLAND_ONE .2byte 232 diff --git a/data/maps/ThreeIsland_BerryForest/header.inc b/data/maps/ThreeIsland_BerryForest/header.inc index 3a848ee68..928ba8d4a 100644 --- a/data/maps/ThreeIsland_BerryForest/header.inc +++ b/data/maps/ThreeIsland_BerryForest/header.inc @@ -1,7 +1,7 @@ ThreeIsland_BerryForest:: @ 834FE00 .4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8 - .4byte gMapEvents_ThreeIsland_BerryForest @ 0x83B340C - .4byte gMapScripts_ThreeIsland_BerryForest @ 0x8163C71 + .4byte ThreeIsland_BerryForest_MapEvents @ 0x83B340C + .4byte ThreeIsland_BerryForest_MapScripts @ 0x8163C71 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 270 diff --git a/data/maps/ThreeIsland_BondBridge/header.inc b/data/maps/ThreeIsland_BondBridge/header.inc index d7305b2bc..43c5f0c30 100644 --- a/data/maps/ThreeIsland_BondBridge/header.inc +++ b/data/maps/ThreeIsland_BondBridge/header.inc @@ -1,7 +1,7 @@ ThreeIsland_BondBridge:: @ 8350B58 .4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC - .4byte gMapEvents_ThreeIsland_BondBridge @ 0x83B8A9C - .4byte gMapScripts_ThreeIsland_BondBridge @ 0x8168776 + .4byte ThreeIsland_BondBridge_MapEvents @ 0x83B8A9C + .4byte ThreeIsland_BondBridge_MapScripts @ 0x8168776 .4byte ThreeIsland_BondBridge_MapConnections @ 0x8352D64 .2byte BGM_FRLG_ROUTE_3 .2byte 240 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/header.inc b/data/maps/ThreeIsland_DunsparceTunnel/header.inc index 5e3c51372..4f870e33d 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/header.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/header.inc @@ -1,7 +1,7 @@ ThreeIsland_DunsparceTunnel:: @ 8350340 .4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8 - .4byte gMapEvents_ThreeIsland_DunsparceTunnel @ 0x83B4788 - .4byte gMapScripts_ThreeIsland_DunsparceTunnel @ 0x8164D26 + .4byte ThreeIsland_DunsparceTunnel_MapEvents @ 0x83B4788 + .4byte ThreeIsland_DunsparceTunnel_MapScripts @ 0x8164D26 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 318 diff --git a/data/maps/ThreeIsland_Harbor/header.inc b/data/maps/ThreeIsland_Harbor/header.inc index 3a29f5fd0..296d4889a 100644 --- a/data/maps/ThreeIsland_Harbor/header.inc +++ b/data/maps/ThreeIsland_Harbor/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Harbor:: @ 8351F5C .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_ThreeIsland_Harbor @ 0x83BF25C - .4byte gMapScripts_ThreeIsland_Harbor @ 0x8171EA9 + .4byte ThreeIsland_Harbor_MapEvents @ 0x83BF25C + .4byte ThreeIsland_Harbor_MapScripts @ 0x8171EA9 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/ThreeIsland_House1/header.inc b/data/maps/ThreeIsland_House1/header.inc index 7886ef8c6..1be2f87cf 100644 --- a/data/maps/ThreeIsland_House1/header.inc +++ b/data/maps/ThreeIsland_House1/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House1:: @ 8351C84 .4byte ThreeIsland_House1_Layout @ 0x82D7504 - .4byte gMapEvents_ThreeIsland_House1 @ 0x83BE7A4 - .4byte gMapScripts_ThreeIsland_House1 @ 0x8171819 + .4byte ThreeIsland_House1_MapEvents @ 0x83BE7A4 + .4byte ThreeIsland_House1_MapScripts @ 0x8171819 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 31 diff --git a/data/maps/ThreeIsland_House2/header.inc b/data/maps/ThreeIsland_House2/header.inc index 25c26564e..e0f113fff 100644 --- a/data/maps/ThreeIsland_House2/header.inc +++ b/data/maps/ThreeIsland_House2/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House2:: @ 8351CF4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House2 @ 0x83BE97C - .4byte gMapScripts_ThreeIsland_House2 @ 0x81718DF + .4byte ThreeIsland_House2_MapEvents @ 0x83BE97C + .4byte ThreeIsland_House2_MapScripts @ 0x81718DF .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House3/header.inc b/data/maps/ThreeIsland_House3/header.inc index 68f69ae93..63799a6dc 100644 --- a/data/maps/ThreeIsland_House3/header.inc +++ b/data/maps/ThreeIsland_House3/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House3:: @ 8351D10 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House3 @ 0x83BE9B0 - .4byte gMapScripts_ThreeIsland_House3 @ 0x8171902 + .4byte ThreeIsland_House3_MapEvents @ 0x83BE9B0 + .4byte ThreeIsland_House3_MapScripts @ 0x8171902 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House4/header.inc b/data/maps/ThreeIsland_House4/header.inc index d410743d1..9a270c499 100644 --- a/data/maps/ThreeIsland_House4/header.inc +++ b/data/maps/ThreeIsland_House4/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House4:: @ 8351D2C .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House4 @ 0x83BE9FC - .4byte gMapScripts_ThreeIsland_House4 @ 0x817190C + .4byte ThreeIsland_House4_MapEvents @ 0x83BE9FC + .4byte ThreeIsland_House4_MapScripts @ 0x817190C .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House5/header.inc b/data/maps/ThreeIsland_House5/header.inc index 7383dee7b..0579cbe99 100644 --- a/data/maps/ThreeIsland_House5/header.inc +++ b/data/maps/ThreeIsland_House5/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House5:: @ 8351D48 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House5 @ 0x83BEA30 - .4byte gMapScripts_ThreeIsland_House5 @ 0x817191F + .4byte ThreeIsland_House5_MapEvents @ 0x83BEA30 + .4byte ThreeIsland_House5_MapScripts @ 0x817191F .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_Mart/header.inc b/data/maps/ThreeIsland_Mart/header.inc index c3ed2bdf8..1bf63765e 100644 --- a/data/maps/ThreeIsland_Mart/header.inc +++ b/data/maps/ThreeIsland_Mart/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Mart:: @ 8351CD8 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_ThreeIsland_Mart @ 0x83BE930 - .4byte gMapScripts_ThreeIsland_Mart @ 0x817188C + .4byte ThreeIsland_Mart_MapEvents @ 0x83BE930 + .4byte ThreeIsland_Mart_MapScripts @ 0x817188C .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc index 25fa4275c..d65a7ef6a 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ ThreeIsland_PokemonCenter_1F:: @ 8351CA0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_ThreeIsland_PokemonCenter_1F @ 0x83BE828 - .4byte gMapScripts_ThreeIsland_PokemonCenter_1F @ 0x8171832 + .4byte ThreeIsland_PokemonCenter_1F_MapEvents @ 0x83BE828 + .4byte ThreeIsland_PokemonCenter_1F_MapScripts @ 0x8171832 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc index 40eedca05..83ab3678c 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ ThreeIsland_PokemonCenter_2F:: @ 8351CBC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_ThreeIsland_PokemonCenter_2F @ 0x83BE8B4 - .4byte gMapScripts_ThreeIsland_PokemonCenter_2F @ 0x8171865 + .4byte ThreeIsland_PokemonCenter_2F_MapEvents @ 0x83BE8B4 + .4byte ThreeIsland_PokemonCenter_2F_MapScripts @ 0x8171865 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/ThreeIsland_Port/header.inc b/data/maps/ThreeIsland_Port/header.inc index 6d7c48e29..7fac5fe54 100644 --- a/data/maps/ThreeIsland_Port/header.inc +++ b/data/maps/ThreeIsland_Port/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Port:: @ 8350B74 .4byte ThreeIsland_Port_Layout @ 0x8328380 - .4byte gMapEvents_ThreeIsland_Port @ 0x83B8B10 - .4byte gMapScripts_ThreeIsland_Port @ 0x8168789 + .4byte ThreeIsland_Port_MapEvents @ 0x83B8B10 + .4byte ThreeIsland_Port_MapScripts @ 0x8168789 .4byte ThreeIsland_Port_MapConnections @ 0x8352D78 .2byte BGM_FRLG_ROUTE_3 .2byte 241 diff --git a/data/maps/TwoIsland/header.inc b/data/maps/TwoIsland/header.inc index 813ef23bd..698e7544b 100644 --- a/data/maps/TwoIsland/header.inc +++ b/data/maps/TwoIsland/header.inc @@ -1,7 +1,7 @@ TwoIsland:: @ 8350784 .4byte TwoIsland_Layout @ 0x8321EB8 - .4byte gMapEvents_TwoIsland @ 0x83B6074 - .4byte gMapScripts_TwoIsland @ 0x8167564 + .4byte TwoIsland_MapEvents @ 0x83B6074 + .4byte TwoIsland_MapScripts @ 0x8167564 .4byte TwoIsland_MapConnections @ 0x8352960 .2byte BGM_FRLG_ISLAND_ONE .2byte 231 diff --git a/data/maps/TwoIsland_CapeBrink/header.inc b/data/maps/TwoIsland_CapeBrink/header.inc index 0e8ec9654..d97cc38a1 100644 --- a/data/maps/TwoIsland_CapeBrink/header.inc +++ b/data/maps/TwoIsland_CapeBrink/header.inc @@ -1,7 +1,7 @@ TwoIsland_CapeBrink:: @ 8350B3C .4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8 - .4byte gMapEvents_TwoIsland_CapeBrink @ 0x83B8964 - .4byte gMapScripts_TwoIsland_CapeBrink @ 0x8168775 + .4byte TwoIsland_CapeBrink_MapEvents @ 0x83B8964 + .4byte TwoIsland_CapeBrink_MapScripts @ 0x8168775 .4byte TwoIsland_CapeBrink_MapConnections @ 0x8352D50 .2byte BGM_FRLG_ROUTE_3 .2byte 239 diff --git a/data/maps/TwoIsland_CapeBrink_House/header.inc b/data/maps/TwoIsland_CapeBrink_House/header.inc index 37cc779c7..a5cb71beb 100644 --- a/data/maps/TwoIsland_CapeBrink_House/header.inc +++ b/data/maps/TwoIsland_CapeBrink_House/header.inc @@ -1,7 +1,7 @@ TwoIsland_CapeBrink_House:: @ 8351F94 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_TwoIsland_CapeBrink_House @ 0x83BF2F4 - .4byte gMapScripts_TwoIsland_CapeBrink_House @ 0x817206B + .4byte TwoIsland_CapeBrink_House_MapEvents @ 0x83BF2F4 + .4byte TwoIsland_CapeBrink_House_MapScripts @ 0x817206B .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/TwoIsland_Harbor/header.inc b/data/maps/TwoIsland_Harbor/header.inc index 9aa296c48..a7f4b3c97 100644 --- a/data/maps/TwoIsland_Harbor/header.inc +++ b/data/maps/TwoIsland_Harbor/header.inc @@ -1,7 +1,7 @@ TwoIsland_Harbor:: @ 8351C68 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_TwoIsland_Harbor @ 0x83BE764 - .4byte gMapScripts_TwoIsland_Harbor @ 0x8171805 + .4byte TwoIsland_Harbor_MapEvents @ 0x83BE764 + .4byte TwoIsland_Harbor_MapScripts @ 0x8171805 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/TwoIsland_House/header.inc b/data/maps/TwoIsland_House/header.inc index 6d0ea5f87..ef308156d 100644 --- a/data/maps/TwoIsland_House/header.inc +++ b/data/maps/TwoIsland_House/header.inc @@ -1,7 +1,7 @@ TwoIsland_House:: @ 8351C14 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_TwoIsland_House @ 0x83BE620 - .4byte gMapScripts_TwoIsland_House @ 0x8171618 + .4byte TwoIsland_House_MapEvents @ 0x83BE620 + .4byte TwoIsland_House_MapScripts @ 0x8171618 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/header.inc b/data/maps/TwoIsland_JoyfulGameCorner/header.inc index 5469caa39..35934a5f6 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/header.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/header.inc @@ -1,7 +1,7 @@ TwoIsland_JoyfulGameCorner:: @ 8351BF8 .4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84 - .4byte gMapEvents_TwoIsland_JoyfulGameCorner @ 0x83BE5EC - .4byte gMapScripts_TwoIsland_JoyfulGameCorner @ 0x81713D0 + .4byte TwoIsland_JoyfulGameCorner_MapEvents @ 0x83BE5EC + .4byte TwoIsland_JoyfulGameCorner_MapScripts @ 0x81713D0 .4byte NULL .2byte BGM_FRLG_GAMECORNER .2byte 272 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/header.inc b/data/maps/TwoIsland_PokemonCenter_1F/header.inc index 294f0ea5b..8999f1fae 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/header.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ TwoIsland_PokemonCenter_1F:: @ 8351C30 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_TwoIsland_PokemonCenter_1F @ 0x83BE68C - .4byte gMapScripts_TwoIsland_PokemonCenter_1F @ 0x81717B4 + .4byte TwoIsland_PokemonCenter_1F_MapEvents @ 0x83BE68C + .4byte TwoIsland_PokemonCenter_1F_MapScripts @ 0x81717B4 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/header.inc b/data/maps/TwoIsland_PokemonCenter_2F/header.inc index 27c60df4b..4c690b5ac 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/header.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ TwoIsland_PokemonCenter_2F:: @ 8351C4C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_TwoIsland_PokemonCenter_2F @ 0x83BE718 - .4byte gMapScripts_TwoIsland_PokemonCenter_2F @ 0x81717DE + .4byte TwoIsland_PokemonCenter_2F_MapEvents @ 0x83BE718 + .4byte TwoIsland_PokemonCenter_2F_MapScripts @ 0x81717DE .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/UndergroundPath_EastEntrance/header.inc b/data/maps/UndergroundPath_EastEntrance/header.inc index 6a2c0105d..298cbfe9d 100644 --- a/data/maps/UndergroundPath_EastEntrance/header.inc +++ b/data/maps/UndergroundPath_EastEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_EastEntrance:: @ 834F5E8 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_EastEntrance @ 0x83AF430 - .4byte gMapScripts_UndergroundPath_EastEntrance @ 0x8160EDD + .4byte UndergroundPath_EastEntrance_MapEvents @ 0x83AF430 + .4byte UndergroundPath_EastEntrance_MapScripts @ 0x8160EDD .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_EastWestTunnel/header.inc b/data/maps/UndergroundPath_EastWestTunnel/header.inc index 2dc7454b8..bd5afdf6d 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/header.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/header.inc @@ -1,7 +1,7 @@ UndergroundPath_EastWestTunnel:: @ 834F5CC .4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898 - .4byte gMapEvents_UndergroundPath_EastWestTunnel @ 0x83AF3E4 - .4byte gMapScripts_UndergroundPath_EastWestTunnel @ 0x8160ED3 + .4byte UndergroundPath_EastWestTunnel_MapEvents @ 0x83AF3E4 + .4byte UndergroundPath_EastWestTunnel_MapScripts @ 0x8160ED3 .4byte NULL .2byte BGM_FRLG_ROUTE_1 .2byte 173 diff --git a/data/maps/UndergroundPath_NorthEntrance/header.inc b/data/maps/UndergroundPath_NorthEntrance/header.inc index 5b6b9b3b8..242d5ece9 100644 --- a/data/maps/UndergroundPath_NorthEntrance/header.inc +++ b/data/maps/UndergroundPath_NorthEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthEntrance:: @ 834F55C .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_NorthEntrance @ 0x83AF25C - .4byte gMapScripts_UndergroundPath_NorthEntrance @ 0x8160E38 + .4byte UndergroundPath_NorthEntrance_MapEvents @ 0x83AF25C + .4byte UndergroundPath_NorthEntrance_MapScripts @ 0x8160E38 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc index 02f7553ba..9ffc1d01b 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthSouthTunnel:: @ 834F578 .4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC - .4byte gMapEvents_UndergroundPath_NorthSouthTunnel @ 0x83AF2D4 - .4byte gMapScripts_UndergroundPath_NorthSouthTunnel @ 0x8160EB5 + .4byte UndergroundPath_NorthSouthTunnel_MapEvents @ 0x83AF2D4 + .4byte UndergroundPath_NorthSouthTunnel_MapScripts @ 0x8160EB5 .4byte NULL .2byte BGM_FRLG_ROUTE_1 .2byte 174 diff --git a/data/maps/UndergroundPath_SouthEntrance/header.inc b/data/maps/UndergroundPath_SouthEntrance/header.inc index 3811bc87d..4e0ef3d33 100644 --- a/data/maps/UndergroundPath_SouthEntrance/header.inc +++ b/data/maps/UndergroundPath_SouthEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_SouthEntrance:: @ 834F594 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_SouthEntrance @ 0x83AF320 - .4byte gMapScripts_UndergroundPath_SouthEntrance @ 0x8160EBF + .4byte UndergroundPath_SouthEntrance_MapEvents @ 0x83AF320 + .4byte UndergroundPath_SouthEntrance_MapScripts @ 0x8160EBF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_WestEntrance/header.inc b/data/maps/UndergroundPath_WestEntrance/header.inc index ed95def83..9ebfd9946 100644 --- a/data/maps/UndergroundPath_WestEntrance/header.inc +++ b/data/maps/UndergroundPath_WestEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_WestEntrance:: @ 834F5B0 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_WestEntrance @ 0x83AF36C - .4byte gMapScripts_UndergroundPath_WestEntrance @ 0x8160EC9 + .4byte UndergroundPath_WestEntrance_MapEvents @ 0x83AF36C + .4byte UndergroundPath_WestEntrance_MapScripts @ 0x8160EC9 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UnknownMap_00_00/header.inc b/data/maps/UnknownMap_00_00/header.inc index 1746127c8..a43fc1ec3 100644 --- a/data/maps/UnknownMap_00_00/header.inc +++ b/data/maps/UnknownMap_00_00/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_00:: @ 834F188 .4byte UnknownMap_00_00_Layout @ 0x82D89E8 - .4byte gMapEvents_UnknownMap_00_00 @ 0x83AE0DC - .4byte gMapScripts_UnknownMap_00_00 @ 0x8160478 + .4byte UnknownMap_00_00_MapEvents @ 0x83AE0DC + .4byte UnknownMap_00_00_MapScripts @ 0x8160478 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 47 diff --git a/data/maps/UnknownMap_00_01/header.inc b/data/maps/UnknownMap_00_01/header.inc index 8f6f03655..2e012f5d3 100644 --- a/data/maps/UnknownMap_00_01/header.inc +++ b/data/maps/UnknownMap_00_01/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_01:: @ 834F1A4 .4byte UnknownMap_00_01_Layout @ 0x82D8AE4 - .4byte gMapEvents_UnknownMap_00_01 @ 0x83AE138 - .4byte gMapScripts_UnknownMap_00_01 @ 0x8160479 + .4byte UnknownMap_00_01_MapEvents @ 0x83AE138 + .4byte UnknownMap_00_01_MapScripts @ 0x8160479 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 48 diff --git a/data/maps/UnknownMap_00_02/header.inc b/data/maps/UnknownMap_00_02/header.inc index 5616915ee..39a06131d 100644 --- a/data/maps/UnknownMap_00_02/header.inc +++ b/data/maps/UnknownMap_00_02/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_02:: @ 834F1C0 .4byte UnknownMap_00_02_Layout @ 0x82D8C98 - .4byte gMapEvents_UnknownMap_00_02 @ 0x83AE1C4 - .4byte gMapScripts_UnknownMap_00_02 @ 0x816047A + .4byte UnknownMap_00_02_MapEvents @ 0x83AE1C4 + .4byte UnknownMap_00_02_MapScripts @ 0x816047A .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 49 diff --git a/data/maps/UnknownMap_00_03/header.inc b/data/maps/UnknownMap_00_03/header.inc index 40833172f..df701c238 100644 --- a/data/maps/UnknownMap_00_03/header.inc +++ b/data/maps/UnknownMap_00_03/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_03:: @ 834F1DC .4byte UnknownMap_00_03_Layout @ 0x82D8DB8 - .4byte gMapEvents_UnknownMap_00_03 @ 0x83AE238 - .4byte gMapScripts_UnknownMap_00_03 @ 0x816047B + .4byte UnknownMap_00_03_MapEvents @ 0x83AE238 + .4byte UnknownMap_00_03_MapScripts @ 0x816047B .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 50 diff --git a/data/maps/UnknownMap_00_04/header.inc b/data/maps/UnknownMap_00_04/header.inc index 9e86235c6..585175a4d 100644 --- a/data/maps/UnknownMap_00_04/header.inc +++ b/data/maps/UnknownMap_00_04/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_04:: @ 834F1F8 .4byte UnknownMap_00_04_Layout @ 0x83388C4 - .4byte gMapEvents_UnknownMap_00_04 @ 0x83AE32C - .4byte gMapScripts_UnknownMap_00_04 @ 0x816047C + .4byte UnknownMap_00_04_MapEvents @ 0x83AE32C + .4byte UnknownMap_00_04_MapScripts @ 0x816047C .4byte NULL .2byte BGM_FRLG_UNION_ROOM .2byte 262 diff --git a/data/maps/UnknownMap_03_50/header.inc b/data/maps/UnknownMap_03_50/header.inc index 8a6415bba..f58894d13 100644 --- a/data/maps/UnknownMap_03_50/header.inc +++ b/data/maps/UnknownMap_03_50/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_50:: @ 8350B90 .4byte UnknownMap_03_50_Layout @ 0x83283A8 - .4byte gMapEvents_UnknownMap_03_50 @ 0x83B8B24 - .4byte gMapScripts_UnknownMap_03_50 @ 0x81687E0 + .4byte UnknownMap_03_50_MapEvents @ 0x83B8B24 + .4byte UnknownMap_03_50_MapScripts @ 0x81687E0 .4byte UnknownMap_03_50_MapConnections @ 0x8352D8C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 242 diff --git a/data/maps/UnknownMap_03_51/header.inc b/data/maps/UnknownMap_03_51/header.inc index 97cd42f9e..e7defa615 100644 --- a/data/maps/UnknownMap_03_51/header.inc +++ b/data/maps/UnknownMap_03_51/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_51:: @ 8350BAC .4byte UnknownMap_03_51_Layout @ 0x83283D0 - .4byte gMapEvents_UnknownMap_03_51 @ 0x83B8B38 - .4byte gMapScripts_UnknownMap_03_51 @ 0x81687E1 + .4byte UnknownMap_03_51_MapEvents @ 0x83B8B38 + .4byte UnknownMap_03_51_MapScripts @ 0x81687E1 .4byte UnknownMap_03_51_MapConnections @ 0x8352DA0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 243 diff --git a/data/maps/UnknownMap_03_52/header.inc b/data/maps/UnknownMap_03_52/header.inc index 2ab4b7e8b..097de23cb 100644 --- a/data/maps/UnknownMap_03_52/header.inc +++ b/data/maps/UnknownMap_03_52/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_52:: @ 8350BC8 .4byte UnknownMap_03_52_Layout @ 0x8329114 - .4byte gMapEvents_UnknownMap_03_52 @ 0x83B8B4C - .4byte gMapScripts_UnknownMap_03_52 @ 0x81687E2 + .4byte UnknownMap_03_52_MapEvents @ 0x83B8B4C + .4byte UnknownMap_03_52_MapScripts @ 0x81687E2 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 244 diff --git a/data/maps/UnknownMap_03_53/header.inc b/data/maps/UnknownMap_03_53/header.inc index 9ff13c2a4..22e8c0e98 100644 --- a/data/maps/UnknownMap_03_53/header.inc +++ b/data/maps/UnknownMap_03_53/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_53:: @ 8350BE4 .4byte UnknownMap_03_53_Layout @ 0x8329C78 - .4byte gMapEvents_UnknownMap_03_53 @ 0x83B8B60 - .4byte gMapScripts_UnknownMap_03_53 @ 0x81687E3 + .4byte UnknownMap_03_53_MapEvents @ 0x83B8B60 + .4byte UnknownMap_03_53_MapScripts @ 0x81687E3 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 245 diff --git a/data/maps/UnknownMap_18_01/header.inc b/data/maps/UnknownMap_18_01/header.inc index 23c7c3a83..02fb72d6f 100644 --- a/data/maps/UnknownMap_18_01/header.inc +++ b/data/maps/UnknownMap_18_01/header.inc @@ -1,7 +1,7 @@ UnknownMap_18_01:: @ 835185C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnknownMap_18_01 @ 0x83BD758 - .4byte gMapScripts_UnknownMap_18_01 @ 0x816FA8C + .4byte UnknownMap_18_01_MapEvents @ 0x83BD758 + .4byte UnknownMap_18_01_MapScripts @ 0x816FA8C .4byte NULL .2byte BGM_FRLG_ROUTE_3 .2byte 7 diff --git a/data/maps/UnusedHouse_27_00/header.inc b/data/maps/UnusedHouse_27_00/header.inc index f4032f2f3..27571a106 100644 --- a/data/maps/UnusedHouse_27_00/header.inc +++ b/data/maps/UnusedHouse_27_00/header.inc @@ -1,7 +1,7 @@ UnusedHouse_27_00:: @ 8351A38 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnusedHouse_27_00 @ 0x83BDF30 - .4byte gMapScripts_UnusedHouse_27_00 @ 0x81704FA + .4byte UnusedHouse_27_00_MapEvents @ 0x83BDF30 + .4byte UnusedHouse_27_00_MapScripts @ 0x81704FA .4byte NULL .2byte BGM_FRLG_ROUTE_3 .2byte 7 diff --git a/data/maps/UnusedHouse_29_00/header.inc b/data/maps/UnusedHouse_29_00/header.inc index 65f677125..79c745105 100644 --- a/data/maps/UnusedHouse_29_00/header.inc +++ b/data/maps/UnusedHouse_29_00/header.inc @@ -1,7 +1,7 @@ UnusedHouse_29_00:: @ 8351A70 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnusedHouse_29_00 @ 0x83BDFA0 - .4byte gMapScripts_UnusedHouse_29_00 @ 0x8170522 + .4byte UnusedHouse_29_00_MapEvents @ 0x83BDFA0 + .4byte UnusedHouse_29_00_MapScripts @ 0x8170522 .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 7 diff --git a/data/maps/UnusedHouse_31_05/header.inc b/data/maps/UnusedHouse_31_05/header.inc index 71d619417..ad4098e09 100644 --- a/data/maps/UnusedHouse_31_05/header.inc +++ b/data/maps/UnusedHouse_31_05/header.inc @@ -1,7 +1,7 @@ UnusedHouse_31_05:: @ 8351B34 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_UnusedHouse_31_05 @ 0x83BE254 - .4byte gMapScripts_UnusedHouse_31_05 @ 0x8170BE3 + .4byte UnusedHouse_31_05_MapEvents @ 0x83BE254 + .4byte UnusedHouse_31_05_MapScripts @ 0x8170BE3 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 13 diff --git a/data/maps/VermilionCity/header.inc b/data/maps/VermilionCity/header.inc index a2ce4787e..efc42750d 100644 --- a/data/maps/VermilionCity/header.inc +++ b/data/maps/VermilionCity/header.inc @@ -1,7 +1,7 @@ VermilionCity:: @ 83506A4 .4byte VermilionCity_Layout @ 0x82E1534 - .4byte gMapEvents_VermilionCity @ 0x83B5648 - .4byte gMapScripts_VermilionCity @ 0x81668DC + .4byte VermilionCity_MapEvents @ 0x83B5648 + .4byte VermilionCity_MapScripts @ 0x81668DC .4byte VermilionCity_MapConnections @ 0x835283C .2byte BGM_FRLG_VERMILION_CITY .2byte 83 diff --git a/data/maps/VermilionCity_Gym/header.inc b/data/maps/VermilionCity_Gym/header.inc index a3cf66201..d80a1d2f1 100644 --- a/data/maps/VermilionCity_Gym/header.inc +++ b/data/maps/VermilionCity_Gym/header.inc @@ -1,7 +1,7 @@ VermilionCity_Gym:: @ 83511B0 .4byte VermilionCity_Gym_Layout @ 0x82D6E28 - .4byte gMapEvents_VermilionCity_Gym @ 0x83BAFD0 - .4byte gMapScripts_VermilionCity_Gym @ 0x816B69E + .4byte VermilionCity_Gym_MapEvents @ 0x83BAFD0 + .4byte VermilionCity_Gym_MapScripts @ 0x816B69E .4byte NULL .2byte BGM_FRLG_GYM .2byte 25 diff --git a/data/maps/VermilionCity_House1/header.inc b/data/maps/VermilionCity_House1/header.inc index 73adfa317..789b28501 100644 --- a/data/maps/VermilionCity_House1/header.inc +++ b/data/maps/VermilionCity_House1/header.inc @@ -1,7 +1,7 @@ VermilionCity_House1:: @ 8351108 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House1 @ 0x83BAB6C - .4byte gMapScripts_VermilionCity_House1 @ 0x816B3A6 + .4byte VermilionCity_House1_MapEvents @ 0x83BAB6C + .4byte VermilionCity_House1_MapScripts @ 0x816B3A6 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/VermilionCity_House2/header.inc b/data/maps/VermilionCity_House2/header.inc index d80ed7c4f..a536abeb6 100644 --- a/data/maps/VermilionCity_House2/header.inc +++ b/data/maps/VermilionCity_House2/header.inc @@ -1,7 +1,7 @@ VermilionCity_House2:: @ 8351178 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House2 @ 0x83BADEC - .4byte gMapScripts_VermilionCity_House2 @ 0x816B5D6 + .4byte VermilionCity_House2_MapEvents @ 0x83BADEC + .4byte VermilionCity_House2_MapScripts @ 0x816B5D6 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 6 diff --git a/data/maps/VermilionCity_House3/header.inc b/data/maps/VermilionCity_House3/header.inc index 739ca82ff..2ab2f1ee8 100644 --- a/data/maps/VermilionCity_House3/header.inc +++ b/data/maps/VermilionCity_House3/header.inc @@ -1,7 +1,7 @@ VermilionCity_House3:: @ 83511CC .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House3 @ 0x83BB068 - .4byte gMapScripts_VermilionCity_House3 @ 0x816BAA9 + .4byte VermilionCity_House3_MapEvents @ 0x83BB068 + .4byte VermilionCity_House3_MapScripts @ 0x816BAA9 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 6 diff --git a/data/maps/VermilionCity_Mart/header.inc b/data/maps/VermilionCity_Mart/header.inc index 06b0c1a40..d82ee87a5 100644 --- a/data/maps/VermilionCity_Mart/header.inc +++ b/data/maps/VermilionCity_Mart/header.inc @@ -1,7 +1,7 @@ VermilionCity_Mart:: @ 8351194 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_VermilionCity_Mart @ 0x83BAE60 - .4byte gMapScripts_VermilionCity_Mart @ 0x816B653 + .4byte VermilionCity_Mart_MapEvents @ 0x83BAE60 + .4byte VermilionCity_Mart_MapScripts @ 0x816B653 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/header.inc b/data/maps/VermilionCity_PokemonCenter_1F/header.inc index 0c20e889c..4f6333c60 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/header.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonCenter_1F:: @ 8351124 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_VermilionCity_PokemonCenter_1F @ 0x83BAC48 - .4byte gMapScripts_VermilionCity_PokemonCenter_1F @ 0x816B424 + .4byte VermilionCity_PokemonCenter_1F_MapEvents @ 0x83BAC48 + .4byte VermilionCity_PokemonCenter_1F_MapScripts @ 0x816B424 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/header.inc b/data/maps/VermilionCity_PokemonCenter_2F/header.inc index 34192d487..7cb7acc59 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/header.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonCenter_2F:: @ 8351140 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_VermilionCity_PokemonCenter_2F @ 0x83BACD4 - .4byte gMapScripts_VermilionCity_PokemonCenter_2F @ 0x816B457 + .4byte VermilionCity_PokemonCenter_2F_MapEvents @ 0x83BACD4 + .4byte VermilionCity_PokemonCenter_2F_MapScripts @ 0x816B457 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/VermilionCity_PokemonFanClub/header.inc b/data/maps/VermilionCity_PokemonFanClub/header.inc index df116263d..930f0d08f 100644 --- a/data/maps/VermilionCity_PokemonFanClub/header.inc +++ b/data/maps/VermilionCity_PokemonFanClub/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonFanClub:: @ 835115C .4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8 - .4byte gMapEvents_VermilionCity_PokemonFanClub @ 0x83BADA8 - .4byte gMapScripts_VermilionCity_PokemonFanClub @ 0x816B47E + .4byte VermilionCity_PokemonFanClub_MapEvents @ 0x83BADA8 + .4byte VermilionCity_PokemonFanClub_MapScripts @ 0x816B47E .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 273 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 8717475ee..8c6c1c85c 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_1F:: @ 834F658 .4byte VictoryRoad_1F_Layout @ 0x83043CC - .4byte gMapEvents_VictoryRoad_1F @ 0x83AF5C0 - .4byte gMapScripts_VictoryRoad_1F @ 0x8160F05 + .4byte VictoryRoad_1F_MapEvents @ 0x83AF5C0 + .4byte VictoryRoad_1F_MapScripts @ 0x8160F05 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 125 diff --git a/data/maps/VictoryRoad_2F/header.inc b/data/maps/VictoryRoad_2F/header.inc index 6d96addf8..5c1c06256 100644 --- a/data/maps/VictoryRoad_2F/header.inc +++ b/data/maps/VictoryRoad_2F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_2F:: @ 834F674 .4byte VictoryRoad_2F_Layout @ 0x8304CB4 - .4byte gMapEvents_VictoryRoad_2F @ 0x83AF774 - .4byte gMapScripts_VictoryRoad_2F @ 0x8160F92 + .4byte VictoryRoad_2F_MapEvents @ 0x83AF774 + .4byte VictoryRoad_2F_MapScripts @ 0x8160F92 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 126 diff --git a/data/maps/VictoryRoad_3F/header.inc b/data/maps/VictoryRoad_3F/header.inc index 7e23cd6ee..85fb25b59 100644 --- a/data/maps/VictoryRoad_3F/header.inc +++ b/data/maps/VictoryRoad_3F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_3F:: @ 834F690 .4byte VictoryRoad_3F_Layout @ 0x8305494 - .4byte gMapEvents_VictoryRoad_3F @ 0x83AF8E0 - .4byte gMapScripts_VictoryRoad_3F @ 0x81610AA + .4byte VictoryRoad_3F_MapEvents @ 0x83AF8E0 + .4byte VictoryRoad_3F_MapScripts @ 0x81610AA .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 127 diff --git a/data/maps/ViridianCity/header.inc b/data/maps/ViridianCity/header.inc index a2442e278..6c027f11f 100644 --- a/data/maps/ViridianCity/header.inc +++ b/data/maps/ViridianCity/header.inc @@ -1,7 +1,7 @@ ViridianCity:: @ 8350634 .4byte ViridianCity_Layout @ 0x82DE3E4 - .4byte gMapEvents_ViridianCity @ 0x83B4FE0 - .4byte gMapScripts_ViridianCity @ 0x81658D3 + .4byte ViridianCity_MapEvents @ 0x83B4FE0 + .4byte ViridianCity_MapScripts @ 0x81658D3 .4byte ViridianCity_MapConnections @ 0x8352798 .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 79 diff --git a/data/maps/ViridianCity_Gym/header.inc b/data/maps/ViridianCity_Gym/header.inc index 52708bd39..5edc31d15 100644 --- a/data/maps/ViridianCity_Gym/header.inc +++ b/data/maps/ViridianCity_Gym/header.inc @@ -1,7 +1,7 @@ ViridianCity_Gym:: @ 8350DDC .4byte ViridianCity_Gym_Layout @ 0x82D86AC - .4byte gMapEvents_ViridianCity_Gym @ 0x83B9B78 - .4byte gMapScripts_ViridianCity_Gym @ 0x8169EC9 + .4byte ViridianCity_Gym_MapEvents @ 0x83B9B78 + .4byte ViridianCity_Gym_MapScripts @ 0x8169EC9 .4byte NULL .2byte BGM_FRLG_GYM .2byte 37 diff --git a/data/maps/ViridianCity_House1/header.inc b/data/maps/ViridianCity_House1/header.inc index a1112bfd1..e29f218c9 100644 --- a/data/maps/ViridianCity_House1/header.inc +++ b/data/maps/ViridianCity_House1/header.inc @@ -1,7 +1,7 @@ ViridianCity_House1:: @ 8350DC0 .4byte ViridianCity_House1_Layout @ 0x833AEAC - .4byte gMapEvents_ViridianCity_House1 @ 0x83B9A38 - .4byte gMapScripts_ViridianCity_House1 @ 0x8169E9A + .4byte ViridianCity_House1_MapEvents @ 0x83B9A38 + .4byte ViridianCity_House1_MapScripts @ 0x8169E9A .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 276 diff --git a/data/maps/ViridianCity_House2/header.inc b/data/maps/ViridianCity_House2/header.inc index 62019f35e..c45bfff14 100644 --- a/data/maps/ViridianCity_House2/header.inc +++ b/data/maps/ViridianCity_House2/header.inc @@ -1,7 +1,7 @@ ViridianCity_House2:: @ 8350DF8 .4byte ViridianCity_House2_Layout @ 0x8338D20 - .4byte gMapEvents_ViridianCity_House2 @ 0x83B9C10 - .4byte gMapScripts_ViridianCity_House2 @ 0x816A07C + .4byte ViridianCity_House2_MapEvents @ 0x83B9C10 + .4byte ViridianCity_House2_MapScripts @ 0x816A07C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 266 diff --git a/data/maps/ViridianCity_Mart/header.inc b/data/maps/ViridianCity_Mart/header.inc index 7b250540a..29cfbf0d0 100644 --- a/data/maps/ViridianCity_Mart/header.inc +++ b/data/maps/ViridianCity_Mart/header.inc @@ -1,7 +1,7 @@ ViridianCity_Mart:: @ 8350E14 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_ViridianCity_Mart @ 0x83B9C84 - .4byte gMapScripts_ViridianCity_Mart @ 0x816A1D3 + .4byte ViridianCity_Mart_MapEvents @ 0x83B9C84 + .4byte ViridianCity_Mart_MapScripts @ 0x816A1D3 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/header.inc b/data/maps/ViridianCity_PokemonCenter_1F/header.inc index 3910c6ea9..6e26020eb 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/header.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ ViridianCity_PokemonCenter_1F:: @ 8350E30 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_ViridianCity_PokemonCenter_1F @ 0x83B9D18 - .4byte gMapScripts_ViridianCity_PokemonCenter_1F @ 0x816A2C0 + .4byte ViridianCity_PokemonCenter_1F_MapEvents @ 0x83B9D18 + .4byte ViridianCity_PokemonCenter_1F_MapScripts @ 0x816A2C0 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/header.inc b/data/maps/ViridianCity_PokemonCenter_2F/header.inc index 3fa490a6e..0b1cdbcf7 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/header.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ ViridianCity_PokemonCenter_2F:: @ 8350E4C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_ViridianCity_PokemonCenter_2F @ 0x83B9DA4 - .4byte gMapScripts_ViridianCity_PokemonCenter_2F @ 0x816A2F3 + .4byte ViridianCity_PokemonCenter_2F_MapEvents @ 0x83B9DA4 + .4byte ViridianCity_PokemonCenter_2F_MapScripts @ 0x816A2F3 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/ViridianForest/header.inc b/data/maps/ViridianForest/header.inc index 9a8cee281..db9e41ad1 100644 --- a/data/maps/ViridianForest/header.inc +++ b/data/maps/ViridianForest/header.inc @@ -1,7 +1,7 @@ ViridianForest:: @ 834F214 .4byte ViridianForest_Layout @ 0x82FE46C - .4byte gMapEvents_ViridianForest @ 0x83AE4D8 - .4byte gMapScripts_ViridianForest @ 0x816051F + .4byte ViridianForest_MapEvents @ 0x83AE4D8 + .4byte ViridianForest_MapScripts @ 0x816051F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 117 |