Leahnaya/pokegold-spaceworld
1
0
Fork 0
mirror of https://github.com/pret/pokegold-spaceworld.git synced 2026-04-25 15:39:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify bg_event usage, and document map event macro arguments

Browse Source
This commit is contained in:
Rangi 2020-09-22 15:12:27 -04:00
parent e6a99b8f9e
commit 95a66c7110
289 changed files with 755 additions and 734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/maps/objects/Baadon.asm
View File

@ -22,10 +22,10 @@ Baadon_MapEvents::
warp_event 9, 5, FONTO_ROUTE_GATE_2, 2, 53
def_bg_events
bg_event 4, 4, 0, 1
bg_event 16, 4, 0, 2
bg_event 11, 10, 0, 3
bg_event 6, 14, 0, 4
bg_event 4, 4, 1
bg_event 16, 4, 2
bg_event 11, 10, 3
bg_event 6, 14, 4
def_object_events
object_event 14, 8, SPRITE_SUPER_NERD, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0

6
data/maps/objects/BullForest.asm
View File

@ -21,9 +21,9 @@ BullForest_MapEvents::
warp_event 3, 22, BULL_HOUSE_4, 1, 314
def_bg_events
bg_event 26, 6, 0, 1
bg_event 2, 16, 0, 2
bg_event 14, 18, 0, 3
bg_event 26, 6, 1
bg_event 2, 16, 2
bg_event 14, 18, 3
def_object_events
object_event 21, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0

10
data/maps/objects/Fonto.asm
View File

@ -18,11 +18,11 @@ Fonto_MapEvents::
warp_event 16, 13, FONTO_LAB, 1, 121
def_bg_events
bg_event 15, 4, 0, 1
bg_event 14, 6, 0, 2
bg_event 4, 12, 0, 3
bg_event 6, 12, 0, 4
bg_event 10, 12, 0, 5
bg_event 15, 4, 1
bg_event 14, 6, 2
bg_event 4, 12, 3
bg_event 6, 12, 4
bg_event 10, 12, 5
def_object_events
object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

16
data/maps/objects/Haiteku.asm
View File

@ -20,14 +20,14 @@ Haiteku_MapEvents::
warp_event 7, 27, HAITEKU_AQUARIUM_1F, 2, 368
def_bg_events
bg_event 24, 7, 0, 1
bg_event 12, 12, 0, 2
bg_event 32, 10, 0, 3
bg_event 10, 17, 0, 4
bg_event 32, 16, 0, 5
bg_event 10, 27, 0, 6
bg_event 30, 25, 0, 7
bg_event 24, 28, 0, 8
bg_event 24, 7, 1
bg_event 12, 12, 2
bg_event 32, 10, 3
bg_event 10, 17, 4
bg_event 32, 16, 5
bg_event 10, 27, 6
bg_event 30, 25, 7
bg_event 24, 28, 8
def_object_events
object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0

24
data/maps/objects/Kanto.asm
View File

@ -42,18 +42,18 @@ Kanto_MapEvents::
warp_event 21, 13, KANTO_GAMEFREAK_HQ_1, 5, 263
def_bg_events
bg_event 14, 4, 0, 1
bg_event 42, 4, 0, 2
bg_event 54, 8, 0, 3
bg_event 4, 18, 0, 4
bg_event 18, 18, 0, 5
bg_event 26, 19, 0, 6
bg_event 46, 18, 0, 7
bg_event 8, 38, 0, 8
bg_event 16, 38, 0, 9
bg_event 6, 41, 0, 10
bg_event 12, 45, 0, 11
bg_event 50, 30, 0, 12
bg_event 14, 4, 1
bg_event 42, 4, 2
bg_event 54, 8, 3
bg_event 4, 18, 4
bg_event 18, 18, 5
bg_event 26, 19, 6
bg_event 46, 18, 7
bg_event 8, 38, 8
bg_event 16, 38, 9
bg_event 6, 41, 10
bg_event 12, 45, 11
bg_event 50, 30, 12
def_object_events

10
data/maps/objects/Newtype.asm
View File

@ -26,11 +26,11 @@ Newtype_MapEvents::
warp_event 19, 5, SUGAR_ROUTE_GATE, 2, 88
def_bg_events
bg_event 0, 8, 0, 1
bg_event 8, 8, 0, 2
bg_event 8, 14, 0, 3
bg_event 30, 15, 0, 4
bg_event 30, 21, 0, 5
bg_event 0, 8, 1
bg_event 8, 8, 2
bg_event 8, 14, 3
bg_event 30, 15, 4
bg_event 30, 21, 5
def_object_events
object_event 5, 10, SPRITE_SILVER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

8
data/maps/objects/North.asm
View File

@ -15,10 +15,10 @@ North_MapEvents::
warp_event 13, 10, NORTH_POKECENTER_1F, 1, 103
def_bg_events
bg_event 12, 4, 0, 1
bg_event 16, 6, 0, 2
bg_event 14, 10, 0, 3
bg_event 8, 12, 0, 4
bg_event 12, 4, 1
bg_event 16, 6, 2
bg_event 14, 10, 3
bg_event 8, 12, 4
def_object_events
object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

24
data/maps/objects/OldCity.asm
View File

@ -26,18 +26,18 @@ OldCity_MapEvents::
warp_event 22, 26, OLD_CITY_SCHOOL, 1, 376
def_bg_events
bg_event 8, 14, 0, 1
bg_event 8, 16, 0, 2
bg_event 28, 16, 0, 3
bg_event 20, 22, 0, 4
bg_event 26, 22, 0, 5
bg_event 8, 26, 0, 6
bg_event 28, 28, 0, 7
bg_event 20, 29, 0, 8
bg_event 4, 32, 0, 9
bg_event 30, 22, 0, 10
bg_event 4, 14, 0, 11
bg_event 5, 14, 0, 11
bg_event 8, 14, 1
bg_event 8, 16, 2
bg_event 28, 16, 3
bg_event 20, 22, 4
bg_event 26, 22, 5
bg_event 8, 26, 6
bg_event 28, 28, 7
bg_event 20, 29, 8
bg_event 4, 32, 9
bg_event 30, 22, 10
bg_event 4, 14, 11
bg_event 5, 14, 11
def_object_events
object_event 8, 30, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

12
data/maps/objects/OldCityBillsHouse.asm
View File

@ -12,12 +12,12 @@ OldCityBillsHouse_MapEvents::
warp_event 4, 7, OLD_CITY, 7, 43
def_bg_events
bg_event 2, 1, 0, 1
bg_event 3, 1, 0, 2
bg_event 4, 1, 0, 3
bg_event 6, 1, 0, 4
bg_event 7, 1, 0, 5
bg_event 1, 1, 0, 6
bg_event 2, 1, 1
bg_event 3, 1, 2
bg_event 4, 1, 3
bg_event 6, 1, 4
bg_event 7, 1, 5
bg_event 1, 1, 6
def_object_events
object_event 5, 4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

4
data/maps/objects/OldCityGym.asm
View File

@ -12,8 +12,8 @@ OldCityGym_MapEvents::
warp_event 5, 17, OLD_CITY, 4, 102
def_bg_events
bg_event 3, 15, 0, 1
bg_event 6, 15, 0, 1
bg_event 3, 15, 1
bg_event 6, 15, 1
def_object_events
object_event 4, 5, SPRITE_HAYATO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

8
data/maps/objects/OldCityHouse.asm
View File

@ -12,10 +12,10 @@ OldCityHouse_MapEvents::
warp_event 4, 7, OLD_CITY, 9, 43
def_bg_events
bg_event 0, 1, 0, 1
bg_event 1, 1, 0, 2
bg_event 2, 1, 0, 3
bg_event 7, 1, 0, 4
bg_event 0, 1, 1
bg_event 1, 1, 2
bg_event 2, 1, 3
bg_event 7, 1, 4
def_object_events
object_event 2, 3, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

10
data/maps/objects/OldCityKurtsHouse.asm
View File

@ -12,11 +12,11 @@ OldCityKurtsHouse_MapEvents::
warp_event 4, 7, OLD_CITY, 11, 59
def_bg_events
bg_event 4, 1, 0, 1
bg_event 5, 1, 0, 2
bg_event 12, 1, 0, 3
bg_event 14, 0, 0, 4
bg_event 15, 0, 0, 4
bg_event 4, 1, 1
bg_event 5, 1, 2
bg_event 12, 1, 3
bg_event 14, 0, 4
bg_event 15, 0, 4
def_object_events
object_event 2, 2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/OldCityMart.asm
View File

@ -12,7 +12,7 @@ OldCityMart_MapEvents::
warp_event 5, 7, OLD_CITY, 8, 51
def_bg_events
bg_event 0, 7, 0, 1
bg_event 0, 7, 1
def_object_events
object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

8
data/maps/objects/OldCityMuseum.asm
View File

@ -12,10 +12,10 @@ OldCityMuseum_MapEvents::
warp_event 3, 7, OLD_CITY, 2, 58
def_bg_events
bg_event 2, 3, 0, 1
bg_event 5, 4, 0, 2
bg_event 9, 4, 0, 3
bg_event 13, 4, 0, 4
bg_event 2, 3, 1
bg_event 5, 4, 2
bg_event 9, 4, 3
bg_event 13, 4, 4
def_object_events
object_event 1, 5, SPRITE_FISHER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/OldCityPokecenter1F.asm
View File

@ -13,7 +13,7 @@ OldCityPokecenter1F_MapEvents::
warp_event 0, 7, OLD_CITY_POKECENTER_2F, 1, 57
def_bg_events
bg_event 13, 1, 0, 1
bg_event 13, 1, 1
def_object_events
object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/OldCityPokecenter2F.asm
View File

@ -14,7 +14,7 @@ OldCityPokecenter2F_MapEvents::
warp_event 13, 2, OLD_CITY_POKECENTER_TIME_MACHINE, 1, 35
def_bg_events
bg_event 1, 1, 0, 1
bg_event 1, 1, 1
def_object_events
object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/OldCityPokecenterTimeMachine.asm
View File

@ -12,7 +12,7 @@ OldCityPokecenterTimeMachine_MapEvents::
warp_event 3, 7, OLD_CITY_POKECENTER_2F, 4, 58
def_bg_events
bg_event 15, 3, 0, 1
bg_event 15, 3, 1
def_object_events
object_event 13, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

8
data/maps/objects/OldCitySchool.asm
View File

@ -12,10 +12,10 @@ OldCitySchool_MapEvents::
warp_event 4, 15, OLD_CITY, 14, 83
def_bg_events
bg_event 0, 1, 0, 1
bg_event 1, 1, 0, 1
bg_event 3, 0, 0, 2
bg_event 4, 0, 0, 2
bg_event 0, 1, 1
bg_event 1, 1, 1
bg_event 3, 0, 2
bg_event 4, 0, 2
def_object_events
object_event 2, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

6
data/maps/objects/OldCityTower1F.asm
View File

@ -13,9 +13,9 @@ OldCityTower1F_MapEvents::
warp_event 0, 1, OLD_CITY_TOWER_2F, 1, 11
def_bg_events
bg_event 2, 6, 0, 1
bg_event 5, 6, 0, 2
bg_event 4, 1, 0, 3
bg_event 2, 6, 1
bg_event 5, 6, 2
bg_event 4, 1, 3
def_object_events
object_event 0, 2, SPRITE_SAGE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0

4
data/maps/objects/OldCityTower2F.asm
View File

@ -12,8 +12,8 @@ OldCityTower2F_MapEvents::
warp_event 7, 7, OLD_CITY_TOWER_3F, 2, 44
def_bg_events
bg_event 3, 0, 0, 1
bg_event 4, 1, 0, 2
bg_event 3, 0, 1
bg_event 4, 1, 2
def_object_events
object_event 2, 3, SPRITE_MEDIUM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0

4
data/maps/objects/OldCityTower3F.asm
View File

@ -12,8 +12,8 @@ OldCityTower3F_MapEvents::
warp_event 7, 7, OLD_CITY_TOWER_2F, 2, 44
def_bg_events
bg_event 3, 0, 0, 1
bg_event 4, 1, 0, 2
bg_event 3, 0, 1
bg_event 4, 1, 2
def_object_events
object_event 2, 3, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0

4
data/maps/objects/OldCityTower4F.asm
View File

@ -12,8 +12,8 @@ OldCityTower4F_MapEvents::
warp_event 7, 7, OLD_CITY_TOWER_5F, 1, 44
def_bg_events
bg_event 3, 0, 0, 1
bg_event 4, 1, 0, 2
bg_event 3, 0, 1
bg_event 4, 1, 2
def_object_events
object_event 3, 2, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0

6
data/maps/objects/OldCityTower5F.asm
View File

@ -11,9 +11,9 @@ OldCityTower5F_MapEvents::
warp_event 5, 5, OLD_CITY_TOWER_4F, 2, 30
def_bg_events
bg_event 2, 0, 0, 1
bg_event 3, 0, 0, 2
bg_event 4, 1, 0, 3
bg_event 2, 0, 1
bg_event 3, 0, 2
bg_event 4, 1, 3
def_object_events
object_event 2, 3, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

10
data/maps/objects/PlayerHouse1F.asm
View File

@ -13,11 +13,11 @@ PlayerHouse1F_MapEvents::
warp_event 9, 0, PLAYER_HOUSE_2F, 1, 16
def_bg_events
bg_event 0, 1, 0, 1
bg_event 1, 1, 0, 2
bg_event 2, 1, 0, 3
bg_event 4, 1, 0, 4
bg_event 5, 1, 0, 5
bg_event 0, 1, 1
bg_event 1, 1, 2
bg_event 2, 1, 3
bg_event 4, 1, 4
bg_event 5, 1, 5
def_object_events
object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

10
data/maps/objects/PlayerHouse2F.asm
View File

@ -11,11 +11,11 @@ PlayerHouse2F_MapEvents::
warp_event 9, 0, PLAYER_HOUSE_1F, 3, 16
def_bg_events
bg_event 1, 1, 0, 1
bg_event 2, 1, 0, 2
bg_event 3, 1, 0, 3
bg_event 5, 1, 0, 4
bg_event 7, 2, 0, 5
bg_event 1, 1, 1
bg_event 2, 1, 2
bg_event 3, 1, 3
bg_event 5, 1, 4
bg_event 7, 2, 5
def_object_events
object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

4
data/maps/objects/Route1Gate2F.asm
View File

@ -11,8 +11,8 @@ Route1Gate2F_MapEvents::
warp_event 5, 0, ROUTE_1_GATE_1F, 5, 13
def_bg_events
bg_event 1, 0, 0, 1
bg_event 3, 0, 0, 2
bg_event 1, 0, 1
bg_event 3, 0, 2
def_object_events
object_event 3, 3, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0

4
data/maps/objects/Route1P1.asm
View File

@ -14,8 +14,8 @@ Route1P1_MapEvents::
warp_event 8, 9, SHIZUKANA_OKA, 3, 110
def_bg_events
bg_event 12, 7, 0, 1
bg_event 20, 8, 0, 2
bg_event 12, 7, 1
bg_event 20, 8, 2
def_object_events
object_event 20, 5, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/Route1P2.asm
View File

@ -16,7 +16,7 @@ Route1P2_MapEvents::
warp_event 9, 25, SHIZUKANA_OKA, 9, 213
def_bg_events
bg_event 10, 20, 0, 1
bg_event 10, 20, 1
def_object_events
object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

6
data/maps/objects/Route2.asm
View File

@ -14,9 +14,9 @@ Route2_MapEvents::
warp_event 15, 4, ROUTE_2_HOUSE, 1, 71
def_bg_events
bg_event 15, 4, 0, 3
bg_event 14, 5, 0, 1
bg_event 24, 10, 0, 2
bg_event 15, 4, 3
bg_event 14, 5, 1
bg_event 24, 10, 2
def_object_events
object_event 19, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0

4
data/maps/objects/Route2Gate2F.asm
View File

@ -11,8 +11,8 @@ Route2Gate2F_MapEvents::
warp_event 5, 0, ROUTE_2_GATE_1F, 5, 13
def_bg_events
bg_event 1, 0, 0, 1
bg_event 3, 0, 0, 2
bg_event 1, 0, 1
bg_event 3, 0, 2
def_object_events
object_event 2, 2, SPRITE_LASS, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0

12
data/maps/objects/Route2House.asm
View File

@ -12,12 +12,12 @@ Route2House_MapEvents::
warp_event 5, 7, ROUTE_2, 2, 43
def_bg_events
bg_event 0, 0, 0, 1
bg_event 2, 0, 0, 1
bg_event 4, 0, 0, 1
bg_event 6, 0, 0, 1
bg_event 0, 3, 0, 2
bg_event 4, 3, 0, 3
bg_event 0, 0, 1
bg_event 2, 0, 1
bg_event 4, 0, 1
bg_event 6, 0, 1
bg_event 0, 3, 2
bg_event 4, 3, 3
def_object_events
object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

4
data/maps/objects/ShizukanaOka.asm
View File

@ -20,8 +20,8 @@ ShizukanaOka_MapEvents::
warp_event 9, 0, ROUTE_1_P2, 4, 36
def_bg_events
bg_event 9, 2, 0, 1
bg_event 47, 28, 0, 2
bg_event 9, 2, 1
bg_event 47, 28, 2
def_object_events
object_event 41, 28, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

10
data/maps/objects/SilentHill.asm
View File

@ -18,11 +18,11 @@ SilentHill_MapEvents::
warp_event 15, 11, SILENT_HILL_LAB_FRONT, 2, 104
def_bg_events
bg_event 8, 4, 0, 1
bg_event 14, 4, 0, 2
bg_event 16, 5, 0, 3
bg_event 10, 11, 0, 4
bg_event 6, 12, 0, 5
bg_event 8, 4, 1
bg_event 14, 4, 2
bg_event 16, 5, 3
bg_event 10, 11, 4
bg_event 6, 12, 5
def_object_events
object_event 6, 10, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

12
data/maps/objects/SilentHillHouse.asm
View File

@ -12,12 +12,12 @@ SilentHillHouse_MapEvents::
warp_event 5, 7, SILENT_HILL, 3, 47
def_bg_events
bg_event 0, 1, 0, 1
bg_event 4, 1, 0, 2
bg_event 5, 1, 0, 3
bg_event 9, 1, 0, 4
bg_event 8, 1, 0, 5
bg_event 2, 0, 0, 6
bg_event 0, 1, 1
bg_event 4, 1, 2
bg_event 5, 1, 3
bg_event 9, 1, 4
bg_event 8, 1, 5
bg_event 2, 0, 6
def_object_events
object_event 5, 3, SPRITE_SILVERS_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

10
data/maps/objects/SilentHillLabBack.asm
View File

@ -12,11 +12,11 @@ SilentHillLabBack_MapEvents::
warp_event 4, 7, SILENT_HILL_LAB_FRONT, 3, 43
def_bg_events
bg_event 0, 1, 0, 1
bg_event 1, 1, 0, 2
bg_event 2, 1, 0, 3
bg_event 3, 1, 0, 4
bg_event 6, 0, 0, 5
bg_event 0, 1, 1
bg_event 1, 1, 2
bg_event 2, 1, 3
bg_event 3, 1, 4
bg_event 6, 0, 5
def_object_events
object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

30
data/maps/objects/SilentHillLabFront.asm
View File

@ -13,21 +13,21 @@ SilentHillLabFront_MapEvents::
warp_event 4, 0, SILENT_HILL_LAB_BACK, 2, 13
def_bg_events
bg_event 6, 1, 0, 1
bg_event 2, 0, 0, 2
bg_event 0, 7, 0, 3
bg_event 1, 7, 0, 4
bg_event 2, 7, 0, 5
bg_event 5, 7, 0, 6
bg_event 6, 7, 0, 7
bg_event 7, 7, 0, 8
bg_event 0, 11, 0, 9
bg_event 1, 11, 0, 10
bg_event 2, 11, 0, 11
bg_event 5, 11, 0, 12
bg_event 6, 11, 0, 13
bg_event 7, 11, 0, 14
bg_event 4, 0, 0, 15
bg_event 6, 1, 1
bg_event 2, 0, 2
bg_event 0, 7, 3
bg_event 1, 7, 4
bg_event 2, 7, 5
bg_event 5, 7, 6
bg_event 6, 7, 7
bg_event 7, 7, 8
bg_event 0, 11, 9
bg_event 1, 11, 10
bg_event 2, 11, 11
bg_event 5, 11, 12
bg_event 6, 11, 13
bg_event 7, 11, 14
bg_event 4, 0, 15
def_object_events
object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/SilentHillPokecenter.asm
View File

@ -12,7 +12,7 @@ SilentHillPokecenter_MapEvents::
warp_event 6, 7, SILENT_HILL, 2, 60
def_bg_events
bg_event 13, 1, 0, 1
bg_event 13, 1, 1
def_object_events
object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

10
data/maps/objects/South.asm
View File

@ -22,11 +22,11 @@ South_MapEvents::
warp_event 31, 30, HAITEKU_WEST_ROUTE_GATE, 4, 432
def_bg_events
bg_event 30, 14, 0, 1
bg_event 34, 14, 0, 2
bg_event 28, 17, 0, 3
bg_event 16, 22, 0, 4
bg_event 20, 22, 0, 5
bg_event 30, 14, 1
bg_event 34, 14, 2
bg_event 28, 17, 3
bg_event 16, 22, 4
bg_event 20, 22, 5
def_object_events
object_event 25, 21, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

20
data/maps/objects/Stand.asm
View File

@ -22,16 +22,16 @@ Stand_MapEvents::
warp_event 31, 13, BULL_FOREST_ROUTE_GATE_STAND, 2, 198
def_bg_events
bg_event 8, 8, 0, 1
bg_event 14, 8, 0, 2
bg_event 20, 10, 0, 3
bg_event 16, 16, 0, 4
bg_event 10, 20, 0, 5
bg_event 18, 21, 0, 6
bg_event 24, 20, 0, 7
bg_event 34, 20, 0, 8
bg_event 36, 26, 0, 9
bg_event 32, 35, 0, 10
bg_event 8, 8, 1
bg_event 14, 8, 2
bg_event 20, 10, 3
bg_event 16, 16, 4
bg_event 10, 20, 5
bg_event 18, 21, 6
bg_event 24, 20, 7
bg_event 34, 20, 8
bg_event 36, 26, 9
bg_event 32, 35, 10
def_object_events
object_event 10, 10, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0

8
data/maps/objects/Sugar.asm
View File

@ -15,10 +15,10 @@ Sugar_MapEvents::
warp_event 9, 10, SUGAR_POKECENTER_1F, 1, 101
def_bg_events
bg_event 14, 6, 0, 1
bg_event 6, 10, 0, 2
bg_event 10, 10, 0, 3
bg_event 10, 14, 0, 4
bg_event 14, 6, 1
bg_event 6, 10, 2
bg_event 10, 10, 3
bg_event 10, 14, 4
def_object_events
object_event 8, 12, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

1
data/maps/objects/UnusedMap13.asm
View File

@ -5,5 +5,6 @@ SECTION "data/maps/objects/UnusedMap13.asm", ROMX
map_attributes UnusedMap13, UNUSED_MAP_13, 0
UnusedMap13_MapEvents::
UnusedMap13_Blocks::
INCBIN "maps/UnusedMap13.blk"

12
data/maps/objects/West.asm
View File

@ -25,12 +25,12 @@ West_MapEvents::
warp_event 35, 15, ROUTE_2_GATE_1F, 1, 226
def_bg_events
bg_event 16, 7, 0, 1
bg_event 28, 9, 0, 2
bg_event 12, 10, 0, 3
bg_event 32, 12, 0, 4
bg_event 26, 14, 0, 5
bg_event 18, 20, 0, 6
bg_event 16, 7, 1
bg_event 28, 9, 2
bg_event 12, 10, 3
bg_event 32, 12, 4
bg_event 26, 14, 5
bg_event 18, 20, 6
def_object_events
object_event 6, 8, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

4
data/maps/objects/WestGym.asm
View File

@ -12,8 +12,8 @@ WestGym_MapEvents::
warp_event 5, 17, WEST, 8, 102
def_bg_events
bg_event 3, 15, 0, 1
bg_event 6, 15, 0, 1
bg_event 3, 15, 1
bg_event 6, 15, 1
def_object_events
object_event 4, 4, SPRITE_TSUKUSHI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

8
data/maps/objects/WestHouse1.asm
View File

@ -12,10 +12,10 @@ WestHouse1_MapEvents::
warp_event 5, 7, WEST, 9, 47
def_bg_events
bg_event 0, 1, 0, 1
bg_event 1, 1, 0, 2
bg_event 5, 1, 0, 3
bg_event 8, 0, 0, 4
bg_event 0, 1, 1
bg_event 1, 1, 2
bg_event 5, 1, 3
bg_event 8, 0, 4
def_object_events
object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

8
data/maps/objects/WestHouse2.asm
View File

@ -12,10 +12,10 @@ WestHouse2_MapEvents::
warp_event 5, 7, WEST, 10, 47
def_bg_events
bg_event 0, 1, 0, 1
bg_event 1, 1, 0, 2
bg_event 5, 1, 0, 3
bg_event 8, 0, 0, 4
bg_event 0, 1, 1
bg_event 1, 1, 2
bg_event 5, 1, 3
bg_event 8, 0, 4
def_object_events
object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

4
data/maps/objects/WestMart1F.asm
View File

@ -14,8 +14,8 @@ WestMart1F_MapEvents::
warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16
def_bg_events
bg_event 14, 0, 0, 1
bg_event 3, 0, 0, 2
bg_event 14, 0, 1
bg_event 3, 0, 2
def_object_events
object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

32
data/maps/objects/WestMart2F.asm
View File

@ -13,22 +13,22 @@ WestMart2F_MapEvents::
warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16
def_bg_events
bg_event 14, 0, 0, 1
bg_event 3, 0, 0, 2
bg_event 3, 4, 0, 3
bg_event 3, 5, 0, 3
bg_event 3, 6, 0, 3
bg_event 3, 7, 0, 3
bg_event 7, 4, 0, 3
bg_event 7, 5, 0, 3
bg_event 7, 6, 0, 3
bg_event 7, 7, 0, 3
bg_event 4, 1, 0, 3
bg_event 5, 1, 0, 3
bg_event 6, 1, 0, 3
bg_event 7, 1, 0, 3
bg_event 8, 1, 0, 3
bg_event 9, 1, 0, 3
bg_event 14, 0, 1
bg_event 3, 0, 2
bg_event 3, 4, 3
bg_event 3, 5, 3
bg_event 3, 6, 3
bg_event 3, 7, 3
bg_event 7, 4, 3
bg_event 7, 5, 3
bg_event 7, 6, 3
bg_event 7, 7, 3
bg_event 4, 1, 3
bg_event 5, 1, 3
bg_event 6, 1, 3
bg_event 7, 1, 3
bg_event 8, 1, 3
bg_event 9, 1, 3
def_object_events
object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

28
data/maps/objects/WestMart3F.asm
View File

@ -13,20 +13,20 @@ WestMart3F_MapEvents::
warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16
def_bg_events
bg_event 14, 0, 0, 1
bg_event 3, 0, 0, 2
bg_event 1, 4, 0, 3
bg_event 1, 5, 0, 3
bg_event 1, 6, 0, 3
bg_event 1, 7, 0, 3
bg_event 5, 4, 0, 3
bg_event 5, 5, 0, 3
bg_event 5, 6, 0, 3
bg_event 5, 7, 0, 3
bg_event 9, 4, 0, 3
bg_event 9, 5, 0, 3
bg_event 9, 6, 0, 3
bg_event 9, 7, 0, 3
bg_event 14, 0, 1
bg_event 3, 0, 2
bg_event 1, 4, 3
bg_event 1, 5, 3
bg_event 1, 6, 3
bg_event 1, 7, 3
bg_event 5, 4, 3
bg_event 5, 5, 3
bg_event 5, 6, 3
bg_event 5, 7, 3
bg_event 9, 4, 3
bg_event 9, 5, 3
bg_event 9, 6, 3
bg_event 9, 7, 3
def_object_events
object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

28
data/maps/objects/WestMart4F.asm
View File

@ -13,20 +13,20 @@ WestMart4F_MapEvents::
warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16
def_bg_events
bg_event 14, 0, 0, 1
bg_event 3, 0, 0, 2
bg_event 2, 5, 0, 3
bg_event 3, 5, 0, 3
bg_event 4, 5, 0, 3
bg_event 5, 5, 0, 3
bg_event 6, 5, 0, 3
bg_event 7, 5, 0, 3
bg_event 8, 5, 0, 3
bg_event 9, 5, 0, 3
bg_event 6, 1, 0, 3
bg_event 7, 1, 0, 3
bg_event 8, 1, 0, 3
bg_event 9, 1, 0, 3
bg_event 14, 0, 1
bg_event 3, 0, 2
bg_event 2, 5, 3
bg_event 3, 5, 3
bg_event 4, 5, 3
bg_event 5, 5, 3
bg_event 6, 5, 3
bg_event 7, 5, 3
bg_event 8, 5, 3
bg_event 9, 5, 3
bg_event 6, 1, 3
bg_event 7, 1, 3
bg_event 8, 1, 3
bg_event 9, 1, 3
def_object_events
object_event 13, 5, SPRITE_CLERK, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

4
data/maps/objects/WestMart5F.asm
View File

@ -13,8 +13,8 @@ WestMart5F_MapEvents::
warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16
def_bg_events
bg_event 14, 0, 0, 1
bg_event 3, 0, 0, 2
bg_event 14, 0, 1
bg_event 3, 0, 2
def_object_events
object_event 8, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

10
data/maps/objects/WestMart6F.asm
View File

@ -11,11 +11,11 @@ WestMart6F_MapEvents::
warp_event 15, 0, WEST_MART_5F, 2, 22
def_bg_events
bg_event 8, 1, 0, 1
bg_event 9, 1, 0, 2
bg_event 10, 1, 0, 3
bg_event 11, 1, 0, 4
bg_event 14, 0, 0, 5
bg_event 8, 1, 1
bg_event 9, 1, 2
bg_event 10, 1, 3
bg_event 11, 1, 4
bg_event 14, 0, 5
def_object_events
object_event 12, 3, SPRITE_OFFICER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/WestPokecenter1F.asm
View File

@ -13,7 +13,7 @@ WestPokecenter1F_MapEvents::
warp_event 0, 7, WEST_POKECENTER_2F, 1, 57
def_bg_events
bg_event 13, 1, 0, 1
bg_event 13, 1, 1
def_object_events
object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/WestPokecenter2F.asm
View File

@ -11,7 +11,7 @@ WestPokecenter2F_MapEvents::
warp_event 0, 7, WEST_POKECENTER_1F, 3, 57
def_bg_events
bg_event 1, 1, 0, 1
bg_event 1, 1, 1
def_object_events
object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

4
data/maps/objects/WestRadioTower1F.asm
View File

@ -13,8 +13,8 @@ WestRadioTower1F_MapEvents::
warp_event 7, 0, WEST_RADIO_TOWER_2F, 2, 14
def_bg_events
bg_event 5, 0, 0, 1
bg_event 0, 1, 0, 2
bg_event 5, 0, 1
bg_event 0, 1, 2
def_object_events
object_event 6, 6, SPRITE_RECEPTIONIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/WestRadioTower2F.asm
View File

@ -12,7 +12,7 @@ WestRadioTower2F_MapEvents::
warp_event 7, 0, WEST_RADIO_TOWER_1F, 3, 14
def_bg_events
bg_event 5, 0, 0, 1
bg_event 5, 0, 1
def_object_events
object_event 4, 6, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/WestRadioTower3F.asm
View File

@ -12,7 +12,7 @@ WestRadioTower3F_MapEvents::
warp_event 7, 0, WEST_RADIO_TOWER_4F, 2, 14
def_bg_events
bg_event 5, 0, 0, 1
bg_event 5, 0, 1
def_object_events
object_event 4, 6, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/WestRadioTower4F.asm
View File

@ -12,7 +12,7 @@ WestRadioTower4F_MapEvents::
warp_event 7, 0, WEST_RADIO_TOWER_3F, 2, 14
def_bg_events
bg_event 5, 0, 0, 1
bg_event 5, 0, 1
def_object_events
object_event 2, 6, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

6
data/maps/objects/WestRadioTower5F.asm
View File

@ -11,9 +11,9 @@ WestRadioTower5F_MapEvents::
warp_event 0, 0, WEST_RADIO_TOWER_4F, 1, 11
def_bg_events
bg_event 3, 0, 0, 1
bg_event 6, 4, 0, 2
bg_event 7, 4, 0, 2
bg_event 3, 0, 1
bg_event 6, 4, 2
bg_event 7, 4, 2
def_object_events
object_event 6, 6, SPRITE_SCIENTIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

14
data/maps/objects/WestRocketRaidedHouse.asm
View File

@ -12,13 +12,13 @@ WestRocketRaidedHouse_MapEvents::
warp_event 5, 7, WEST, 5, 47
def_bg_events
bg_event 0, 1, 0, 1
bg_event 1, 1, 0, 2
bg_event 2, 1, 0, 3
bg_event 4, 1, 0, 4
bg_event 5, 1, 0, 4
bg_event 7, 1, 0, 5
bg_event 8, 0, 0, 6
bg_event 0, 1, 1
bg_event 1, 1, 2
bg_event 2, 1, 3
bg_event 4, 1, 4
bg_event 5, 1, 4
bg_event 7, 1, 5
bg_event 8, 0, 6
def_object_events
object_event 8, 1, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

58
macros/maps.asm
View File

@ -12,8 +12,8 @@ CURRENT_MAP_HEIGHT = \2_HEIGHT
\1_MapAttributes::
db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH
dw \1_Blocks
dw \1TextPointers
dw \1ScriptLoader
dw \1_TextPointers
dw \1_ScriptLoader
dw \1_MapEvents
db \3
ENDM
@ -105,7 +105,7 @@ map: MACRO
db BANK(\1_MapAttributes), \2, \3
dw \1_MapAttributes
db \4
db 0, 0 ; ???
db 0, 0
ENDM
def_warp_events: MACRO
@ -118,10 +118,14 @@ _NUM_WARP_EVENTS = 0
ENDM
warp_event: MACRO
db \2, \1 ; y, x
db \4 ; index
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
;\3: map id: from constants/map_constants.asm
;\4: warp destination: starts at 1
;\5: wOverworldMapBlocks offset (unused)
db \2, \1, \4
map_id \3
dw wOverworldMapBlocks + \5 ; unused
dw wOverworldMapBlocks + \5
_NUM_WARP_EVENTS = _NUM_WARP_EVENTS + 1
ENDM
@ -135,9 +139,10 @@ _NUM_BG_EVENTS = 0
ENDM
bg_event: MACRO
db \2, \1 ; y, x
db \3 ; function (unused?)
db \4 ; text index
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
;\3: text index
db \2, \1, 0, \3
_NUM_BG_EVENTS = _NUM_BG_EVENTS + 1
ENDM
@ -151,20 +156,35 @@ _NUM_OBJECT_EVENTS = 0
ENDM
object_event: MACRO
db \3 ; sprite
db \2 + 4, \1 + 4 ; x, y
db \4 ; movement function
dn \5, \6 ; radius
db \7, \8 ; hour limits?
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
;\3: sprite: a SPRITE_* constant
;\4: movement function: a SPRITEMOVEDATA_* constant
;\5, \6: movement radius: x, y
;\7, \8: hour limits: h1, h2 (0-23)
; * if h1 < h2, the object_event will only appear from h1 to h2
; * if h1 > h2, the object_event will not appear from h2 to h1
; * if h1 == h2, the object_event will always appear
; * if h1 == -1, h2 is treated as a time-of-day value:
; a combo of MORN, DAY, and/or NITE, or -1 to always appear
;\9: object type function
;\10: unknown 1
;\11: unknown 2
;\12: sight range
;\13: unknown 3
;\14: unknown 4
db \3, \2 + 4, \1 + 4, \4
dn \5, \6
db \7, \8
shift
db \8 ; object type function
db \8
shift
db \8, \9 ; unknown 1, 2
db \8, \9
shift
db \9 ; sight range
db \9
shift
db \9 ; unknown 3
db \9
shift
db \9 ; unknown 4
db \9
_NUM_OBJECT_EVENTS = _NUM_OBJECT_EVENTS + 1
ENDM

2
scripts/Baadon.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/Baadon.asm", ROMX
BaadonScriptLoader::
Baadon_ScriptLoader::
ret
db "@"

4
scripts/BaadonHouse1.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonHouse1.asm", ROMX
BaadonHouse1ScriptLoader::
BaadonHouse1_ScriptLoader::
ret
BaadonHouse1TextPointers::
BaadonHouse1_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BaadonHouse2.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonHouse2.asm", ROMX
BaadonHouse2ScriptLoader::
BaadonHouse2_ScriptLoader::
ret
BaadonHouse2TextPointers::
BaadonHouse2_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BaadonLeague1F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonLeague1F.asm", ROMX
BaadonLeague1FScriptLoader::
BaadonLeague1F_ScriptLoader::
ret
BaadonLeague1FTextPointers::
BaadonLeague1F_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BaadonLeague2F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonLeague2F.asm", ROMX
BaadonLeague2FScriptLoader::
BaadonLeague2F_ScriptLoader::
ret
BaadonLeague2FTextPointers::
BaadonLeague2F_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BaadonMart.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonMart.asm", ROMX
BaadonMartScriptLoader::
BaadonMart_ScriptLoader::
ret
BaadonMartTextPointers::
BaadonMart_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BaadonPokecenter1F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonPokecenter1F.asm", ROMX
BaadonPokecenter1FScriptLoader::
BaadonPokecenter1F_ScriptLoader::
ret
BaadonPokecenter1FTextPointers::
BaadonPokecenter1F_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BaadonPokecenter2F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonPokecenter2F.asm", ROMX
BaadonPokecenter2FScriptLoader::
BaadonPokecenter2F_ScriptLoader::
ret
BaadonPokecenter2FTextPointers::
BaadonPokecenter2F_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

2
scripts/BaadonRoute1.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonRoute1.asm", ROMX
BaadonRoute1ScriptLoader::
BaadonRoute1_ScriptLoader::
ret
db "@"

2
scripts/BaadonRoute2.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonRoute2.asm", ROMX
BaadonRoute2ScriptLoader::
BaadonRoute2_ScriptLoader::
ret
db "@"

2
scripts/BaadonRoute3.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonRoute3.asm", ROMX
BaadonRoute3ScriptLoader::
BaadonRoute3_ScriptLoader::
ret
db "@"

4
scripts/BaadonRouteGateNewtype.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonRouteGateNewtype.asm", ROMX
BaadonRouteGateNewtypeScriptLoader::
BaadonRouteGateNewtype_ScriptLoader::
ret
BaadonRouteGateNewtypeTextPointers::
BaadonRouteGateNewtype_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BaadonRouteGateWest.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonRouteGateWest.asm", ROMX
BaadonRouteGateWestScriptLoader::
BaadonRouteGateWest_ScriptLoader::
ret
BaadonRouteGateWestTextPointers::
BaadonRouteGateWest_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BaadonWallpaperHouse.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BaadonWallpaperHouse.asm", ROMX
BaadonWallpaperHouseScriptLoader::
BaadonWallpaperHouse_ScriptLoader::
ret
BaadonWallpaperHouseTextPointers::
BaadonWallpaperHouse_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

2
scripts/BullForest.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/BullForest.asm", ROMX
BullForestScriptLoader::
BullForest_ScriptLoader::
ret
db "@"

2
scripts/BullForestRoute1.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/BullForestRoute1.asm", ROMX
BullForestRoute1ScriptLoader::
BullForestRoute1_ScriptLoader::
ret
db "@"

4
scripts/BullForestRoute1House.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullForestRoute1House.asm", ROMX
BullForestRoute1HouseScriptLoader::
BullForestRoute1House_ScriptLoader::
ret
BullForestRoute1HouseTextPointers::
BullForestRoute1House_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

2
scripts/BullForestRoute2.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/BullForestRoute2.asm", ROMX
BullForestRoute2ScriptLoader::
BullForestRoute2_ScriptLoader::
ret
db "@"

2
scripts/BullForestRoute3.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/BullForestRoute3.asm", ROMX
BullForestRoute3ScriptLoader::
BullForestRoute3_ScriptLoader::
ret
db "@"

4
scripts/BullForestRouteGateStand.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullForestRouteGateStand.asm", ROMX
BullForestRouteGateStandScriptLoader::
BullForestRouteGateStand_ScriptLoader::
ret
BullForestRouteGateStandTextPointers::
BullForestRouteGateStand_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullHouse1.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullHouse1.asm", ROMX
BullHouse1ScriptLoader::
BullHouse1_ScriptLoader::
ret
BullHouse1TextPointers::
BullHouse1_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullHouse2.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullHouse2.asm", ROMX
BullHouse2ScriptLoader::
BullHouse2_ScriptLoader::
ret
BullHouse2TextPointers::
BullHouse2_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullHouse3.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullHouse3.asm", ROMX
BullHouse3ScriptLoader::
BullHouse3_ScriptLoader::
ret
BullHouse3TextPointers::
BullHouse3_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullHouse4.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullHouse4.asm", ROMX
BullHouse4ScriptLoader::
BullHouse4_ScriptLoader::
ret
BullHouse4TextPointers::
BullHouse4_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullLeague1F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullLeague1F.asm", ROMX
BullLeague1FScriptLoader::
BullLeague1F_ScriptLoader::
ret
BullLeague1FTextPointers::
BullLeague1F_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullLeague2F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullLeague2F.asm", ROMX
BullLeague2FScriptLoader::
BullLeague2F_ScriptLoader::
ret
BullLeague2FTextPointers::
BullLeague2F_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullMart.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullMart.asm", ROMX
BullMartScriptLoader::
BullMart_ScriptLoader::
ret
BullMartTextPointers::
BullMart_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullPokecenter1F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullPokecenter1F.asm", ROMX
BullPokecenter1FScriptLoader::
BullPokecenter1F_ScriptLoader::
ret
BullPokecenter1FTextPointers::
BullPokecenter1F_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/BullPokecenter2F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/BullPokecenter2F.asm", ROMX
BullPokecenter2FScriptLoader::
BullPokecenter2F_ScriptLoader::
ret
BullPokecenter2FTextPointers::
BullPokecenter2F_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/CaveMinecarts1.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/CaveMinecarts1.asm", ROMX
CaveMinecarts1ScriptLoader::
CaveMinecarts1_ScriptLoader::
ret
CaveMinecarts1TextPointers::
CaveMinecarts1_TextPointers::
dw GameplayText
dw GameplayText
dw GameplayText

4
scripts/CaveMinecarts2.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/CaveMinecarts2.asm", ROMX
CaveMinecarts2ScriptLoader::
CaveMinecarts2_ScriptLoader::
ret
CaveMinecarts2TextPointers::
CaveMinecarts2_TextPointers::
dw GameplayText
dw GameplayText
dw GameplayText

4
scripts/CaveMinecarts3.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/CaveMinecarts3.asm", ROMX
CaveMinecarts3ScriptLoader::
CaveMinecarts3_ScriptLoader::
ret
CaveMinecarts3TextPointers::
CaveMinecarts3_TextPointers::
dw GameplayText
dw GameplayText
dw GameplayText

4
scripts/CaveMinecarts4.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/CaveMinecarts4.asm", ROMX
CaveMinecarts4ScriptLoader::
CaveMinecarts4_ScriptLoader::
ret
CaveMinecarts4TextPointers::
CaveMinecarts4_TextPointers::
dw GameplayText
dw GameplayText
dw GameplayText

4
scripts/CaveMinecarts5.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/CaveMinecarts5.asm", ROMX
CaveMinecarts5ScriptLoader::
CaveMinecarts5_ScriptLoader::
ret
CaveMinecarts5TextPointers::
CaveMinecarts5_TextPointers::
dw GameplayText
dw GameplayText
dw GameplayText

4
scripts/CaveMinecarts6.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/CaveMinecarts6.asm", ROMX
CaveMinecarts6ScriptLoader::
CaveMinecarts6_ScriptLoader::
ret
CaveMinecarts6TextPointers::
CaveMinecarts6_TextPointers::
dw GameplayText
dw GameplayText
dw GameplayText

4
scripts/CaveMinecarts7.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/CaveMinecarts7.asm", ROMX
CaveMinecarts7ScriptLoader::
CaveMinecarts7_ScriptLoader::
ret
CaveMinecarts7TextPointers::
CaveMinecarts7_TextPointers::
dw GameplayText
dw GameplayText
dw GameplayText

2
scripts/Fonto.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "scripts/Fonto.asm", ROMX
FontoScriptLoader::
Fonto_ScriptLoader::
ret
db "@"

4
scripts/FontoHouse.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/FontoHouse.asm", ROMX
FontoHouseScriptLoader::
FontoHouse_ScriptLoader::
ret
FontoHouseTextPointers::
FontoHouse_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/FontoLab.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/FontoLab.asm", ROMX
FontoLabScriptLoader::
FontoLab_ScriptLoader::
ret
FontoLabTextPointers::
FontoLab_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
scripts/FontoMart.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "scripts/FontoMart.asm", ROMX
FontoMartScriptLoader::
FontoMart_ScriptLoader::
ret
FontoMartTextPointers::
FontoMart_TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

Some files were not shown because too many files have changed in this diff Show More