Trim whitespace

This commit is contained in:
Remy Oukaour 2018-01-12 17:09:32 -05:00
parent 5a8700c56a
commit 59c95abf83
58 changed files with 4 additions and 97 deletions

View File

@ -133,13 +133,11 @@ UnreferencedScript_0x9f4f7:
closetext
end
Text_ReturnedAfterSave_Mobile:
text "You'll be returned"
line "after you SAVE."
done
BattleTowerBattleRoom_MapEventHeader:
; filler
db 0, 0

View File

@ -21,7 +21,6 @@ BattleTowerHallway_MapScriptHeader:
callasm .asm_load_battle_room
jump .WalkToChosenBattleRoom
.asm_load_battle_room
ld a, [rSVBK]
push af
@ -35,7 +34,6 @@ BattleTowerHallway_MapScriptHeader:
ld [rSVBK], a
ret
; enter different rooms for different levels to battle against
; at least it should look like that
; because all warps lead to the same room

View File

@ -56,7 +56,6 @@ BlackthornGym2F_MapScriptHeader:
earthquake 80
end
BlackthornGymBoulder:
jumpstd strengthboulder

View File

@ -133,11 +133,9 @@ BurnedTower1FRock:
BurnedTower1FHiddenEther:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
BurnedTower1FHiddenUltraBall:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
BurnedTower1FHPUp:
itemball HP_UP

View File

@ -94,7 +94,6 @@ CeladonDeptStore6FVendingMachine:
db "LEMONADE ¥350@"
db "CANCEL@"
CeladonDeptStore6FDirectory:
jumptext CeladonDeptStore6FDirectoryText

View File

@ -15,7 +15,7 @@ CeladonGameCornerPrizeRoomGentlemanScript:
CeladonGameCornerPrizeRoomPharmacistScript:
jumptextfaceplayer CeladonGameCornerPrizeRoomPharmacistText
GoldenrodGameCornerTMVendor:
CeladonGameCornerPrizeRoomTMVendor:
faceplayer
opentext
writetext CeladonPrizeRoom_PrizeVendorIntroText
@ -102,7 +102,6 @@ CeladonPrizeRoom_NoCoinCase:
closetext
end
CeladonPrizeRoom_TMMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@ -118,8 +117,7 @@ CeladonPrizeRoom_TMMenuDataHeader:
db "TM15 7500@"
db "CANCEL@"
GoldenrodGameCornerPokemonVendor:
CeladonGameCornerPrizeRoomPokemonVendor:
faceplayer
opentext
writetext CeladonPrizeRoom_PrizeVendorIntroText
@ -191,7 +189,6 @@ GoldenrodGameCornerPokemonVendor:
takecoins 8888
jump .loop
.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@ -207,7 +204,6 @@ GoldenrodGameCornerPokemonVendor:
db "LARVITAR 8888@"
db "CANCEL@"
CeladonGameCornerPrizeRoomGentlemanText:
text "I wanted PORYGON,"
line "but I was short by"
@ -283,8 +279,8 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
.BGEvents:
db 2
bg_event 2, 1, BGEVENT_READ, GoldenrodGameCornerTMVendor
bg_event 4, 1, BGEVENT_READ, GoldenrodGameCornerPokemonVendor
bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
.ObjectEvents:
db 2

View File

@ -137,7 +137,6 @@ CeruleanGymGuyScript:
CeruleanGymHiddenMachinePart:
dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART
CeruleanGymStatue1:
checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
iffalse CeruleanGymStatue

View File

@ -33,7 +33,6 @@ DarkCaveVioletEntranceRock:
DarkCaveVioletEntranceHiddenElixer:
dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
DarkCaveVioletEntrance_MapEventHeader:
; filler
db 0, 0

View File

@ -14,7 +14,6 @@ DiglettsCavePokefanMScript:
DiglettsCaveHiddenMaxRevive:
dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE
DiglettsCavePokefanMText:
text "A bunch of DIGLETT"
line "popped out of the"

View File

@ -265,7 +265,6 @@ ElderScript_0x18d20d:
closetext
end
MenuDataHeader_0x18d215:
db $40 ; flags
db 04, 08 ; start coords
@ -280,7 +279,6 @@ MenuDataHeader_0x18d215:
db "Underling@"
db "Friend@"
MenuDataHeader_0x18d234:
db $40 ; flags
db 04, 09 ; start coords
@ -295,7 +293,6 @@ MenuDataHeader_0x18d234:
db "Raising@"
db "Cheating@"
MenuDataHeader_0x18d258:
db $40 ; flags
db 04, 05 ; start coords
@ -310,7 +307,6 @@ MenuDataHeader_0x18d258:
db "Tough person@"
db "Anybody@"
MenuDataHeader_0x18d283:
db $40 ; flags
db 04, 08 ; start coords
@ -325,7 +321,6 @@ MenuDataHeader_0x18d283:
db "Violence@"
db "Knowledge@"
MenuDataHeader_0x18d2a5:
db $40 ; flags
db 04, 12 ; start coords
@ -340,7 +335,6 @@ MenuDataHeader_0x18d2a5:
db "Both@"
db "Weak@"
MovementData_0x18d2bf:
slow_step UP
slow_step UP

View File

@ -94,7 +94,6 @@ MoveTutor:
if_equal FALSE, .TeachMove
jump .Incompatible
.MoveMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@ -110,7 +109,6 @@ MoveTutor:
db "ICE BEAM@"
db "CANCEL@"
.Refused:
writetext UnknownText_0x1990b4
waitbutton

View File

@ -83,7 +83,6 @@ GoldenrodVendingMachine:
db "LEMONADE ¥350@"
db "CANCEL@"
GoldenrodDeptStore6FLassScript:
jumptextfaceplayer GoldenrodDeptStore6FLassText

View File

@ -43,7 +43,6 @@ MapGoldenrodDeptStoreElevatorSignpost0Script:
.Done:
end
Elevator_0x566e0:
db 7 ; floors
elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F
@ -55,7 +54,6 @@ Elevator_0x566e0:
elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F
db -1 ; end
GoldenrodDeptStoreElevator_MapEventHeader:
; filler
db 0, 0

View File

@ -138,7 +138,6 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript:
closetext
end
GoldenrodGameCornerTMVendorMenuData:
db $40 ; flags
db 02, 00 ; start coords
@ -154,7 +153,6 @@ GoldenrodGameCornerTMVendorMenuData:
db "TM38 5500@"
db "CANCEL@"
GoldenrodGameCornerPrizeMonVendorScript:
faceplayer
opentext
@ -227,7 +225,6 @@ GoldenrodGameCornerPrizeMonVendorScript:
takecoins 1500
jump .loop
.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@ -243,7 +240,6 @@ GoldenrodGameCornerPrizeMonVendorScript:
db "WOBBUFFET 1500@"
db "CANCEL@"
GoldenrodGameCornerPharmacistScript:
faceplayer
opentext

View File

@ -48,7 +48,6 @@ UnknownScript_0x62600:
closetext
end
MenuDataHeader_0x62602:
db $40 ; flags
db 00, 00 ; start coords
@ -63,7 +62,6 @@ MenuDataHeader_0x62602:
db "モバイルセンター@" ; MOBILE CENTER
db "やめる@" ; QUIT
MapGoldenrodPokeComCenter2FMobileSignpost1Script:
opentext
writetext UnknownText_0x62989
@ -93,7 +91,6 @@ UnknownScript_0x6264a:
closetext
end
MenuDataHeader_0x6264c:
db $40 ; flags
db 00, 00 ; start coords
@ -108,7 +105,6 @@ MenuDataHeader_0x6264c:
db "でんわ", $4a,"つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT
MapGoldenrodPokeComCenter2FMobileSignpost2Script:
jumptext UnknownText_0x62b26

View File

@ -62,7 +62,6 @@ IcePathB1F_MapScriptHeader:
earthquake 80
end
IcePathB1FBoulder:
jumpstd strengthboulder
@ -72,13 +71,11 @@ IcePathB1FIron:
IcePathB1FHiddenMaxPotion:
dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
IcePathBoulderFellThroughText:
text "The boulder fell"
line "through."
done
IcePathB1F_MapEventHeader:
; filler
db 0, 0

View File

@ -14,7 +14,6 @@ IcePathB2FBlackthornSideTMRest:
IcePathB2FBlackthornSideHiddenIceHeal:
dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
IcePathB2FBlackthornSide_MapEventHeader:
; filler
db 0, 0

View File

@ -25,7 +25,6 @@ IcePathB2FMahoganySideMaxPotion:
IcePathB2FMahoganySideHiddenCarbos:
dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
UnknownText_0x7e5ad:
text "It's immovably"
line "imbedded in ice."

View File

@ -416,11 +416,9 @@ IlexForestEther:
IlexForestHiddenEther:
dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
IlexForestHiddenSuperPotion:
dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION
IlexForestHiddenFullHeal:
dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL

View File

@ -234,15 +234,12 @@ LakeOfRageTMDetect:
LakeOfRageHiddenFullRestore:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
LakeOfRageHiddenRareCandy:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY
LakeOfRageHiddenMaxPotion:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION
MovementData_0x70155:
teleport_from
step_end

View File

@ -77,7 +77,6 @@ ClefairyDance:
MountMoonSquareHiddenMoonStone:
dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
DontLitterSign:
jumptext DontLitterSignText

View File

@ -66,7 +66,6 @@ MountMortar1FInsideUltraBall:
MountMortar1FInsideHiddenMaxRepel:
dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
PokemaniacMillerSeenText:
text "I'm not losing"
line "this time!"

View File

@ -18,7 +18,6 @@ MountMortar1FOutsideRevive:
MountMortar1FOutsideHiddenHyperPotion:
dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
MountMortar1FOutside_MapEventHeader:
; filler
db 0, 0

View File

@ -46,7 +46,6 @@ MountMortar2FInsideEscapeRope:
MountMortar2FInsideHiddenFullRestore:
dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
SupernerdHughSeenText:
text "Yo! MARKUS!"
done

View File

@ -74,7 +74,6 @@ MountMortarB1FPPUp:
MountMortarB1FHiddenMaxRevive:
dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
UnknownText_0x7e24d:
text "Hey!"

View File

@ -307,7 +307,6 @@ NationalParkTMDig:
NationalParkHiddenFullHeal:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
NationalParkLassText:
text "Look! Check out my"
line "bag!"

View File

@ -117,7 +117,6 @@ NationalParkBugContestTMDig:
NationalParkBugContestHiddenFullHeal:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
UnknownText_0x5c94c:
text "DON: I'm going to"
line "win! Don't bother"

View File

@ -46,7 +46,6 @@ OlivineLighthouse5FTMSwagger:
OlivineLighthouse5FHiddenHyperPotion:
dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
SailorErnestSeenText:
text "I wanted to battle"
line "JASMINE, but she's"

View File

@ -236,7 +236,6 @@ CooltrainerFScript_0x74a22:
OlivinePortHiddenProtein:
dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN
MovementData_0x74a30:
step DOWN
step_end

View File

@ -18,11 +18,9 @@ RockTunnel1FTMSteelWing:
RockTunnel1FHiddenXAccuracy:
dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY
RockTunnel1FHiddenXDefend:
dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND
RockTunnel1F_MapEventHeader:
; filler
db 0, 0

View File

@ -22,7 +22,6 @@ RockTunnelB1FRevive:
RockTunnelB1FHiddenMaxPotion:
dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
RockTunnelB1F_MapEventHeader:
; filler
db 0, 0

View File

@ -65,7 +65,6 @@ FruitTreeScript_0x68055:
Route11HiddenRevive:
dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE
YoungsterOwenSeenText:
text "There's no cheat-"
line "ing in #MON."

View File

@ -72,7 +72,6 @@ Route12Nugget:
Route12HiddenElixer:
dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
FisherMartinSeenText:
text "Patience is the"
line "key to both fish-"

View File

@ -79,7 +79,6 @@ Route13DirectionsSign:
Route13HiddenCalcium:
dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM
PokefanmAlexSeenText:
text "Bow down before my"
line "regal #MON!"

View File

@ -64,11 +64,9 @@ TrainerBikerGlenn:
Route17HiddenMaxEther:
dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
Route17HiddenMaxElixer:
dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
BikerRileySeenText:
text "Hey, you! You're"
line "from JOHTO, huh?"

View File

@ -193,7 +193,6 @@ Route25Protein:
Route25HiddenPotion:
dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION
MovementData_0x19efe8:
big_step DOWN
step_end

View File

@ -11,7 +11,6 @@ Route28Sign:
Route28HiddenRareCandy:
dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY
Route28SignText:
text "ROUTE 28"
done

View File

@ -250,7 +250,6 @@ Route30FruitTree2:
Route30HiddenPotion:
dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION
Route30_JoeysRattataAttacksMovement:
fix_facing
big_step UP

View File

@ -508,11 +508,9 @@ Route32PokecenterSign:
Route32HiddenGreatBall:
dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
Route32HiddenSuperPotion:
dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
Movement_Route32CooltrainerMPushesYouBackToViolet:
step UP
step UP

View File

@ -490,11 +490,9 @@ Route34Nugget:
Route34HiddenRareCandy:
dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
Route34HiddenSuperPotion:
dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION
Route34MovementData_DayCareManWalksBackInside:
slow_step LEFT
slow_step LEFT

View File

@ -116,7 +116,6 @@ FruitTreeScript_0x1a8e0d:
Route37HiddenEther:
dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
TwinsAnnandanne1SeenText:
text "ANN: ANNE and I"
line "are in this to-"

View File

@ -182,7 +182,6 @@ FruitTreeScript_0x1a5bf4:
Route39HiddenNugget:
dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET
Route39MiltankText:
text "MILTANK: Mooo!"
done

View File

@ -53,7 +53,6 @@ Route4HPUp:
Route4HiddenUltraBall:
dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
BirdKeeperHankSeenText:
text "I'm raising my"
line "#MON. Want to"

View File

@ -214,7 +214,6 @@ FruitTreeScript_0x1a9351:
Route42HiddenMaxPotion:
dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION
MovementData_0x1a9356:
set_sliding
fast_jump_step UP

View File

@ -320,7 +320,6 @@ Route44MaxRepel:
Route44HiddenElixer:
dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
FisherWilton1SeenText:
text "Aack! You made me"
line "lose a POLIWAG!"

View File

@ -314,7 +314,6 @@ Route45MaxPotion:
Route45HiddenPpUp:
dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
HikerErikSeenText:
text "Be prepared for"
line "anything!"

View File

@ -85,7 +85,6 @@ Route9Sign:
Route9HiddenEther:
dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER
CamperDeanSeenText:
text "I came to explore"
line "ROCK TUNNEL."

View File

@ -112,7 +112,6 @@ TrainerPsychicNathan:
closetext
end
TrainerSuperNerdStan:
trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script
@ -124,7 +123,6 @@ TrainerSuperNerdStan:
closetext
end
RuinsOfAlphOutsideSignpost0Script:
jumptext UnknownText_0x58325

View File

@ -26,11 +26,9 @@ SilverCaveRoom1UltraBall:
SilverCaveRoom1HiddenDireHit:
dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
SilverCaveRoom1HiddenUltraBall:
dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL
SilverCaveRoom1_MapEventHeader:
; filler
db 0, 0

View File

@ -22,7 +22,6 @@ SilverCaveRoom2PPUp:
SilverCaveRoom2HiddenMaxPotion:
dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
SilverCaveRoom2_MapEventHeader:
; filler
db 0, 0

View File

@ -542,7 +542,6 @@ TeamRocketBaseB1FGuardSpec:
TeamRocketBaseB1FHiddenRevive:
dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
SecurityCameraMovement1:
big_step RIGHT
big_step RIGHT

View File

@ -358,7 +358,6 @@ TeamRocketBaseB2FTMThief:
TeamRocketBaseB2FHiddenFullHeal:
dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
MovementData_0x6d212:
step RIGHT
step RIGHT

View File

@ -22,7 +22,6 @@ TinTower4FEscapeRope:
TinTower4FHiddenMaxPotion:
dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
TinTower4F_MapEventHeader:
; filler
db 0, 0

View File

@ -14,11 +14,9 @@ TinTower5FRareCandy:
TinTower5FHiddenFullRestore:
dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
TinTower5FHiddenCarbos:
dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS
TinTower5F_MapEventHeader:
; filler
db 0, 0

View File

@ -8,11 +8,9 @@ UndergroundPath_MapScriptHeader:
UndergroundPathHiddenFullRestore:
dwb EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE
UndergroundPathHiddenXSpecial:
dwb EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL
UndergroundPath_MapEventHeader:
; filler
db 0, 0

View File

@ -197,7 +197,6 @@ SuperNerdScript_0x74ee6:
VermilionPortHiddenIron:
dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON
MovementData_0x74ef1:
step DOWN
step_end

View File

@ -114,11 +114,9 @@ VictoryRoadHPUp:
VictoryRoadHiddenMaxPotion:
dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
VictoryRoadHiddenFullHeal:
dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL
MovementData_0x74539:
step LEFT
step LEFT

View File

@ -34,15 +34,12 @@ WhirlIslandB1FBoulder:
WhirlIslandB1FHiddenRareCandy:
dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY
WhirlIslandB1FHiddenUltraBall:
dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
WhirlIslandB1FHiddenFullRestore:
dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE
WhirlIslandB1F_MapEventHeader:
; filler
db 0, 0