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

Clean up some hex values in map scripts

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-09 18:45:25 -05:00
parent fbc353f206
commit 2f0973f3e0
101 changed files with 420 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
constants/trainer_constants.asm
View File

@ -26,20 +26,28 @@ CHRIS EQU __enum__
KRIS EQU __enum__
trainerclass FALKNER ; 1
const FALKNER1
trainerclass WHITNEY ; 2
const WHITNEY1
trainerclass BUGSY ; 3
const BUGSY1
trainerclass MORTY ; 4
const MORTY1
trainerclass PRYCE ; 5
const PRYCE1
trainerclass JASMINE ; 6
const JASMINE1
trainerclass CHUCK ; 7
const CHUCK1
trainerclass CLAIR ; 8
const CLAIR1
trainerclass RIVAL1 ; 9
const RIVAL1_1_CHIKORITA
@ -61,6 +69,7 @@ KRIS EQU __enum__
trainerclass POKEMON_PROF ; a
trainerclass WILL ; b
const WILL1
trainerclass CAL ; c
const CAL1
@ -68,19 +77,25 @@ KRIS EQU __enum__
const CAL3
trainerclass BRUNO ; d
const BRUNO1
trainerclass KAREN ; e
const KAREN1
trainerclass KOGA ; f
const KOGA1
trainerclass CHAMPION ; 10
const LANCE
trainerclass BROCK ; 11
const BROCK1
trainerclass MISTY ; 12
const MISTY1
trainerclass LT_SURGE ; 13
const LT_SURGE1
trainerclass SCIENTIST ; 14
const ROSS
@ -90,6 +105,7 @@ KRIS EQU __enum__
const RICH
trainerclass ERIKA ; 15
const ERIKA1
trainerclass YOUNGSTER ; 16
const JOEY1
@ -174,6 +190,7 @@ KRIS EQU __enum__
const DANA5
trainerclass JANINE ; 1a
const JANINE1
trainerclass COOLTRAINERM ; 1b
const NICK
@ -306,6 +323,7 @@ KRIS EQU __enum__
const SHIRLEY
trainerclass SABRINA ; 23
const SABRINA1
trainerclass BUG_CATCHER ; 24
const DON
@ -478,6 +496,7 @@ KRIS EQU __enum__
const GLENN
trainerclass BLAINE ; 2e
const BLAINE1
trainerclass BURGLAR ; 2f
const DUNCAN
@ -662,8 +681,10 @@ KRIS EQU __enum__
const JAIME
trainerclass RED ; 3f
const RED1
trainerclass BLUE ; 40
const BLUE1
trainerclass OFFICER ; 41
const KEITH

4
maps/AzaleaGym.asm
View File

@ -23,7 +23,7 @@ AzaleaGymBugsyScript:
waitbutton
closetext
winlosstext BugsyText_ResearchIncomplete, 0
loadtrainer BUGSY, 1
loadtrainer BUGSY, BUGSY1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_BUGSY
@ -146,7 +146,7 @@ AzaleaGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext BUGSY, 1, $1
trainertotext BUGSY, BUGSY1, $1
jumpstd gymstatue2
BugsyText_INeverLose:

6
maps/AzaleaTown.asm
View File

@ -37,7 +37,7 @@ AzaleaTown_MapScriptHeader:
return
AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, $b, $b
moveobject AZALEATOWN_SILVER, 11, 11
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
@ -102,7 +102,7 @@ AzaleaTownRivalBattleScript:
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
setscene $0
setscene 0
waitsfx
playmapmusic
end
@ -170,7 +170,7 @@ AzaleaTownCelebiScene:
setflag ENGINE_HAVE_EXAMINED_GS_BALL
clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
setscene $0
setscene 0
closetext
end

16
maps/BattleTower1F.asm
View File

@ -38,7 +38,7 @@ BattleTower1F_MapScriptHeader:
writebyte BATTLETOWERACTION_06
special BattleTowerAction
.SkipEverything:
setscene $1
setscene 1
.Scene1:
end
@ -81,10 +81,10 @@ Script_ChooseChallenge: ; 0x9e40f
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
setscene $0
setscene 0
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene $1
setscene 1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
@ -105,9 +105,9 @@ Script_ResumeBattleTowerChallenge:
special BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, $0
setmapscene BATTLE_TOWER_ELEVATOR, $0
setmapscene BATTLE_TOWER_HALLWAY, $0
setmapscene BATTLE_TOWER_BATTLE_ROOM, 0
setmapscene BATTLE_TOWER_ELEVATOR, 0
setmapscene BATTLE_TOWER_HALLWAY, 0
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A
@ -208,10 +208,10 @@ continue:
writetext Text_SaveBeforeReentry
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
setscene $0
setscene 0
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene $1
setscene 1
writebyte BATTLETOWERACTION_06
special BattleTowerAction
writebyte BATTLETOWERACTION_12

8
maps/BattleTowerBattleRoom.asm
View File

@ -14,7 +14,7 @@ BattleTowerBattleRoom_MapScriptHeader:
.EnterBattleRoom: ; 0x9f419
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom
setscene $1
setscene 1
.DummyScene:
end
@ -87,14 +87,14 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
special BattleTowerAction
closetext
special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
warpfacing UP, BATTLE_TOWER_1F, 7, 7
opentext
jump Script_BattleTowerHopeToServeYouAgain
Script_FailedBattleTowerChallenge:
pause 60
special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7
warpfacing UP, BATTLE_TOWER_1F, 7, 7
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
opentext
@ -106,7 +106,7 @@ Script_FailedBattleTowerChallenge:
Script_BeatenAllTrainers: ; 0x9f4d9
pause 60
special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7
warpfacing UP, BATTLE_TOWER_1F, 7, 7
Script_BeatenAllTrainers2:
opentext
writetext Text_CongratulationsYouveBeatenAllTheTrainers

2
maps/BattleTowerElevator.asm
View File

@ -12,7 +12,7 @@ BattleTowerElevator_MapScriptHeader:
.Scene0:
priorityjump .RideElevator
setscene $1
setscene 1
.Scene1:
end

2
maps/BattleTowerHallway.asm
View File

@ -12,7 +12,7 @@ BattleTowerHallway_MapScriptHeader:
.Scene0:
priorityjump .ChooseBattleRoom
setscene $1
setscene 1
.Scene1:
end

10
maps/BlackthornGym1F.asm
View File

@ -16,15 +16,15 @@ BlackthornGym1F_MapScriptHeader:
.Boulders:
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1
iffalse .skip1
changeblock $8, $2, $3b
changeblock 8, 2, $3b
.skip1
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_2
iffalse .skip2
changeblock $2, $4, $3a
changeblock 2, 4, $3a
.skip2
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_3
iffalse .skip3
changeblock $8, $6, $3b
changeblock 8, 6, $3b
.skip3
return
@ -39,7 +39,7 @@ BlackthornGymClairScript:
waitbutton
closetext
winlosstext ClairWinText, 0
loadtrainer CLAIR, 1
loadtrainer CLAIR, CLAIR1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_CLAIR
@ -146,7 +146,7 @@ BlackthornGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext CLAIR, 1, $1
trainertotext CLAIR, CLAIR1, $1
jumpstd gymstatue2
ClairIntroText:

12
maps/BrunosRoom.asm
View File

@ -21,11 +21,11 @@ BrunosRoom_MapScriptHeader:
.BrunosRoomDoors:
checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
iffalse .KeepDoorClosed
changeblock $4, $e, $2a
changeblock 4, 14, $2a
.KeepDoorClosed:
checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN
iffalse .OpenDoor
changeblock $4, $2, $16
changeblock 4, 2, $16
.OpenDoor:
return
@ -34,10 +34,10 @@ BrunosRoom_MapScriptHeader:
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
changeblock $4, $e, $2a
changeblock 4, 14, $2a
reloadmappart
closetext
setscene $1
setscene 1
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
waitsfx
end
@ -51,7 +51,7 @@ BrunoScript_Battle:
waitbutton
closetext
winlosstext BrunoScript_BrunoBeatenText, 0
loadtrainer BRUNO, 1
loadtrainer BRUNO, BRUNO1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_BRUNO
@ -60,7 +60,7 @@ BrunoScript_Battle:
waitbutton
closetext
playsound SFX_ENTER_DOOR
changeblock $4, $2, $16
changeblock 4, 2, $16
reloadmappart
closetext
setevent EVENT_BRUNOS_ROOM_EXIT_OPEN

12
maps/BurnedTower1F.asm
View File

@ -29,11 +29,11 @@ BurnedTower1F_MapScriptHeader:
.HoleAndLadder:
checkevent EVENT_HOLE_IN_BURNED_TOWER
iftrue .Next
changeblock $a, $8, $32 ; hole
changeblock 10, 8, $32 ; hole
.Next:
checkevent EVENT_RELEASED_THE_BEASTS
iftrue .Done
changeblock $6, $e, $9 ; ladder
changeblock 6, 14, $9 ; ladder
.Done:
return
@ -45,8 +45,8 @@ BurnedTower1F_MapScriptHeader:
writetext BurnedTower1FEusineIntroText
waitbutton
closetext
moveobject BURNEDTOWER1F_EUSINE, $9, $e
setscene $1
moveobject BURNEDTOWER1F_EUSINE, 9, 14
setscene 1
end
BurnedTowerRivalBattleScript:
@ -98,7 +98,7 @@ BurnedTowerRivalBattleScript:
writetext BurnedTowerSilver_AfterText1
waitbutton
closetext
setscene $2
setscene 2
setevent EVENT_RIVAL_BURNED_TOWER
special Special_FadeOutMusic
pause 15
@ -106,7 +106,7 @@ BurnedTowerRivalBattleScript:
showemote EMOTE_SHOCK, PLAYER, 15
playsound SFX_ENTER_DOOR
waitsfx
changeblock $a, $8, $25
changeblock 10, 8, $25
reloadmappart
pause 15
applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall

12
maps/BurnedTowerB1F.asm
View File

@ -28,7 +28,7 @@ BurnedTowerB1F_MapScriptHeader:
.LadderCallback:
checkevent EVENT_RELEASED_THE_BEASTS
iftrue .NoChange
changeblock $6, $e, $2
changeblock 6, 14, $2
.NoChange:
return
@ -81,11 +81,11 @@ ReleaseTheBeasts:
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
special RestartMapMusic
setscene $1
setscene 1
setevent EVENT_RELEASED_THE_BEASTS
special InitRoamMons
setmapscene ECRUTEAK_GYM, $1
setmapscene CIANWOOD_CITY, $1
setmapscene ECRUTEAK_GYM, 1
setmapscene CIANWOOD_CITY, 1
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_ECRUTEAK_GYM_GRAMPS
clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@ -93,10 +93,10 @@ ReleaseTheBeasts:
setevent EVENT_BURNED_TOWER_1F_EUSINE
appear BURNEDTOWERB1F_EUSINE
refreshscreen $0
changeblock $6, $e, $1b
changeblock 6, 14, $1b
reloadmappart
closetext
setscene $1
setscene 1
end
BurnedTowerB1FEusine:

2
maps/CeladonDeptStore6F.asm
View File

@ -11,7 +11,7 @@ CeladonDeptStore6F_MapScriptHeader:
dbw MAPCALLBACK_TILES, .Callback
.Callback:
changeblock $c, $0, $3
changeblock 12, 0, $3
return
CeladonDeptStore6FSuperNerdScript:

4
maps/CeladonGym.asm
View File

@ -22,7 +22,7 @@ ErikaScript_0x72a6a:
waitbutton
closetext
winlosstext UnknownText_0x72c3e, 0
loadtrainer ERIKA, 1
loadtrainer ERIKA, ERIKA1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_ERIKA
@ -109,7 +109,7 @@ CeladonGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext ERIKA, 1, $1
trainertotext ERIKA, ERIKA1, $1
jumpstd gymstatue2
UnknownText_0x72b28:

2
maps/CeladonPokecenter1F.asm
View File

@ -133,7 +133,7 @@ NoBeastsText:
para "#MON RAIKOU and"
line "ENTEI?"
para $56, $56, $56
para "<......><......><......>"
para "Okay…"

14
maps/CeruleanGym.asm
View File

@ -48,9 +48,9 @@ CeruleanGym_MapScriptHeader:
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
setscene $0
setmapscene ROUTE_25, $1
setmapscene POWER_PLANT, $0
setscene 0
setmapscene ROUTE_25, 1
setmapscene POWER_PLANT, 0
waitsfx
special RestartMapMusic
pause 15
@ -67,7 +67,7 @@ MistyScript_0x188432:
waitbutton
closetext
winlosstext UnknownText_0x18870c, 0
loadtrainer MISTY, 1
loadtrainer MISTY, MISTY1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_MISTY
@ -161,7 +161,7 @@ CeruleanGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext MISTY, 1, $1
trainertotext MISTY, MISTY1, $1
jumpstd gymstatue2
MovementData_0x1884e3:
@ -178,9 +178,9 @@ MovementData_0x1884e8:
MovementData_0x1884eb:
fix_facing
db $39 ; movement
set_sliding
jump_step UP
db $38 ; movement
remove_sliding
remove_fixed_facing
step_sleep 8
step_sleep 8

4
maps/CherrygroveCity.asm
View File

@ -101,7 +101,7 @@ CherrygroveCityGuideGent:
end
CherrygroveSilverSceneSouth:
moveobject CHERRYGROVECITY_SILVER, $27, $7
moveobject CHERRYGROVECITY_SILVER, 39, 7
CherrygroveSilverSceneNorth:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
@ -171,7 +171,7 @@ CherrygroveSilverSceneNorth:
spriteface PLAYER, LEFT
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_SILVER
setscene $0
setscene 0
special HealParty
playmapmusic
end

12
maps/CianwoodCity.asm
View File

@ -49,9 +49,9 @@ CianwoodCitySuicuneAndEusine:
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
disappear CIANWOODCITY_SUICUNE
pause 10
setscene $0
setscene 0
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setmapscene ROUTE_42, $1
setmapscene ROUTE_42, 1
checkevent EVENT_FOUGHT_EUSINE
iftrue .Done
setevent EVENT_FOUGHT_EUSINE
@ -151,20 +151,20 @@ CianwoodCityHiddenMaxEther:
dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER
MovementData_0x1a00da:
db $39 ; movement
set_sliding
fast_jump_step DOWN
fast_jump_step DOWN
fast_jump_step RIGHT
db $38 ; movement
remove_sliding
step_end
MovementData_0x1a00e0:
db $39 ; movement
set_sliding
fast_jump_step RIGHT
fast_jump_step UP
fast_jump_step RIGHT
fast_jump_step RIGHT
db $38 ; movement
remove_sliding
step_end
MovementData_0x1a00e7:

4
maps/CianwoodGym.asm
View File

@ -40,7 +40,7 @@ ChuckScript_0x9d60f:
waitbutton
closetext
winlosstext ChuckLossText, 0
loadtrainer CHUCK, 1
loadtrainer CHUCK, CHUCK1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_CHUCK
@ -138,7 +138,7 @@ CianwoodGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext CHUCK, 1, $1
trainertotext CHUCK, CHUCK1, $1
jumpstd gymstatue2
CianwoodGymMovement_ChuckChucksBoulder:

6
maps/Colosseum.asm
View File

@ -37,12 +37,12 @@ Colosseum_MapScriptHeader:
return
.PreparePokecenter2F:
setmapscene POKECENTER_2F, $2
setmapscene POKECENTER_2F, 2
return
.InitializeAndPreparePokecenter2F:
setscene $1
setmapscene POKECENTER_2F, $2
setscene 1
setmapscene POKECENTER_2F, 2
end
MapColosseumSignpost1Script:

8
maps/DragonShrine.asm
View File

@ -165,8 +165,8 @@ DragonShrine_MapScriptHeader:
waitsfx
special RestartMapMusic
specialphonecall SPECIALCALL_MASTERBALL
setscene $1
setmapscene DRAGONS_DEN_B1F, $1
setscene 1
setmapscene DRAGONS_DEN_B1F, 1
writetext UnknownText_0x18d9f2
buttonsound
writetext UnknownText_0x18da0b
@ -614,7 +614,7 @@ UnknownText_0x18d916:
para "You did fail?"
para $56, $56, $56, $56, $56, $56
para "<......><......><......><......><......><......>"
para "…What? You passed?"
done
@ -665,7 +665,7 @@ UnknownText_0x18da0b:
done
UnknownText_0x18dab4:
text $56, $56, $56, $56, $56, $56
text "<......><......><......><......><......><......>"
done
DragonShrine_MapEventHeader:

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