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

Use def_* macros for automatic map event counts

Browse Source 
Resolves #742
This commit is contained in:
Rangi
2020-07-24 09:49:26 -04:00
parent 89c47f2170
commit dcb24bc724
392 changed files with 2750 additions and 2695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/map_event_scripts.md
View File

@@ -24,7 +24,7 @@
## Object constants ## Object constants
<pre> <pre>
object_const_def ; object_event constants object_const_def
const <i>MAPNAME</i>_<i>OBJECTNAME</i> const <i>MAPNAME</i>_<i>OBJECTNAME</i>
</pre> </pre>
@@ -39,7 +39,7 @@
### Scene scripts ### Scene scripts
<pre> <pre>
db <i>N</i> ; scene scripts def_scene_scripts
scene_script <i>script</i> scene_script <i>script</i>
</pre> </pre>
@@ -47,7 +47,7 @@
### Callbacks ### Callbacks
<pre> <pre>
db <i>N</i> ; callbacks def_callbacks
callback <i>type</i>, <i>script</i> callback <i>type</i>, <i>script</i>
</pre> </pre>
@@ -105,7 +105,7 @@
### Warp events ### Warp events
<pre> <pre>
db <i>N</i> ; warp events def_warp_events
warp_event <i>x</i>, <i>y</i>, <i>map</i>, <i>warp_id</i> warp_event <i>x</i>, <i>y</i>, <i>map</i>, <i>warp_id</i>
</pre> </pre>
@@ -113,7 +113,7 @@
### Coord events ### Coord events
<pre> <pre>
db <i>N</i> ; coord events def_coord_events
coord_event <i>x</i>, <i>y</i>, <i>scene_id</i>, <i>script</i> coord_event <i>x</i>, <i>y</i>, <i>scene_id</i>, <i>script</i>
</pre> </pre>
@@ -121,7 +121,7 @@
### BG events ### BG events
<pre> <pre>
db <i>N</i> ; bg events def_bg_events
bg_event <i>x</i>, <i>y</i>, <i>type</i>, <i>script</i> bg_event <i>x</i>, <i>y</i>, <i>type</i>, <i>script</i>
</pre> </pre>
@@ -148,7 +148,7 @@
### Object events ### Object events
<pre> <pre>
db <i>N</i> ; object events def_object_events
object_event <i>x</i>, <i>y</i>, <i>sprite</i>, <i>movement</i>, <i>rx</i>, <i>ry</i>, <i>h1</i>, <i>h2</i>, <i>palette</i>, <i>type</i>, <i>range</i>, <i>script</i>, <i>event_flag</i> object_event <i>x</i>, <i>y</i>, <i>sprite</i>, <i>movement</i>, <i>rx</i>, <i>ry</i>, <i>h1</i>, <i>h2</i>, <i>palette</i>, <i>type</i>, <i>range</i>, <i>script</i>, <i>event_flag</i>
</pre> </pre>

1
engine/overworld/player_object.asm
View File

@@ -55,6 +55,7 @@ PlayerObjectTemplate:
; A dummy map object used to initialize the player object. ; A dummy map object used to initialize the player object.
; Shorter than the actual amount copied by two bytes. ; Shorter than the actual amount copied by two bytes.
; Said bytes seem to be unused. ; Said bytes seem to be unused.
_NUM_OBJECT_EVENTS = 0
object_event -4, -4, SPRITE_CHRIS, 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:: CopyDECoordsToMapObject::

18
macros/legacy.asm
View File

@@ -223,18 +223,12 @@ signpost: MACRO
ENDM ENDM
person_event: MACRO person_event: MACRO
; object_event \3, \2, \1, \4, \5, \6, \7, \8, \9, \10, \11, \12, \13 _s = \1
db \1, \2 + 4, \3 + 4, \4 _y = \2
dn \6, \5 _x = \3
db \7, \8 _m = \4
shift shift 4
dn \8, \9 object_event _x, _y, _s, _m, \1, \2, \3, \4, \5, \6, \7, \8, \9
shift
db \9
shift
dw \9
shift
dw \9
ENDM ENDM
PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT" PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT"

60
macros/scripts/maps.asm
View File

@@ -5,16 +5,45 @@ ENDM
object_const_def EQUS "const_def 2" object_const_def EQUS "const_def 2"
def_scene_scripts: MACRO
if DEF(_NUM_SCENE_SCRIPTS)
PURGE _NUM_SCENE_SCRIPTS
endc
_NUM_SCENE_SCRIPTS EQUS "_NUM_SCENE_SCRIPTS_\@"
db _NUM_SCENE_SCRIPTS
_NUM_SCENE_SCRIPTS = 0
ENDM
scene_script: MACRO scene_script: MACRO
;\1: script pointer ;\1: script pointer
dw \1 dw \1
dw 0 ; filler dw 0 ; filler
_NUM_SCENE_SCRIPTS = _NUM_SCENE_SCRIPTS + 1
ENDM
def_callbacks: MACRO
if DEF(_NUM_CALLBACKS)
PURGE _NUM_CALLBACKS
endc
_NUM_CALLBACKS EQUS "_NUM_CALLBACKS_\@"
db _NUM_CALLBACKS
_NUM_CALLBACKS = 0
ENDM ENDM
callback: MACRO callback: MACRO
;\1: type: a MAPCALLBACK_* constant ;\1: type: a MAPCALLBACK_* constant
;\2: script pointer ;\2: script pointer
dbw \1, \2 dbw \1, \2
_NUM_CALLBACKS = _NUM_CALLBACKS + 1
ENDM
def_warp_events: MACRO
if DEF(_NUM_WARP_EVENTS)
PURGE _NUM_WARP_EVENTS
endc
_NUM_WARP_EVENTS EQUS "_NUM_WARP_EVENTS_\@"
db _NUM_WARP_EVENTS
_NUM_WARP_EVENTS = 0
ENDM ENDM
warp_event: MACRO warp_event: MACRO
@@ -24,6 +53,16 @@ warp_event: MACRO
;\4: warp destination: starts at 1 ;\4: warp destination: starts at 1
db \2, \1, \4 db \2, \1, \4
map_id \3 map_id \3
_NUM_WARP_EVENTS = _NUM_WARP_EVENTS + 1
ENDM
def_coord_events: MACRO
if DEF(_NUM_COORD_EVENTS)
PURGE _NUM_COORD_EVENTS
endc
_NUM_COORD_EVENTS EQUS "_NUM_COORD_EVENTS_\@"
db _NUM_COORD_EVENTS
_NUM_COORD_EVENTS = 0
ENDM ENDM
coord_event: MACRO coord_event: MACRO
@@ -35,6 +74,16 @@ coord_event: MACRO
db 0 ; filler db 0 ; filler
dw \4 dw \4
dw 0 ; filler dw 0 ; filler
_NUM_COORD_EVENTS = _NUM_COORD_EVENTS + 1
ENDM
def_bg_events: MACRO
if DEF(_NUM_BG_EVENTS)
PURGE _NUM_BG_EVENTS
endc
_NUM_BG_EVENTS EQUS "_NUM_BG_EVENTS_\@"
db _NUM_BG_EVENTS
_NUM_BG_EVENTS = 0
ENDM ENDM
bg_event: MACRO bg_event: MACRO
@@ -44,6 +93,16 @@ bg_event: MACRO
;\4: script pointer ;\4: script pointer
db \2, \1, \3 db \2, \1, \3
dw \4 dw \4
_NUM_BG_EVENTS = _NUM_BG_EVENTS + 1
ENDM
def_object_events: MACRO
if DEF(_NUM_OBJECT_EVENTS)
PURGE _NUM_OBJECT_EVENTS
endc
_NUM_OBJECT_EVENTS EQUS "_NUM_OBJECT_EVENTS_\@"
db _NUM_OBJECT_EVENTS
_NUM_OBJECT_EVENTS = 0
ENDM ENDM
object_event: MACRO object_event: MACRO
@@ -74,6 +133,7 @@ object_event: MACRO
dw \9 dw \9
shift shift
dw \9 dw \9
_NUM_OBJECT_EVENTS = _NUM_OBJECT_EVENTS + 1
ENDM ENDM
trainer: MACRO trainer: MACRO

14
maps/AzaleaGym.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants object_const_def
const AZALEAGYM_BUGSY const AZALEAGYM_BUGSY
const AZALEAGYM_BUG_CATCHER1 const AZALEAGYM_BUG_CATCHER1
const AZALEAGYM_BUG_CATCHER2 const AZALEAGYM_BUG_CATCHER2
@@ -8,9 +8,9 @@
const AZALEAGYM_GYM_GUIDE const AZALEAGYM_GYM_GUIDE
AzaleaGym_MapScripts: AzaleaGym_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 0 ; callbacks def_callbacks
AzaleaGymBugsyScript: AzaleaGymBugsyScript:
faceplayer faceplayer
@@ -362,17 +362,17 @@ AzaleaGymGuideWinText:
AzaleaGym_MapEvents: AzaleaGym_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 4, 15, AZALEA_TOWN, 5 warp_event 4, 15, AZALEA_TOWN, 5
warp_event 5, 15, AZALEA_TOWN, 5 warp_event 5, 15, AZALEA_TOWN, 5
db 0 ; coord events def_coord_events
db 2 ; bg events def_bg_events
bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
db 7 ; object events def_object_events
object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -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 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 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1

14
maps/AzaleaMart.asm
View File

@@ -1,12 +1,12 @@
object_const_def ; object_event constants object_const_def
const AZALEAMART_CLERK const AZALEAMART_CLERK
const AZALEAMART_COOLTRAINER_M const AZALEAMART_COOLTRAINER_M
const AZALEAMART_BUG_CATCHER const AZALEAMART_BUG_CATCHER
AzaleaMart_MapScripts: AzaleaMart_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 0 ; callbacks def_callbacks
AzaleaMartClerkScript: AzaleaMartClerkScript:
opentext opentext
@@ -46,15 +46,15 @@ AzaleaMartBugCatcherText:
AzaleaMart_MapEvents: AzaleaMart_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 2, 7, AZALEA_TOWN, 3 warp_event 2, 7, AZALEA_TOWN, 3
warp_event 3, 7, AZALEA_TOWN, 3 warp_event 3, 7, AZALEA_TOWN, 3
db 0 ; coord events def_coord_events
db 0 ; bg events def_bg_events
db 3 ; object events def_object_events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -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 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 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

@@ -1,14 +1,14 @@
object_const_def ; object_event constants object_const_def
const AZALEAPOKECENTER1F_NURSE const AZALEAPOKECENTER1F_NURSE
const AZALEAPOKECENTER1F_GENTLEMAN const AZALEAPOKECENTER1F_GENTLEMAN
const AZALEAPOKECENTER1F_FISHING_GURU const AZALEAPOKECENTER1F_FISHING_GURU
const AZALEAPOKECENTER1F_POKEFAN_F const AZALEAPOKECENTER1F_POKEFAN_F
AzaleaPokecenter1F_MapScripts: AzaleaPokecenter1F_MapScripts:
db 1 ; scene scripts def_scene_scripts
scene_script .DummyScene scene_script .DummyScene
db 0 ; callbacks def_callbacks
.DummyScene: .DummyScene:
end end
@@ -78,16 +78,16 @@ AzaleaPokecenter1FPokefanFText:
AzaleaPokecenter1F_MapEvents: AzaleaPokecenter1F_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 3 ; warp events def_warp_events
warp_event 3, 7, AZALEA_TOWN, 1 warp_event 3, 7, AZALEA_TOWN, 1
warp_event 4, 7, AZALEA_TOWN, 1 warp_event 4, 7, AZALEA_TOWN, 1
warp_event 0, 7, POKECENTER_2F, 1 warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events def_coord_events
db 0 ; bg events def_bg_events
db 4 ; object events def_object_events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -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 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 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1

14
maps/AzaleaTown.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants object_const_def
const AZALEATOWN_AZALEA_ROCKET1 const AZALEATOWN_AZALEA_ROCKET1
const AZALEATOWN_GRAMPS const AZALEATOWN_GRAMPS
const AZALEATOWN_TEACHER const AZALEATOWN_TEACHER
@@ -13,12 +13,12 @@
const AZALEATOWN_KURT_OUTSIDE const AZALEATOWN_KURT_OUTSIDE
AzaleaTown_MapScripts: AzaleaTown_MapScripts:
db 3 ; scene scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING
scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE
scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
db 1 ; callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint callback MAPCALLBACK_NEWMAP, .Flypoint
.DummyScene0: .DummyScene0:
@@ -456,7 +456,7 @@ AzaleaTownIlexForestSignText:
AzaleaTown_MapEvents: AzaleaTown_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 8 ; warp events def_warp_events
warp_event 15, 9, AZALEA_POKECENTER_1F, 1 warp_event 15, 9, AZALEA_POKECENTER_1F, 1
warp_event 21, 13, CHARCOAL_KILN, 1 warp_event 21, 13, CHARCOAL_KILN, 1
warp_event 21, 5, AZALEA_MART, 2 warp_event 21, 5, AZALEA_MART, 2
@@ -466,12 +466,12 @@ AzaleaTown_MapEvents:
warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3
warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4
db 3 ; coord events def_coord_events
coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2
coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene
db 9 ; bg events def_bg_events
bg_event 19, 9, BGEVENT_READ, AzaleaTownSign bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
bg_event 10, 9, BGEVENT_READ, KurtsHouseSign bg_event 10, 9, BGEVENT_READ, KurtsHouseSign
bg_event 14, 15, BGEVENT_READ, AzaleaGymSign bg_event 14, 15, BGEVENT_READ, AzaleaGymSign
@@ -482,7 +482,7 @@ AzaleaTown_MapEvents:
bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign
bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
db 12 ; object events def_object_events
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 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 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 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1

14
maps/BattleTower1F.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants object_const_def
const BATTLETOWER1F_RECEPTIONIST const BATTLETOWER1F_RECEPTIONIST
const BATTLETOWER1F_YOUNGSTER const BATTLETOWER1F_YOUNGSTER
const BATTLETOWER1F_COOLTRAINER_F const BATTLETOWER1F_COOLTRAINER_F
@@ -6,11 +6,11 @@
const BATTLETOWER1F_GRANNY const BATTLETOWER1F_GRANNY
BattleTower1F_MapScripts: BattleTower1F_MapScripts:
db 2 ; scene scripts def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_FINISHED scene_script .Scene1 ; SCENE_FINISHED
db 0 ; callbacks def_callbacks
.Scene0: .Scene0:
setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS
@@ -794,17 +794,17 @@ Text_BattleTowerBugCatcher:
BattleTower1F_MapEvents: BattleTower1F_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 3 ; warp events def_warp_events
warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3 warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3
warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4 warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4
warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1 warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1
db 0 ; coord events def_coord_events
db 1 ; bg events def_bg_events
bg_event 6, 6, BGEVENT_READ, BattleTower1FRulesSign bg_event 6, 6, BGEVENT_READ, BattleTower1FRulesSign
db 5 ; object events def_object_events
object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FReceptionistScript, -1 object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FReceptionistScript, -1
object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BattleTower1FYoungsterScript, -1 object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BattleTower1FYoungsterScript, -1
object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTower1FCooltrainerFScript, -1 object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTower1FCooltrainerFScript, -1

14
maps/BattleTowerBattleRoom.asm
View File

@@ -1,13 +1,13 @@
object_const_def ; object_event constants object_const_def
const BATTLETOWERBATTLEROOM_YOUNGSTER const BATTLETOWERBATTLEROOM_YOUNGSTER
const BATTLETOWERBATTLEROOM_RECEPTIONIST const BATTLETOWERBATTLEROOM_RECEPTIONIST
BattleTowerBattleRoom_MapScripts: BattleTowerBattleRoom_MapScripts:
db 2 ; scene scripts def_scene_scripts
scene_script .EnterBattleRoom ; SCENE_DEFAULT scene_script .EnterBattleRoom ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks def_callbacks
.EnterBattleRoom: .EnterBattleRoom:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER disappear BATTLETOWERBATTLEROOM_YOUNGSTER
@@ -139,14 +139,14 @@ Text_ReturnedAfterSave_Mobile:
BattleTowerBattleRoom_MapEvents: BattleTowerBattleRoom_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4 warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4
warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4 warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4
db 0 ; coord events def_coord_events
db 0 ; bg events def_bg_events
db 2 ; object events def_object_events
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 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 object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1

14
maps/BattleTowerElevator.asm
View File

@@ -1,12 +1,12 @@
object_const_def ; object_event constants object_const_def
const BATTLETOWERELEVATOR_RECEPTIONIST const BATTLETOWERELEVATOR_RECEPTIONIST
BattleTowerElevator_MapScripts: BattleTowerElevator_MapScripts:
db 2 ; scene scripts def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_FINISHED scene_script .Scene1 ; SCENE_FINISHED
db 0 ; callbacks def_callbacks
.Scene0: .Scene0:
prioritysjump .RideElevator prioritysjump .RideElevator
@@ -44,13 +44,13 @@ MovementData_BattleTowerElevatorPlayerWalksIn:
BattleTowerElevator_MapEvents: BattleTowerElevator_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1 warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1
warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1 warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1
db 0 ; coord events def_coord_events
db 0 ; bg events def_bg_events
db 1 ; object events def_object_events
object_event 1, 2, SPRITE_RECEPTIONIST, 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

@@ -1,12 +1,12 @@
object_const_def ; object_event constants object_const_def
const BATTLETOWERHALLWAY_RECEPTIONIST const BATTLETOWERHALLWAY_RECEPTIONIST
BattleTowerHallway_MapScripts: BattleTowerHallway_MapScripts:
db 2 ; scene scripts def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_FINISHED scene_script .Scene1 ; SCENE_FINISHED
db 0 ; callbacks def_callbacks
.Scene0: .Scene0:
prioritysjump .ChooseBattleRoom prioritysjump .ChooseBattleRoom
@@ -77,7 +77,7 @@ BattleTowerHallway_MapScripts:
BattleTowerHallway_MapEvents: BattleTowerHallway_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 6 ; warp events def_warp_events
warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1 warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1
warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1 warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1
warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1 warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1
@@ -85,9 +85,9 @@ BattleTowerHallway_MapEvents:
warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1 warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1
warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1 warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1
db 0 ; coord events def_coord_events
db 0 ; bg events def_bg_events
db 1 ; object events def_object_events
object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1 object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1

14
maps/BattleTowerOutside.asm
View File

@@ -1,13 +1,13 @@
object_const_def ; object_event constants object_const_def
const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
const BATTLETOWEROUTSIDE_BEAUTY const BATTLETOWEROUTSIDE_BEAUTY
const BATTLETOWEROUTSIDE_SAILOR const BATTLETOWEROUTSIDE_SAILOR
const BATTLETOWEROUTSIDE_LASS const BATTLETOWEROUTSIDE_LASS
BattleTowerOutside_MapScripts: BattleTowerOutside_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 2 ; callbacks def_callbacks
callback MAPCALLBACK_TILES, .Callback1 callback MAPCALLBACK_TILES, .Callback1
callback MAPCALLBACK_OBJECTS, .Callback2 callback MAPCALLBACK_OBJECTS, .Callback2
@@ -134,18 +134,18 @@ BattleTowerOutsideText_DoorsOpen:
BattleTowerOutside_MapEvents: BattleTowerOutside_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 4 ; warp events def_warp_events
warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3 warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3
warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4 warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4
warp_event 8, 9, BATTLE_TOWER_1F, 1 warp_event 8, 9, BATTLE_TOWER_1F, 1
warp_event 9, 9, BATTLE_TOWER_1F, 2 warp_event 9, 9, BATTLE_TOWER_1F, 2
db 0 ; coord events def_coord_events
db 1 ; bg events def_bg_events
bg_event 10, 10, BGEVENT_READ, BattleTowerOutsideSign bg_event 10, 10, BGEVENT_READ, BattleTowerOutsideSign
db 4 ; object events def_object_events
object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -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_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1 object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -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, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR

14
maps/BillsBrothersHouse.asm
View File

@@ -1,11 +1,11 @@
object_const_def ; object_event constants object_const_def
const BILLSBROTHERSHOUSE_POKEFAN_F const BILLSBROTHERSHOUSE_POKEFAN_F
const BILLSBROTHERSHOUSE_YOUNGSTER const BILLSBROTHERSHOUSE_YOUNGSTER
BillsBrothersHouse_MapScripts: BillsBrothersHouse_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 0 ; callbacks def_callbacks
BillsBrotherScript: BillsBrotherScript:
jumptextfaceplayer BillsBrotherText jumptextfaceplayer BillsBrotherText
@@ -28,14 +28,14 @@ BillsBrothersHouseYoungsterText:
BillsBrothersHouse_MapEvents: BillsBrothersHouse_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 2, 7, FUCHSIA_CITY, 4 warp_event 2, 7, FUCHSIA_CITY, 4
warp_event 3, 7, FUCHSIA_CITY, 4 warp_event 3, 7, FUCHSIA_CITY, 4
db 0 ; coord events def_coord_events
db 0 ; bg events def_bg_events
db 2 ; object events def_object_events
object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1
object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1

14
maps/BillsFamilysHouse.asm
View File

@@ -1,12 +1,12 @@
object_const_def ; object_event constants object_const_def
const BILLSFAMILYSHOUSE_BILL const BILLSFAMILYSHOUSE_BILL
const BILLSFAMILYSHOUSE_POKEFAN_F const BILLSFAMILYSHOUSE_POKEFAN_F
const BILLSFAMILYSHOUSE_TWIN const BILLSFAMILYSHOUSE_TWIN
BillsFamilysHouse_MapScripts: BillsFamilysHouse_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 0 ; callbacks def_callbacks
BillScript: BillScript:
faceplayer faceplayer
@@ -243,18 +243,18 @@ BillsSisterStorageSystemText:
BillsFamilysHouse_MapEvents: BillsFamilysHouse_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 2, 7, GOLDENROD_CITY, 4 warp_event 2, 7, GOLDENROD_CITY, 4
warp_event 3, 7, GOLDENROD_CITY, 4 warp_event 3, 7, GOLDENROD_CITY, 4
db 0 ; coord events def_coord_events
db 3 ; bg events def_bg_events
bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2 bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2
bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1
bg_event 7, 1, BGEVENT_READ, BillsHouseRadio bg_event 7, 1, BGEVENT_READ, BillsHouseRadio
db 3 ; object events def_object_events
object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL
object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1
object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1

14
maps/BillsHouse.asm
View File

@@ -1,10 +1,10 @@
object_const_def ; object_event constants object_const_def
const BILLSHOUSE_GRAMPS const BILLSHOUSE_GRAMPS
BillsHouse_MapScripts: BillsHouse_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 0 ; callbacks def_callbacks
BillsGrandpa: BillsGrandpa:
faceplayer faceplayer
@@ -354,13 +354,13 @@ BillsGrandpaPichuText:
BillsHouse_MapEvents: BillsHouse_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 2, 7, ROUTE_25, 1 warp_event 2, 7, ROUTE_25, 1
warp_event 3, 7, ROUTE_25, 1 warp_event 3, 7, ROUTE_25, 1
db 0 ; coord events def_coord_events
db 0 ; bg events def_bg_events
db 1 ; object events def_object_events
object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -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

14
maps/BlackthornCity.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants object_const_def
const BLACKTHORNCITY_SUPER_NERD1 const BLACKTHORNCITY_SUPER_NERD1
const BLACKTHORNCITY_SUPER_NERD2 const BLACKTHORNCITY_SUPER_NERD2
const BLACKTHORNCITY_GRAMPS1 const BLACKTHORNCITY_GRAMPS1
@@ -10,9 +10,9 @@
const BLACKTHORNCITY_COOLTRAINER_F2 const BLACKTHORNCITY_COOLTRAINER_F2
BlackthornCity_MapScripts: BlackthornCity_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 2 ; callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_OBJECTS, .Santos callback MAPCALLBACK_OBJECTS, .Santos
@@ -313,7 +313,7 @@ BlackthornCityTrainerTipsText:
BlackthornCity_MapEvents: BlackthornCity_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 8 ; warp events def_warp_events
warp_event 18, 11, BLACKTHORN_GYM_1F, 1 warp_event 18, 11, BLACKTHORN_GYM_1F, 1
warp_event 13, 21, BLACKTHORN_DRAGON_SPEECH_HOUSE, 1 warp_event 13, 21, BLACKTHORN_DRAGON_SPEECH_HOUSE, 1
warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1 warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1
@@ -323,9 +323,9 @@ BlackthornCity_MapEvents:
warp_event 36, 9, ICE_PATH_1F, 2 warp_event 36, 9, ICE_PATH_1F, 2
warp_event 20, 1, DRAGONS_DEN_1F, 1 warp_event 20, 1, DRAGONS_DEN_1F, 1
db 0 ; coord events def_coord_events
db 7 ; bg events def_bg_events
bg_event 34, 24, BGEVENT_READ, BlackthornCitySign bg_event 34, 24, BGEVENT_READ, BlackthornCitySign
bg_event 17, 13, BGEVENT_READ, BlackthornGymSign bg_event 17, 13, BGEVENT_READ, BlackthornGymSign
bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign
@@ -334,7 +334,7 @@ BlackthornCity_MapEvents:
bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign
bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign
db 9 ; object events def_object_events
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 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 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 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN

14
maps/BlackthornDragonSpeechHouse.asm
View File

@@ -1,11 +1,11 @@
object_const_def ; object_event constants object_const_def
const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
const BLACKTHORNDRAGONSPEECHHOUSE_EKANS const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
BlackthornDragonSpeechHouse_MapScripts: BlackthornDragonSpeechHouse_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 0 ; callbacks def_callbacks
BlackthornDragonSpeechHouseGrannyScript: BlackthornDragonSpeechHouseGrannyScript:
jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText
@@ -48,14 +48,14 @@ BlackthornDragonSpeechHouseDratiniText:
BlackthornDragonSpeechHouse_MapEvents: BlackthornDragonSpeechHouse_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 2, 7, BLACKTHORN_CITY, 2 warp_event 2, 7, BLACKTHORN_CITY, 2
warp_event 3, 7, BLACKTHORN_CITY, 2 warp_event 3, 7, BLACKTHORN_CITY, 2
db 0 ; coord events def_coord_events
db 0 ; bg events def_bg_events
db 2 ; object events def_object_events
object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -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 object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1

14
maps/BlackthornEmysHouse.asm
View File

@@ -1,10 +1,10 @@
object_const_def ; object_event constants object_const_def
const BLACKTHORNEMYSHOUSE_EMY const BLACKTHORNEMYSHOUSE_EMY
BlackthornEmysHouse_MapScripts: BlackthornEmysHouse_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 0 ; callbacks def_callbacks
Emy: Emy:
faceplayer faceplayer
@@ -20,15 +20,15 @@ EmysHouseBookshelf:
BlackthornEmysHouse_MapEvents: BlackthornEmysHouse_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events def_warp_events
warp_event 2, 7, BLACKTHORN_CITY, 3 warp_event 2, 7, BLACKTHORN_CITY, 3
warp_event 3, 7, BLACKTHORN_CITY, 3 warp_event 3, 7, BLACKTHORN_CITY, 3
db 0 ; coord events def_coord_events
db 2 ; bg events def_bg_events
bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf
bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
db 1 ; object events def_object_events
object_event 2, 3, SPRITE_LASS, 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

14
maps/BlackthornGym1F.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants object_const_def
const BLACKTHORNGYM1F_CLAIR const BLACKTHORNGYM1F_CLAIR
const BLACKTHORNGYM1F_COOLTRAINER_M1 const BLACKTHORNGYM1F_COOLTRAINER_M1
const BLACKTHORNGYM1F_COOLTRAINER_M2 const BLACKTHORNGYM1F_COOLTRAINER_M2
@@ -6,9 +6,9 @@
const BLACKTHORNGYM1F_GYM_GUIDE const BLACKTHORNGYM1F_GYM_GUIDE
BlackthornGym1F_MapScripts: BlackthornGym1F_MapScripts:
db 0 ; scene scripts def_scene_scripts
db 1 ; callbacks def_callbacks
callback MAPCALLBACK_TILES, .Boulders callback MAPCALLBACK_TILES, .Boulders
.Boulders: .Boulders:
@@ -387,7 +387,7 @@ BlackthornGymGuideWinText:
BlackthornGym1F_MapEvents: BlackthornGym1F_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 7 ; warp events def_warp_events
warp_event 4, 17, BLACKTHORN_CITY, 1 warp_event 4, 17, BLACKTHORN_CITY, 1
warp_event 5, 17, BLACKTHORN_CITY, 1 warp_event 5, 17, BLACKTHORN_CITY, 1
warp_event 1, 7, BLACKTHORN_GYM_2F, 1 warp_event 1, 7, BLACKTHORN_GYM_2F, 1
@@ -396,13 +396,13 @@ BlackthornGym1F_MapEvents:
warp_event 7, 7, BLACKTHORN_GYM_2F, 4 warp_event 7, 7, BLACKTHORN_GYM_2F, 4
warp_event 7, 6, BLACKTHORN_GYM_2F, 5 warp_event 7, 6, BLACKTHORN_GYM_2F, 5
db 0 ; coord events def_coord_events
db 2 ; bg events def_bg_events
bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue
bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue
db 5 ; object events def_object_events
object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -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 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 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1

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