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

Trim whitespace

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
maps/BattleTowerBattleRoom.asm
View File

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

2
maps/BattleTowerHallway.asm
View File

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

1
maps/BlackthornGym2F.asm
View File

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

2
maps/BurnedTower1F.asm
View File

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

1
maps/CeladonDeptStore6F.asm
View File

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

12
maps/CeladonGameCornerPrizeRoom.asm
View File

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

1
maps/CeruleanGym.asm
View File

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

1
maps/DarkCaveVioletEntrance.asm
View File

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

1
maps/DiglettsCave.asm
View File

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

6
maps/DragonShrine.asm
View File

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

2
maps/GoldenrodCity.asm
View File

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

1
maps/GoldenrodDeptStore6F.asm
View File

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

2
maps/GoldenrodDeptStoreElevator.asm
View File

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

4
maps/GoldenrodGameCorner.asm
View File

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

4
maps/GoldenrodPokeComCenter2FMobile.asm
View File

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

3
maps/IcePathB1F.asm
View File

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

1
maps/IcePathB2FBlackthornSide.asm
View File

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

1
maps/IcePathB2FMahoganySide.asm
View File

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

2
maps/IlexForest.asm
View File

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

3
maps/LakeOfRage.asm
View File

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

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