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

xy_trigger handles $0 padding, so map scripts are simpler

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-12 14:11:23 -05:00
parent 8b501c19a6
commit 047c8e4bc0
45 changed files with 118 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
macros/map.asm
View File

@ -21,13 +21,10 @@ xy_trigger: macro
;\1: number: controlled by dotrigger/domaptrigger
;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0
;\4: unknown1: $0
;\5: script pointer
;\6: unknown2: $0
;\7: unknown3: $0
db \1, \2, \3, \4
dw \5
db \6, \7
;\4: script pointer
db \1, \2, \3, $0
dw \4
db $0, $0
endm
signpost: macro

6
maps/AzaleaTown.asm
View File

@ -472,9 +472,9 @@ AzaleaTown_MapEventHeader:
.XYTriggers:
db 3
xy_trigger 1, $a, $5, $0, AzaleaTownRivalBattleTrigger1, $0, $0
xy_trigger 1, $b, $5, $0, AzaleaTownRivalBattleTrigger2, $0, $0
xy_trigger 2, $6, $9, $0, AzaleaTownCelebiTrigger, $0, $0
xy_trigger 1, $a, $5, AzaleaTownRivalBattleTrigger1
xy_trigger 1, $b, $5, AzaleaTownRivalBattleTrigger2
xy_trigger 2, $6, $9, AzaleaTownCelebiTrigger
.Signposts:
db 9

2
maps/BurnedTower1F.asm
View File

@ -302,7 +302,7 @@ BurnedTower1F_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 1, $9, $b, $0, BurnedTowerRivalBattleScript, $0, $0
xy_trigger 1, $9, $b, BurnedTowerRivalBattleScript
.Signposts:
db 2

2
maps/BurnedTowerB1F.asm
View File

@ -250,7 +250,7 @@ BurnedTowerB1F_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 0, $6, $a, $0, ReleaseTheBeasts, $0, $0
xy_trigger 0, $6, $a, ReleaseTheBeasts
.Signposts:
db 0

4
maps/CherrygroveCity.asm
View File

@ -560,8 +560,8 @@ CherrygroveCity_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 1, $6, $21, $0, CherrygroveSilverTriggerNorth, $0, $0
xy_trigger 1, $7, $21, $0, CherrygroveSilverTriggerSouth, $0, $0
xy_trigger 1, $6, $21, CherrygroveSilverTriggerNorth
xy_trigger 1, $7, $21, CherrygroveSilverTriggerSouth
.Signposts:
db 4

2
maps/CianwoodCity.asm
View File

@ -396,7 +396,7 @@ CianwoodCity_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 1, $10, $b, $0, CianwoodCitySuicuneAndEusine, $0, $0
xy_trigger 1, $10, $b, CianwoodCitySuicuneAndEusine
.Signposts:
db 8

2
maps/DragonsDenB1F.asm
View File

@ -417,7 +417,7 @@ DragonsDenB1F_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 1, $1e, $13, $0, DragonsDenB1F_ClairTrigger, $0, $0
xy_trigger 1, $1e, $13, DragonsDenB1F_ClairTrigger
.Signposts:
db 4

4
maps/EcruteakHouse.asm
View File

@ -291,8 +291,8 @@ EcruteakHouse_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 0, $7, $4, $0, EcruteakHouse_XYTrigger1, $0, $0
xy_trigger 0, $7, $5, $0, EcruteakHouse_XYTrigger2, $0, $0
xy_trigger 0, $7, $4, EcruteakHouse_XYTrigger1
xy_trigger 0, $7, $5, EcruteakHouse_XYTrigger2
.Signposts:
db 0

16
maps/ElmsLab.asm
View File

@ -1381,14 +1381,14 @@ ElmsLab_MapEventHeader:
.XYTriggers:
db 8
xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0
xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0
xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0
xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0
xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0
xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0
xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0
xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0
xy_trigger 1, $6, $4, LabTryToLeaveScript
xy_trigger 1, $6, $5, LabTryToLeaveScript
xy_trigger 3, $5, $4, MeetCopScript
xy_trigger 3, $5, $5, MeetCopScript2
xy_trigger 5, $8, $4, AideScript_WalkPotions1
xy_trigger 5, $8, $5, AideScript_WalkPotions2
xy_trigger 6, $8, $4, AideScript_WalkBalls1
xy_trigger 6, $8, $5, AideScript_WalkBalls2
.Signposts:
db 16

4
maps/FastShip1F.asm
View File

@ -306,8 +306,8 @@ FastShip1F_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 2, $6, $18, $0, WorriedGrandpaTriggerLeft, $0, $0
xy_trigger 2, $6, $19, $0, WorriedGrandpaTriggerRight, $0, $0
xy_trigger 2, $6, $18, WorriedGrandpaTriggerLeft
xy_trigger 2, $6, $19, WorriedGrandpaTriggerRight
.Signposts:
db 0

4
maps/FastShipB1F.asm
View File

@ -459,8 +459,8 @@ FastShipB1F_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 0, $7, $1e, $0, UnknownScript_0x7673c, $0, $0
xy_trigger 0, $7, $1f, $0, UnknownScript_0x76751, $0, $0
xy_trigger 0, $7, $1e, UnknownScript_0x7673c
xy_trigger 0, $7, $1f, UnknownScript_0x76751
.Signposts:
db 1

2
maps/GoldenrodGym.asm
View File

@ -390,7 +390,7 @@ GoldenrodGym_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 1, $5, $8, $0, WhitneyCriesScript, $0, $0
xy_trigger 1, $5, $8, WhitneyCriesScript
.Signposts:
db 2

2
maps/GoldenrodMagnetTrainStation.asm
View File

@ -177,7 +177,7 @@ GoldenrodMagnetTrainStation_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 0, $6, $b, $0, Script_ArriveFromSaffron, $0, $0
xy_trigger 0, $6, $b, Script_ArriveFromSaffron
.Signposts:
db 0

4
maps/GoldenrodPokecenter1F.asm
View File

@ -817,8 +817,8 @@ GoldenrodPokecenter1F_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 0, $7, $3, $0, GoldenrodPokecenter1F_GSBallTriggerLeft, $0, $0
xy_trigger 0, $7, $4, $0, GoldenrodPokecenter1F_GSBallTriggerRight, $0, $0
xy_trigger 0, $7, $3, GoldenrodPokecenter1F_GSBallTriggerLeft
xy_trigger 0, $7, $4, GoldenrodPokecenter1F_GSBallTriggerRight
.Signposts:
db 0

4
maps/IndigoPlateauPokecenter1F.asm
View File

@ -315,8 +315,8 @@ IndigoPlateauPokecenter1F_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 0, $4, $10, $0, PlateauRivalBattle1, $0, $0
xy_trigger 0, $4, $11, $0, PlateauRivalBattle2, $0, $0
xy_trigger 0, $4, $10, PlateauRivalBattle1
xy_trigger 0, $4, $11, PlateauRivalBattle2
.Signposts:
db 0

4
maps/KrissHouse1F.asm
View File

@ -397,8 +397,8 @@ KrissHouse1F_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 0, $4, $8, $0, UnknownScript_0x7a4d8, $0, $0
xy_trigger 0, $4, $9, $0, UnknownScript_0x7a4db, $0, $0
xy_trigger 0, $4, $8, UnknownScript_0x7a4d8
xy_trigger 0, $4, $9, UnknownScript_0x7a4db
.Signposts:
db 4

4
maps/LancesRoom.asm
View File

@ -350,8 +350,8 @@ LancesRoom_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 1, $5, $4, $0, Script_ApproachLanceFromLeft, $0, $0
xy_trigger 1, $5, $5, $0, Script_ApproachLanceFromRight, $0, $0
xy_trigger 1, $5, $4, Script_ApproachLanceFromLeft
xy_trigger 1, $5, $5, Script_ApproachLanceFromRight
.Signposts:
db 0

4
maps/MahoganyTown.asm
View File

@ -258,8 +258,8 @@ MahoganyTown_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 0, $8, $13, $0, UnknownScript_0x190013, $0, $0
xy_trigger 0, $9, $13, $0, UnknownScript_0x190013, $0, $0
xy_trigger 0, $8, $13, UnknownScript_0x190013
xy_trigger 0, $9, $13, UnknownScript_0x190013
.Signposts:
db 4

2
maps/MountMoonSquare.asm
View File

@ -145,7 +145,7 @@ MountMoonSquare_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 0, $b, $7, $0, ClefairyDance, $0, $0
xy_trigger 0, $b, $7, ClefairyDance
.Signposts:
db 2

4
maps/NewBarkTown.asm
View File

@ -294,8 +294,8 @@ NewBarkTown_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 0, $8, $1, $0, NewBarkTown_TeacherStopsYouTrigger1, $0, $0
xy_trigger 0, $9, $1, $0, NewBarkTown_TeacherStopsYouTrigger2, $0, $0
xy_trigger 0, $8, $1, NewBarkTown_TeacherStopsYouTrigger1
xy_trigger 0, $9, $1, NewBarkTown_TeacherStopsYouTrigger2
.Signposts:
db 4

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