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

Fix errors in global substitution

Browse Source
This commit is contained in:
PikalaxALT
2015-11-03 07:11:32 -05:00
parent 0f37a42ad4
commit 2faa4a0f70
13 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maps/BlackthornGym1F.asm
View File

@@ -47,7 +47,7 @@ ClairScript_0x194e24:
setevent EVENT_BEAT_COOLTRAINERM_MIKE
setevent EVENT_BEAT_COOLTRAINERF_FRAN
setevent EVENT_BEAT_COOLTRAINERF_LOLA
clearevent EVENT_MAHOGANY_MARTTYPE_OWNERS
clearevent EVENT_MAHOGANY_MART_OWNERS
setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
end

4
maps/LakeofRage.asm
View File

@@ -51,9 +51,9 @@ UnknownScript_0x70035:
playsound SFX_WARP_TO
applymovement $2, MovementData_0x70155
disappear $2
clearevent EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
setevent EVENT_DECIDED_TO_HELP_LANCE
domaptrigger MAHOGANY_MARTTYPE_1F, $1
domaptrigger MAHOGANY_MART_1F, $1
end
UnknownScript_0x7004e:

6
maps/MahoganyMart1F.asm
View File

@@ -238,6 +238,6 @@ MahoganyMart1F_MapEventHeader:
db 5
person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MARTTYPE_OWNERS
person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS

4
maps/MahoganyTown.asm
View File

@@ -248,7 +248,7 @@ MahoganyTown_MapEventHeader:
.Warps:
db 5
warp_def $7, $b, 1, MAHOGANY_MARTTYPE_1F
warp_def $7, $b, 1, MAHOGANY_MART_1F
warp_def $7, $11, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
warp_def $d, $6, 1, MAHOGANY_GYM
warp_def $d, $f, 1, MAHOGANY_POKECENTER_1F
@@ -271,4 +271,4 @@ MahoganyTown_MapEventHeader:
person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1
person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MARTTYPE_OWNERS
person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS

2
maps/RadioTower5F.asm
View File

@@ -102,7 +102,7 @@ UnknownScript_0x6006e:
setevent EVENT_GOLDENROD_CITY_ROCKET_SCOUT
setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
clearevent EVENT_MAHOGANY_MARTTYPE_OWNERS
clearevent EVENT_MAHOGANY_MART_OWNERS
clearflag ENGINE_ROCKETS_IN_MAHOGANY
clearevent EVENT_GOLDENROD_CITY_CIVILIANS
clearevent EVENT_RADIO_TOWER_CIVILIANS_AFTER

2
maps/TeamRocketBaseB1F.asm
View File

@@ -730,7 +730,7 @@ TeamRocketBaseB1F_MapEventHeader:
.Warps:
db 4
warp_def $2, $1b, 3, MAHOGANY_MARTTYPE_1F
warp_def $2, $1b, 3, MAHOGANY_MART_1F
warp_def $e, $3, 1, TEAM_ROCKET_BASE_B2F
warp_def $f, $5, 4, TEAM_ROCKET_BASE_B1F
warp_def $2, $19, 3, TEAM_ROCKET_BASE_B1F

2
maps/second_map_headers.asm
View File

@@ -325,7 +325,7 @@
map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0
map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0
map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0
map_header_2 MahoganyMart1F, MAHOGANY_MARTTYPE_1F, $0, 0
map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, 0
map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0
map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0
map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0