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

7
constants/map_constants.asm
View File

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

4
engine/phone_scripts.asm
View File

@@ -1001,7 +1001,7 @@ UnknownScript_0xbd6a6:
iftrue UnknownScript_0xbd6bd
setflag ENGINE_DUNSPARCE_SWARM
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
farjump UnknownScript_0xa05de
@@ -1224,7 +1224,7 @@ UnknownScript_0xbd887:
iftrue UnknownScript_0xbd8a2
setflag ENGINE_YANMA_SWARM
pokenamemem YANMA, $1
loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35
loadwilddata $1, ROUTE_35
displaylocation ROUTE_35, $2
farjump UnknownScript_0xa05ce

2
engine/spawn_points.asm
View File

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

6
engine/std_scripts.asm
View File

@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall ELMCALL_WEIRDBROADCAST
domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
domaptrigger MAHOGANY_TOWN, $1
end
BugContestResultsWarpScript:
@@ -307,7 +307,7 @@ BugContestResultsWarpScript:
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
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
BugContestResultsScript:
@@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons
BugContestResults_CleanUp
loadmovesprites
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_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A

31
macros/event.asm
View File

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

8
macros/map.asm
View File

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

4
maps/AzaleaGym.asm
View File

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

4
maps/AzaleaMart.asm
View File

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

6
maps/AzaleaPokeCenter1F.asm
View File

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

16
maps/AzaleaTown.asm
View File

@@ -452,14 +452,14 @@ AzaleaTown_MapEventHeader:
.Warps:
db 8
warp_def $9, $f, 1, GROUP_AZALEA_POKECENTER_1F, MAP_AZALEA_POKECENTER_1F
warp_def $d, $15, 1, GROUP_CHARCOAL_KILN, MAP_CHARCOAL_KILN
warp_def $5, $15, 2, GROUP_AZALEA_MART, MAP_AZALEA_MART
warp_def $5, $9, 1, GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE
warp_def $f, $a, 1, GROUP_AZALEA_GYM, MAP_AZALEA_GYM
warp_def $7, $1f, 1, GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F
warp_def $a, $2, 3, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE
warp_def $b, $2, 4, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE
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
.XYTriggers:
db 3

12
maps/BattleTower1F.asm
View File

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

10
maps/BattleTowerBattleRoom.asm
View File

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

4
maps/BattleTowerElevator.asm
View File

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

12
maps/BattleTowerHallway.asm
View File

@@ -81,12 +81,12 @@ BattleTowerHallway_MapEventHeader:
.Warps:
db 6
warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR
warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $7, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $9, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
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
.XYTriggers:
db 0

8
maps/BattleTowerOutside.asm
View File

@@ -128,10 +128,10 @@ BattleTowerOutside_MapEventHeader:
.Warps:
db 4
warp_def $15, $8, 3, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE
warp_def $15, $9, 4, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE
warp_def $9, $8, 1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F
warp_def $9, $9, 2, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F
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
.XYTriggers:
db 0

4
maps/BillsHouse.asm
View File

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

16
maps/BlackthornCity.asm
View File

@@ -309,14 +309,14 @@ BlackthornCity_MapEventHeader:
.Warps:
db 8
warp_def $b, $12, 1, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
warp_def $15, $d, 1, GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE, MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def $17, $1d, 1, GROUP_BLACKTHORN_DODRIO_TRADE_HOUSE, MAP_BLACKTHORN_DODRIO_TRADE_HOUSE
warp_def $1d, $f, 2, GROUP_BLACKTHORN_MART, MAP_BLACKTHORN_MART
warp_def $1d, $15, 1, GROUP_BLACKTHORN_POKECENTER_1F, MAP_BLACKTHORN_POKECENTER_1F
warp_def $1f, $9, 1, GROUP_MOVE_DELETERS_HOUSE, MAP_MOVE_DELETERS_HOUSE
warp_def $9, $24, 2, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F
warp_def $1, $14, 1, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F
warp_def $b, $12, 1, BLACKTHORN_GYM_1F
warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def $17, $1d, 1, BLACKTHORN_DODRIO_TRADE_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
.XYTriggers:
db 0

4
maps/BlackthornDodrioTradeHouse.asm
View File

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

4
maps/BlackthornDragonSpeechHouse.asm
View File

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

14
maps/BlackthornGym1F.asm
View File

@@ -386,13 +386,13 @@ BlackthornGym1F_MapEventHeader:
.Warps:
db 7
warp_def $11, $4, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $11, $5, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $1, 1, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $9, $7, 2, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $6, $2, 3, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $7, $7, 4, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $6, $7, 5, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
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
.XYTriggers:
db 0

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