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

Replaced GROUP_, MAP_ references with the map macro

Browse Source 
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro

Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme

Added new macro elevfloor to simplify the definition of elevators under this new scheme
This commit is contained in:
PikalaxALT
2015-07-23 12:59:19 -04:00
parent 185b0a1c86
commit 432df825d4
389 changed files with 1551 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
constants/deco_constants.asm
View File

@@ -1,105 +1,105 @@
const_value = 1 const_value = 1
const DECO_PLANT const DECO_PLANT
const DECO_BED const DECO_BED
const DECO_CARPET const DECO_CARPET
const DECO_POSTER const DECO_POSTER
const DECO_DOLL const DECO_DOLL
const DECO_BIGDOLL const DECO_BIGDOLL
const_value = 1 const_value = 1
const PUT_IT_AWAY const PUT_IT_AWAY
const MAGNAPLANT const MAGNAPLANT
const TROPICPLANT const TROPICPLANT
const JUMBOPLANT const JUMBOPLANT
const TOWN_MAP_D const TOWN_MAP_D
const FAMICOM const FAMICOM
const SUPER_NES const SUPER_NES
const NINTENDO_64 const NINTENDO_64
const VIRTUAL_BOY const VIRTUAL_BOY
const GOLD_TROPHY const GOLD_TROPHY
const SILVER_TROPHY const SILVER_TROPHY
const SURF_PIKA_DOLL const SURF_PIKA_DOLL
const _BED const _BED
const _CARPET const _CARPET
const _POSTER const _POSTER
const _DOLL const _DOLL
const BIG_ const BIG_
const FEATHERY_BED const FEATHERY_BED
const PIKACHU_BED const PIKACHU_BED
const PINK_BED const PINK_BED
const POLKADOT_BED const POLKADOT_BED
const RED_CARPET const RED_CARPET
const BLUE_CARPET const BLUE_CARPET
const YELLOW_CARPET const YELLOW_CARPET
const GREEN_CARPET const GREEN_CARPET
const_value = 1 const_value = 1
const SET_UP_BED const SET_UP_BED
const PUT_AWAY_BED const PUT_AWAY_BED
const SET_UP_CARPET const SET_UP_CARPET
const PUT_AWAY_CARPET const PUT_AWAY_CARPET
const SET_UP_PLANT const SET_UP_PLANT
const PUT_AWAY_PLANT const PUT_AWAY_PLANT
const SET_UP_POSTER const SET_UP_POSTER
const PUT_AWAY_POSTER const PUT_AWAY_POSTER
const SET_UP_CONSOLE const SET_UP_CONSOLE
const PUT_AWAY_CONSOLE const PUT_AWAY_CONSOLE
const SET_UP_BIG_DOLL const SET_UP_BIG_DOLL
const PUT_AWAY_BIG_DOLL const PUT_AWAY_BIG_DOLL
const SET_UP_DOLL const SET_UP_DOLL
const PUT_AWAY_DOLL const PUT_AWAY_DOLL
const SET_UP_ORNAMENT const SET_UP_ORNAMENT
const PUT_AWAY_ORNAMENT const PUT_AWAY_ORNAMENT
const_value = 2 const_value = 2
const DECO_FEATHERY_BED ; 2 const DECO_FEATHERY_BED ; 2
const DECO_PINK_BED ; 3 const DECO_PINK_BED ; 3
const DECO_POLKADOT_BED ; 4 const DECO_POLKADOT_BED ; 4
const DECO_PIKACHU_BED ; 5 const DECO_PIKACHU_BED ; 5
const_value = const_value + 1 const_value = const_value + 1
const DECO_RED_CARPET ; 7 const DECO_RED_CARPET ; 7
const DECO_BLUE_CARPET ; 8 const DECO_BLUE_CARPET ; 8
const DECO_YELLOW_CARPET ; 9 const DECO_YELLOW_CARPET ; 9
const DECO_GREEN_CARPET ; a const DECO_GREEN_CARPET ; a
const_value = const_value + 1 const_value = const_value + 1
const DECO_MAGNAPLANT ; c const DECO_MAGNAPLANT ; c
const DECO_TROPICPLANT ; d const DECO_TROPICPLANT ; d
const DECO_JUMBOPLANT ; e const DECO_JUMBOPLANT ; e
const_value = const_value + 1 const_value = const_value + 1
const DECO_TOWN_MAP ; 10 const DECO_TOWN_MAP ; 10
const DECO_PIKACHU_POSTER ; 11 const DECO_PIKACHU_POSTER ; 11
const DECO_CLEFAIRY_POSTER ; 12 const DECO_CLEFAIRY_POSTER ; 12
const DECO_JIGGLYPUFF_POSTER ; 13 const DECO_JIGGLYPUFF_POSTER ; 13
const_value = const_value + 1 const_value = const_value + 1
const DECO_FAMICOM ; 15 const DECO_FAMICOM ; 15
const DECO_SNES ; 16 const DECO_SNES ; 16
const DECO_N64 ; 17 const DECO_N64 ; 17
const DECO_VIRTUAL_BOY ; 18 const DECO_VIRTUAL_BOY ; 18
const_value = const_value + 1 const_value = const_value + 1
const DECO_BIG_SNORLAX_DOLL ; 1a const DECO_BIG_SNORLAX_DOLL ; 1a
const DECO_BIG_ONIX_DOLL ; 1b const DECO_BIG_ONIX_DOLL ; 1b
const DECO_BIG_LAPRAS_DOLL ; 1c const DECO_BIG_LAPRAS_DOLL ; 1c
const_value = const_value + 1 const_value = const_value + 1
const DECO_PIKACHU_DOLL ; 1e const DECO_PIKACHU_DOLL ; 1e
const DECO_SURF_PIKACHU_DOLL ; 1f const DECO_SURF_PIKACHU_DOLL ; 1f
const DECO_CLEFAIRY_DOLL ; 20 const DECO_CLEFAIRY_DOLL ; 20
const DECO_JIGGLYPUFF_DOLL ; 21 const DECO_JIGGLYPUFF_DOLL ; 21
const DECO_BULBASAUR_DOLL ; 22 const DECO_BULBASAUR_DOLL ; 22
const DECO_CHARMANDER_DOLL ; 23 const DECO_CHARMANDER_DOLL ; 23
const DECO_SQUIRTLE_DOLL ; 24 const DECO_SQUIRTLE_DOLL ; 24
const DECO_POLIWAG_DOLL ; 25 const DECO_POLIWAG_DOLL ; 25
const DECO_DIGLETT_DOLL ; 26 const DECO_DIGLETT_DOLL ; 26
const DECO_STARMIE_DOLL ; 27 const DECO_STARMIE_DOLL ; 27
const DECO_MAGIKARP_DOLL ; 28 const DECO_MAGIKARP_DOLL ; 28
const DECO_ODDISH_DOLL ; 29 const DECO_ODDISH_DOLL ; 29
const DECO_GENGAR_DOLL ; 2a const DECO_GENGAR_DOLL ; 2a
const DECO_SHELLDER_DOLL ; 2b const DECO_SHELLDER_DOLL ; 2b
const DECO_GRIMER_DOLL ; 2c const DECO_GRIMER_DOLL ; 2c
const DECO_VOLTORB_DOLL ; 2d const DECO_VOLTORB_DOLL ; 2d
const DECO_WEEDLE_DOLL ; 2e const DECO_WEEDLE_DOLL ; 2e
const DECO_UNOWN_DOLL ; 2f const DECO_UNOWN_DOLL ; 2f
const DECO_GEODUDE_DOLL ; 30 const DECO_GEODUDE_DOLL ; 30
const DECO_MACHOP_DOLL ; 31 const DECO_MACHOP_DOLL ; 31
const DECO_TENTACOOL_DOLL ; 32 const DECO_TENTACOOL_DOLL ; 32
const DECO_GOLD_TROPHY_DOLL ; 33 const DECO_GOLD_TROPHY_DOLL ; 33
const DECO_SILVER_TROPHY_DOLL ; 34 const DECO_SILVER_TROPHY_DOLL ; 34

7
constants/map_constants.asm
View File

@@ -1,5 +1,8 @@
GROUP_N_A EQU -1 GROUP_N_A EQU -1
MAP_N_A EQU -1 MAP_N_A EQU -1
GROUP_NONE EQU 0
MAP_NONE EQU 0
; map group ids ; map group ids
const_def const_def

4
engine/phone_scripts.asm
View File

@@ -1001,7 +1001,7 @@ UnknownScript_0xbd6a6:
iftrue UnknownScript_0xbd6bd iftrue UnknownScript_0xbd6bd
setflag ENGINE_DUNSPARCE_SWARM setflag ENGINE_DUNSPARCE_SWARM
pokenamemem DUNSPARCE, $1 pokenamemem DUNSPARCE, $1
loadwilddata $0, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE loadwilddata $0, DARK_CAVE_VIOLET_ENTRANCE
displaylocation DARK_CAVE, $2 displaylocation DARK_CAVE, $2
farjump UnknownScript_0xa05de farjump UnknownScript_0xa05de
@@ -1224,7 +1224,7 @@ UnknownScript_0xbd887:
iftrue UnknownScript_0xbd8a2 iftrue UnknownScript_0xbd8a2
setflag ENGINE_YANMA_SWARM setflag ENGINE_YANMA_SWARM
pokenamemem YANMA, $1 pokenamemem YANMA, $1
loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35 loadwilddata $1, ROUTE_35
displaylocation ROUTE_35, $2 displaylocation ROUTE_35, $2
farjump UnknownScript_0xa05ce farjump UnknownScript_0xa05ce

2
engine/spawn_points.asm
View File

@@ -89,7 +89,7 @@ IsSpawnPoint: ; 15344
.next .next
push bc push bc
ld bc, 4 ld bc, 4 ; length of a spawn table entry
add hl, bc add hl, bc
pop bc pop bc
inc c inc c

6
engine/std_scripts.asm
View File

@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall ELMCALL_WEIRDBROADCAST specialphonecall ELMCALL_WEIRDBROADCAST
domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 domaptrigger MAHOGANY_TOWN, $1
end end
BugContestResultsWarpScript: BugContestResultsWarpScript:
@@ -307,7 +307,7 @@ BugContestResultsWarpScript:
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4 warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4
applymovement $0, Movement_ContestResults_WalkAfterWarp applymovement $0, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript: BugContestResultsScript:
@@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons
BugContestResults_CleanUp BugContestResults_CleanUp
loadmovesprites loadmovesprites
dotrigger $0 dotrigger $0
domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0 domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A setevent EVENT_BUG_CATCHING_CONTESTANT_3A

31
macros/event.asm
View File

@@ -120,16 +120,14 @@ ptcallasm: macro
enum checkmaptriggers_command enum checkmaptriggers_command
checkmaptriggers: macro checkmaptriggers: macro
db checkmaptriggers_command db checkmaptriggers_command
db \1 ; map_group map \1 ; map
db \2 ; map_id
endm endm
enum domaptrigger_command enum domaptrigger_command
domaptrigger: macro domaptrigger: macro
db domaptrigger_command db domaptrigger_command
db \1 ; map_group map \1 ; map
db \2 ; map_id db \2 ; trigger_id
db \3 ; trigger_id
endm endm
enum checktriggers_command enum checktriggers_command
@@ -385,24 +383,21 @@ xycompare: macro
warpmod: macro warpmod: macro
db warpmod_command db warpmod_command
db \1 ; warp_id db \1 ; warp_id
db \2 ; map_group map \2 ; map
db \3 ; map_id
endm endm
enum blackoutmod_command enum blackoutmod_command
blackoutmod: macro blackoutmod: macro
db blackoutmod_command db blackoutmod_command
db \1 ; map_group map \1 ; map
db \2 ; map_id
endm endm
enum warp_command enum warp_command
warp: macro warp: macro
db warp_command db warp_command
db \1 ; map_group map \1 ; map
db \2 ; map_id db \2 ; x
db \3 ; x db \3 ; y
db \4 ; y
endm endm
enum readmoney_command enum readmoney_command
@@ -997,8 +992,7 @@ verbosegiveitem2: macro
loadwilddata: macro loadwilddata: macro
db loadwilddata_command db loadwilddata_command
db \1 ; flag db \1 ; flag
db \2 ; map_group map \2 ; map
db \3 ; map_id
endm endm
enum halloffame_command enum halloffame_command
@@ -1015,10 +1009,9 @@ credits: macro
warpfacing: macro warpfacing: macro
db warpfacing_command db warpfacing_command
db \1 ; facing db \1 ; facing
db \2 ; map_group map \2 ; map
db \3 ; map_id db \3 ; x
db \4 ; x db \4 ; y
db \5 ; y
endm endm
enum storetext_command enum storetext_command

8
macros/map.asm
View File

@@ -61,8 +61,7 @@ warp_def: macro
db \1 ; y db \1 ; y
db \2 ; x db \2 ; x
db \3 ; warp_to db \3 ; warp_to
db \4 ; map group map \4 ; map
db \5 ; map number
endm endm
@@ -177,3 +176,8 @@ newgroup: MACRO
const_value = const_value + 1 const_value = const_value + 1
enum_start 1 enum_start 1
ENDM ENDM
elevfloor: MACRO
db \1, \2
map \3
ENDM

22
macros/trainer.asm
View File

@@ -1,11 +1,11 @@
trainerclass: MACRO trainerclass: MACRO
enum \1 enum \1
const_value = 1 const_value = 1
ENDM ENDM
trainer: MACRO trainer: MACRO
; flag, group, id, seen text, win text, lost text, talk-again text ; flag, group, id, seen text, win text, lost text, talk-again text
dw \1 dw \1
db \2, \3 db \2, \3
dw \4, \5, \6, \7 dw \4, \5, \6, \7
ENDM ENDM

4
maps/AzaleaGym.asm
View File

@@ -358,8 +358,8 @@ AzaleaGym_MapEventHeader:
.Warps: .Warps:
db 2 db 2
warp_def $f, $4, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $f, $4, 5, AZALEA_TOWN
warp_def $f, $5, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $f, $5, 5, AZALEA_TOWN
.XYTriggers: .XYTriggers:
db 0 db 0

4
maps/AzaleaMart.asm
View File

@@ -46,8 +46,8 @@ AzaleaMart_MapEventHeader:
.Warps: .Warps:
db 2 db 2
warp_def $7, $2, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $2, 3, AZALEA_TOWN
warp_def $7, $3, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $3, 3, AZALEA_TOWN
.XYTriggers: .XYTriggers:
db 0 db 0

6
maps/AzaleaPokeCenter1F.asm
View File

@@ -78,9 +78,9 @@ AzaleaPokeCenter1F_MapEventHeader:
.Warps: .Warps:
db 3 db 3
warp_def $7, $3, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $3, 1, AZALEA_TOWN
warp_def $7, $4, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $4, 1, AZALEA_TOWN
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers: .XYTriggers:
db 0 db 0

16
maps/AzaleaTown.asm
View File

@@ -452,14 +452,14 @@ AzaleaTown_MapEventHeader:
.Warps: .Warps:
db 8 db 8
warp_def $9, $f, 1, GROUP_AZALEA_POKECENTER_1F, MAP_AZALEA_POKECENTER_1F warp_def $9, $f, 1, AZALEA_POKECENTER_1F
warp_def $d, $15, 1, GROUP_CHARCOAL_KILN, MAP_CHARCOAL_KILN warp_def $d, $15, 1, CHARCOAL_KILN
warp_def $5, $15, 2, GROUP_AZALEA_MART, MAP_AZALEA_MART warp_def $5, $15, 2, AZALEA_MART
warp_def $5, $9, 1, GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE warp_def $5, $9, 1, KURTS_HOUSE
warp_def $f, $a, 1, GROUP_AZALEA_GYM, MAP_AZALEA_GYM warp_def $f, $a, 1, AZALEA_GYM
warp_def $7, $1f, 1, GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F warp_def $7, $1f, 1, SLOWPOKE_WELL_B1F
warp_def $a, $2, 3, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE
warp_def $b, $2, 4, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE
.XYTriggers: .XYTriggers:
db 3 db 3

12
maps/BattleTower1F.asm
View File

@@ -102,9 +102,9 @@ UnknownScript_0x9e44e:
special Function170687 special Function170687
UnknownScript_0x9e454: UnknownScript_0x9e454:
musicfadeout MUSIC_NONE, $8 musicfadeout MUSIC_NONE, $8
domaptrigger GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $0 domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
domaptrigger GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $0 domaptrigger BATTLE_TOWER_ELEVATOR, $0
domaptrigger GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $0 domaptrigger BATTLE_TOWER_HALLWAY, $0
follow $2, $0 follow $2, $0
applymovement $2, MovementData_0x9e571 applymovement $2, MovementData_0x9e571
writebyte $a writebyte $a
@@ -797,9 +797,9 @@ BattleTower1F_MapEventHeader:
.Warps: .Warps:
db 3 db 3
warp_def $9, $7, 3, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE warp_def $9, $7, 3, BATTLE_TOWER_OUTSIDE
warp_def $9, $8, 4, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE
warp_def $0, $7, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR
.XYTriggers: .XYTriggers:
db 0 db 0

10
maps/BattleTowerBattleRoom.asm
View File

@@ -85,14 +85,14 @@ UnknownScript_0x9f4a3:
special Function170687 special Function170687
loadmovesprites loadmovesprites
special FadeBlackBGMap special FadeBlackBGMap
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 warpfacing $1, BATTLE_TOWER_1F, $7, $7
loadfont loadfont
jump UnknownScript_0x9e4b0 jump UnknownScript_0x9e4b0
UnknownScript_0x9f4c2: UnknownScript_0x9f4c2:
pause 60 pause 60
special Special_BattleTowerFade special Special_BattleTowerFade
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 warpfacing $1, BATTLE_TOWER_1F, $7, $7
writebyte $4 writebyte $4
special Function170687 special Function170687
loadfont loadfont
@@ -104,7 +104,7 @@ UnknownScript_0x9f4c2:
UnknownScript_0x9f4d9: UnknownScript_0x9f4d9:
pause 60 pause 60
special Special_BattleTowerFade special Special_BattleTowerFade
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 warpfacing $1, BATTLE_TOWER_1F, $7, $7
BattleTowerBattleRoomScript_0x9f4e4: BattleTowerBattleRoomScript_0x9f4e4:
loadfont loadfont
writetext UnknownText_0x9eaef writetext UnknownText_0x9eaef
@@ -144,8 +144,8 @@ BattleTowerBattleRoom_MapEventHeader:
.Warps: .Warps:
db 2 db 2
warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY
warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY
.XYTriggers: .XYTriggers:
db 0 db 0

4
maps/BattleTowerElevator.asm
View File

@@ -49,8 +49,8 @@ BattleTowerElevator_MapEventHeader:
.Warps: .Warps:
db 2 db 2
warp_def $3, $1, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY
warp_def $3, $2, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY
.XYTriggers: .XYTriggers:
db 0 db 0

12
maps/BattleTowerHallway.asm
View File

@@ -81,12 +81,12 @@ BattleTowerHallway_MapEventHeader:
.Warps: .Warps:
db 6 db 6
warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR warp_def $1, $b, 1, BATTLE_TOWER_ELEVATOR
warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $5, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $7, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $7, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $9, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $9, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM
.XYTriggers: .XYTriggers:
db 0 db 0

8
maps/BattleTowerOutside.asm
View File

@@ -128,10 +128,10 @@ BattleTowerOutside_MapEventHeader:
.Warps: .Warps:
db 4 db 4
warp_def $15, $8, 3, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE warp_def $15, $8, 3, ROUTE_40_BATTLE_TOWER_GATE
warp_def $15, $9, 4, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE warp_def $15, $9, 4, ROUTE_40_BATTLE_TOWER_GATE
warp_def $9, $8, 1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F warp_def $9, $8, 1, BATTLE_TOWER_1F
warp_def $9, $9, 2, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F warp_def $9, $9, 2, BATTLE_TOWER_1F
.XYTriggers: .XYTriggers:
db 0 db 0

4
maps/BillsHouse.asm
View File

@@ -356,8 +356,8 @@ BillsHouse_MapEventHeader:
.Warps: .Warps:
db 2 db 2
warp_def $7, $2, 1, GROUP_ROUTE_25, MAP_ROUTE_25 warp_def $7, $2, 1, ROUTE_25
warp_def $7, $3, 1, GROUP_ROUTE_25, MAP_ROUTE_25 warp_def $7, $3, 1, ROUTE_25
.XYTriggers: .XYTriggers:
db 0 db 0

16
maps/BlackthornCity.asm
View File

@@ -309,14 +309,14 @@ BlackthornCity_MapEventHeader:
.Warps: .Warps:
db 8 db 8
warp_def $b, $12, 1, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F warp_def $b, $12, 1, BLACKTHORN_GYM_1F
warp_def $15, $d, 1, GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE, MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def $17, $1d, 1, GROUP_BLACKTHORN_DODRIO_TRADE_HOUSE, MAP_BLACKTHORN_DODRIO_TRADE_HOUSE warp_def $17, $1d, 1, BLACKTHORN_DODRIO_TRADE_HOUSE
warp_def $1d, $f, 2, GROUP_BLACKTHORN_MART, MAP_BLACKTHORN_MART warp_def $1d, $f, 2, BLACKTHORN_MART
warp_def $1d, $15, 1, GROUP_BLACKTHORN_POKECENTER_1F, MAP_BLACKTHORN_POKECENTER_1F warp_def $1d, $15, 1, BLACKTHORN_POKECENTER_1F
warp_def $1f, $9, 1, GROUP_MOVE_DELETERS_HOUSE, MAP_MOVE_DELETERS_HOUSE warp_def $1f, $9, 1, MOVE_DELETERS_HOUSE
warp_def $9, $24, 2, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F warp_def $9, $24, 2, ICE_PATH_1F
warp_def $1, $14, 1, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F warp_def $1, $14, 1, DRAGONS_DEN_1F
.XYTriggers: .XYTriggers:
db 0 db 0

4
maps/BlackthornDodrioTradeHouse.asm
View File

@@ -22,8 +22,8 @@ BlackthornDodrioTradeHouse_MapEventHeader:
.Warps: .Warps:
db 2 db 2
warp_def $7, $2, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $2, 3, BLACKTHORN_CITY
warp_def $7, $3, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 3, BLACKTHORN_CITY
.XYTriggers: .XYTriggers:
db 0 db 0

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