pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Consistent (x, y) coordinate formatting in map scripts

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-28 14:31:25 -05:00
parent ce795692d9
commit 84e22eb578
392 changed files with 3634 additions and 3634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/spawn_points.asm
View File

@@ -1,5 +1,5 @@
spawn: MACRO
; map, y, x
; map, x, y
map \1
db \2, \3
ENDM

8
docs/map_scripts.md
View File

@@ -60,17 +60,17 @@ Callback types:
## `.Warps: db` *N*
- **`warp_def` *y*, *x*, *warp_id*, *map***
- **`warp_def` *x*, *y*, *warp_id*, *map***
## `.CoordEvents: db` *N*
- **`coord_event` *scene id*, *y*, *x*, *script***
- **`coord_event` *x*, *y*, *scene id*, *script***
## `.BGEvents: db` *N*
- **`bg_event` *y*, *x*, *type*, *script***
- **`bg_event` *x*, *y*, *type*, *script***
BG event types:
@@ -90,7 +90,7 @@ BG event types:
## `.ObjectEvents: db` *N*
- **`object_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *h1*, *h2*, *palette*, *type*, *range*, *script*, *event_flag***
- **`object_event` *x*, *y*, *sprite*, *movement*, *ry*, *rx*, *h1*, *h2*, *palette*, *type*, *range*, *script*, *event_flag***
Movement types:

2
engine/player_object.asm
View File

@@ -55,7 +55,7 @@ PlayerObjectTemplate: ; 8071
; A dummy map object used to initialize the player object.
; Shorter than the actual amount copied by two bytes.
; Said bytes seem to be unused.
object_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
CopyDECoordsToMapObject:: ; 807e
push de

28
macros/scripts/maps.asm
View File

@@ -10,39 +10,39 @@ scene_script: macro
endm
warp_def: macro
;\1: y: top to bottom, starts at 0
;\2: x: left to right, starts at 0
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
;\3: warp destination: starts at 1
;\4: map id: from constants/map_constants.asm
db \1, \2, \3
db \2, \1, \3
map \4
endm
coord_event: macro
;\1: scene id: controlled by setscene/setmapscene
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0
;\3: scene id: controlled by setscene/setmapscene
;\4: script pointer
db \1, \2, \3, $0
db \3, \2, \1, $0
dw \4
db $0, $0
endm
bg_event: macro
;\1: y: top to bottom, starts at 0
;\2: x: left to right, starts at 0
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
;\3: function: a BGEVENT_* constant
;\4: script pointer
db \1, \2, \3
db \2, \1, \3
dw \4
endm
object_event: macro
;\1: sprite: a SPRITE_* constant
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0
;\3: sprite: a SPRITE_* constant
;\4: movement function: a SPRITEMOVEDATA_* constant
;\5, \6: movement radius: y, x
;\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
@@ -54,8 +54,8 @@ object_event: macro
;\11: sight range: applies to OBJECTTYPE_TRAINER
;\12: script pointer
;\13: event flag: an EVENT_* constant, or -1 to always appear
db \1, \2 + 4, \3 + 4, \4
dn \5, \6
db \3, \2 + 4, \1 + 4, \4
dn \6, \5
db \7, \8
shift
dn \8, \9

22
maps/AzaleaGym.asm
View File

@@ -367,23 +367,23 @@ AzaleaGym_MapEventHeader:
.Warps:
db 2
warp_def $f, $4, 5, AZALEA_TOWN
warp_def $f, $5, 5, AZALEA_TOWN
warp_def 4, 15, 5, AZALEA_TOWN
warp_def 5, 15, 5, AZALEA_TOWN
.CoordEvents:
db 0
.BGEvents:
db 2
bg_event 13, 3, BGEVENT_READ, AzaleaGymStatue
bg_event 13, 6, BGEVENT_READ, AzaleaGymStatue
bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
.ObjectEvents:
db 7
object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1

10
maps/AzaleaMart.asm
View File

@@ -51,8 +51,8 @@ AzaleaMart_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 3, AZALEA_TOWN
warp_def $7, $3, 3, AZALEA_TOWN
warp_def 2, 7, 3, AZALEA_TOWN
warp_def 3, 7, 3, AZALEA_TOWN
.CoordEvents:
db 0
@@ -62,6 +62,6 @@ AzaleaMart_MapEventHeader:
.ObjectEvents:
db 3
object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
object_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1

14
maps/AzaleaPokecenter1F.asm
View File

@@ -82,9 +82,9 @@ AzaleaPokecenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 1, AZALEA_TOWN
warp_def $7, $4, 1, AZALEA_TOWN
warp_def $7, $0, 1, POKECENTER_2F
warp_def 3, 7, 1, AZALEA_TOWN
warp_def 4, 7, 1, AZALEA_TOWN
warp_def 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0
@@ -94,7 +94,7 @@ AzaleaPokecenter1F_MapEventHeader:
.ObjectEvents:
db 4
object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
object_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
object_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
object_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
object_event 1, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1

64
maps/AzaleaTown.asm
View File

@@ -461,44 +461,44 @@ AzaleaTown_MapEventHeader:
.Warps:
db 8
warp_def $9, $f, 1, AZALEA_POKECENTER_1F
warp_def $d, $15, 1, CHARCOAL_KILN
warp_def $5, $15, 2, AZALEA_MART
warp_def $5, $9, 1, KURTS_HOUSE
warp_def $f, $a, 1, AZALEA_GYM
warp_def $7, $1f, 1, SLOWPOKE_WELL_B1F
warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE
warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE
warp_def 15, 9, 1, AZALEA_POKECENTER_1F
warp_def 21, 13, 1, CHARCOAL_KILN
warp_def 21, 5, 2, AZALEA_MART
warp_def 9, 5, 1, KURTS_HOUSE
warp_def 10, 15, 1, AZALEA_GYM
warp_def 31, 7, 1, SLOWPOKE_WELL_B1F
warp_def 2, 10, 3, ILEX_FOREST_AZALEA_GATE
warp_def 2, 11, 4, ILEX_FOREST_AZALEA_GATE
.CoordEvents:
db 3
coord_event 1, $a, $5, AzaleaTownRivalBattleScene1
coord_event 1, $b, $5, AzaleaTownRivalBattleScene2
coord_event 2, $6, $9, AzaleaTownCelebiScene
coord_event 5, 10, 1, AzaleaTownRivalBattleScene1
coord_event 5, 11, 1, AzaleaTownRivalBattleScene2
coord_event 9, 6, 2, AzaleaTownCelebiScene
.BGEvents:
db 9
bg_event 9, 19, BGEVENT_READ, AzaleaTownSign
bg_event 9, 10, BGEVENT_READ, KurtsHouseSign
bg_event 15, 14, BGEVENT_READ, AzaleaGymSign
bg_event 7, 29, BGEVENT_READ, SlowpokeWellSign
bg_event 13, 19, BGEVENT_READ, CharcoalKilnSign
bg_event 9, 16, BGEVENT_READ, AzaleaTownPokecenterSign
bg_event 5, 22, BGEVENT_READ, AzaleaTownMartSign
bg_event 9, 3, BGEVENT_READ, AzaleaTownIlextForestSign
bg_event 6, 31, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
bg_event 10, 9, BGEVENT_READ, KurtsHouseSign
bg_event 14, 15, BGEVENT_READ, AzaleaGymSign
bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign
bg_event 19, 13, BGEVENT_READ, CharcoalKilnSign
bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign
bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign
bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign
bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
.ObjectEvents:
db 12
object_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
object_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
object_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
object_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
object_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
object_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
object_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
object_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
object_event 11, 10, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
object_event 10, 16, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT

16
maps/BattleTower1F.asm
View File

@@ -799,9 +799,9 @@ BattleTower1F_MapEventHeader:
.Warps:
db 3
warp_def $9, $7, 3, BATTLE_TOWER_OUTSIDE
warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE
warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR
warp_def 7, 9, 3, BATTLE_TOWER_OUTSIDE
warp_def 8, 9, 4, BATTLE_TOWER_OUTSIDE
warp_def 7, 0, 1, BATTLE_TOWER_ELEVATOR
.CoordEvents:
db 0
@@ -812,8 +812,8 @@ BattleTower1F_MapEventHeader:
.ObjectEvents:
db 5
object_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
object_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
object_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
object_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
object_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1

8
maps/BattleTowerBattleRoom.asm
View File

@@ -146,8 +146,8 @@ BattleTowerBattleRoom_MapEventHeader:
.Warps:
db 2
warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY
warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY
warp_def 3, 7, 4, BATTLE_TOWER_HALLWAY
warp_def 4, 7, 4, BATTLE_TOWER_HALLWAY
.CoordEvents:
db 0
@@ -157,5 +157,5 @@ BattleTowerBattleRoom_MapEventHeader:
.ObjectEvents:
db 2
object_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
object_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1

6
maps/BattleTowerElevator.asm
View File

@@ -50,8 +50,8 @@ BattleTowerElevator_MapEventHeader:
.Warps:
db 2
warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY
warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY
warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY
warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY
.CoordEvents:
db 0
@@ -61,4 +61,4 @@ BattleTowerElevator_MapEventHeader:
.ObjectEvents:
db 1
object_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1

14
maps/BattleTowerHallway.asm
View File

@@ -84,12 +84,12 @@ BattleTowerHallway_MapEventHeader:
.Warps:
db 6
warp_def $1, $b, 1, BATTLE_TOWER_ELEVATOR
warp_def $0, $5, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $7, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $9, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR
warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
.CoordEvents:
db 0
@@ -99,4 +99,4 @@ BattleTowerHallway_MapEventHeader:
.ObjectEvents:
db 1
object_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1
object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1

16
maps/BattleTowerOutside.asm
View File

@@ -132,10 +132,10 @@ BattleTowerOutside_MapEventHeader:
.Warps:
db 4
warp_def $15, $8, 3, ROUTE_40_BATTLE_TOWER_GATE
warp_def $15, $9, 4, ROUTE_40_BATTLE_TOWER_GATE
warp_def $9, $8, 1, BATTLE_TOWER_1F
warp_def $9, $9, 2, BATTLE_TOWER_1F
warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
warp_def 8, 9, 1, BATTLE_TOWER_1F
warp_def 9, 9, 2, BATTLE_TOWER_1F
.CoordEvents:
db 0
@@ -146,7 +146,7 @@ BattleTowerOutside_MapEventHeader:
.ObjectEvents:
db 4
object_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
object_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
object_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
object_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1

6
maps/BillsHouse.asm
View File

@@ -359,8 +359,8 @@ BillsHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 1, ROUTE_25
warp_def $7, $3, 1, ROUTE_25
warp_def 2, 7, 1, ROUTE_25
warp_def 3, 7, 1, ROUTE_25
.CoordEvents:
db 0
@@ -370,4 +370,4 @@ BillsHouse_MapEventHeader:
.ObjectEvents:
db 1
object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1

48
maps/BlackthornCity.asm
View File

@@ -318,36 +318,36 @@ BlackthornCity_MapEventHeader:
.Warps:
db 8
warp_def $b, $12, 1, BLACKTHORN_GYM_1F
warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def $17, $1d, 1, BLACKTHORN_EMYS_HOUSE
warp_def $1d, $f, 2, BLACKTHORN_MART
warp_def $1d, $15, 1, BLACKTHORN_POKECENTER_1F
warp_def $1f, $9, 1, MOVE_DELETERS_HOUSE
warp_def $9, $24, 2, ICE_PATH_1F
warp_def $1, $14, 1, DRAGONS_DEN_1F
warp_def 18, 11, 1, BLACKTHORN_GYM_1F
warp_def 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def 29, 23, 1, BLACKTHORN_EMYS_HOUSE
warp_def 15, 29, 2, BLACKTHORN_MART
warp_def 21, 29, 1, BLACKTHORN_POKECENTER_1F
warp_def 9, 31, 1, MOVE_DELETERS_HOUSE
warp_def 36, 9, 2, ICE_PATH_1F
warp_def 20, 1, 1, DRAGONS_DEN_1F
.CoordEvents:
db 0
.BGEvents:
db 7
bg_event 24, 34, BGEVENT_READ, BlackthornCitySign
bg_event 13, 17, BGEVENT_READ, BlackthornGymSign
bg_event 31, 7, BGEVENT_READ, MoveDeletersHouseSign
bg_event 3, 21, BGEVENT_READ, DragonDensSign
bg_event 25, 5, BGEVENT_READ, BlackthornCityTrainerTips
bg_event 29, 16, BGEVENT_READ, BlackthornCityMartSign
bg_event 29, 22, BGEVENT_READ, BlackthornCityPokecenterSign
bg_event 34, 24, BGEVENT_READ, BlackthornCitySign
bg_event 17, 13, BGEVENT_READ, BlackthornGymSign
bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign
bg_event 21, 3, BGEVENT_READ, DragonDensSign
bg_event 5, 25, BGEVENT_READ, BlackthornCityTrainerTips
bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign
bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign
.ObjectEvents:
db 9
object_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
object_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
object_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
object_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
object_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
object_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
object_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
object_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1
object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
object_event 21, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
object_event 24, 31, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
object_event 13, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
object_event 22, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
object_event 35, 19, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1

8
maps/BlackthornDragonSpeechHouse.asm
View File

@@ -53,8 +53,8 @@ BlackthornDragonSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 2, BLACKTHORN_CITY
warp_def $7, $3, 2, BLACKTHORN_CITY
warp_def 2, 7, 2, BLACKTHORN_CITY
warp_def 3, 7, 2, BLACKTHORN_CITY
.CoordEvents:
db 0
@@ -64,5 +64,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
.ObjectEvents:
db 2
object_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
object_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1

8
maps/BlackthornEmysHouse.asm
View File

@@ -25,17 +25,17 @@ BlackthornEmysHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 3, BLACKTHORN_CITY
warp_def $7, $3, 3, BLACKTHORN_CITY
warp_def 2, 7, 3, BLACKTHORN_CITY
warp_def 3, 7, 3, BLACKTHORN_CITY
.CoordEvents:
db 0
.BGEvents:
db 2
bg_event 1, 0, BGEVENT_READ, EmysHouseBookshelf
bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf
bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
.ObjectEvents:
db 1
object_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1

28
maps/BlackthornGym1F.asm
View File

@@ -392,26 +392,26 @@ BlackthornGym1F_MapEventHeader:
.Warps:
db 7
warp_def $11, $4, 1, BLACKTHORN_CITY
warp_def $11, $5, 1, BLACKTHORN_CITY
warp_def $7, $1, 1, BLACKTHORN_GYM_2F
warp_def $9, $7, 2, BLACKTHORN_GYM_2F
warp_def $6, $2, 3, BLACKTHORN_GYM_2F
warp_def $7, $7, 4, BLACKTHORN_GYM_2F
warp_def $6, $7, 5, BLACKTHORN_GYM_2F
warp_def 4, 17, 1, BLACKTHORN_CITY
warp_def 5, 17, 1, BLACKTHORN_CITY
warp_def 1, 7, 1, BLACKTHORN_GYM_2F
warp_def 7, 9, 2, BLACKTHORN_GYM_2F
warp_def 2, 6, 3, BLACKTHORN_GYM_2F
warp_def 7, 7, 4, BLACKTHORN_GYM_2F
warp_def 7, 6, 5, BLACKTHORN_GYM_2F
.CoordEvents:
db 0
.BGEvents:
db 2
bg_event 15, 3, BGEVENT_READ, BlackthornGymStatue
bg_event 15, 6, BGEVENT_READ, BlackthornGymStatue
bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue
bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue
.ObjectEvents:
db 5
object_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
object_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
object_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
object_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1

26
maps/BlackthornGym2F.asm
View File

@@ -133,11 +133,11 @@ BlackthornGym2F_MapEventHeader:
.Warps:
db 5
warp_def $7, $1, 3, BLACKTHORN_GYM_1F
warp_def $9, $7, 4, BLACKTHORN_GYM_1F
warp_def $5, $2, 5, BLACKTHORN_GYM_1F ; hole
warp_def $7, $8, 6, BLACKTHORN_GYM_1F ; hole
warp_def $3, $8, 7, BLACKTHORN_GYM_1F ; hole
warp_def 1, 7, 3, BLACKTHORN_GYM_1F
warp_def 7, 9, 4, BLACKTHORN_GYM_1F
warp_def 2, 5, 5, BLACKTHORN_GYM_1F ; hole
warp_def 8, 7, 6, BLACKTHORN_GYM_1F ; hole
warp_def 8, 3, 7, BLACKTHORN_GYM_1F ; hole
.CoordEvents:
db 0
@@ -147,11 +147,11 @@ BlackthornGym2F_MapEventHeader:
.ObjectEvents:
db 8
object_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
object_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
object_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
object_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
object_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
object_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
object_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
object_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
object_event 2, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
object_event 6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
object_event 3, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
object_event 6, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
object_event 8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1

10
maps/BlackthornMart.asm
View File

@@ -52,8 +52,8 @@ BlackthornMart_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 4, BLACKTHORN_CITY
warp_def $7, $3, 4, BLACKTHORN_CITY
warp_def 2, 7, 4, BLACKTHORN_CITY
warp_def 3, 7, 4, BLACKTHORN_CITY
.CoordEvents:
db 0
@@ -63,6 +63,6 @@ BlackthornMart_MapEventHeader:
.ObjectEvents:
db 3
object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
object_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1

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