Removed trailing spaces in the most relevant files
Command used for the job: egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g' Credits to Grant Murphy from Stack Overflow.
This commit is contained in:
@@ -48,7 +48,7 @@ gContestAI_ScriptsTable::
|
||||
.4byte AI_Nothing @ CONTEST_AI_DUMMY_25
|
||||
|
||||
|
||||
@ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later
|
||||
@ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later
|
||||
AI_CheckTiming:
|
||||
if_appeal_num_not_eq 0, AI_CheckTiming_SkipCondition
|
||||
if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, AI_CheckTiming_SkipCondition
|
||||
@@ -388,7 +388,7 @@ AI_CGM_AppealAsGoodAsPrevOnes_Last:
|
||||
score +20
|
||||
end
|
||||
|
||||
@ Encourages move more for each opponent who will have a turn before the user
|
||||
@ Encourages move more for each opponent who will have a turn before the user
|
||||
AI_CGM_AppealAsGoodAsPrevOne:
|
||||
if_user_order_eq MON_1, AI_CGM_AppealAsGoodAsPrevOne_1stUp
|
||||
if_user_order_eq MON_2, AI_CGM_AppealAsGoodAsPrevOne_2ndUp
|
||||
@@ -456,7 +456,7 @@ AI_CGM_BetterWhenAudienceExcited_Not1stUp:
|
||||
score +10
|
||||
end
|
||||
|
||||
@ Encourage move more for each condition star the prev mons have
|
||||
@ Encourage move more for each condition star the prev mons have
|
||||
AI_CGM_WorsenConditionOfPrevMons:
|
||||
if_user_order_eq MON_1, AI_CGM_End
|
||||
goto AI_CGM_WorsenConditionOfPrevMons_CheckMon1
|
||||
|
||||
@@ -2,7 +2,7 @@ BattleFrontier_Lounge2_MapScripts::
|
||||
.byte 0
|
||||
|
||||
@ This NPC gives hints about a random facility or battle mode.
|
||||
@ For battle modes he gives generic advice
|
||||
@ For battle modes he gives generic advice
|
||||
@ For facilities, depending on how far the player has progressed he will say either
|
||||
@ The name of the Frontier Brain there
|
||||
@ The type and description of the 3 pokemon they use in their silver battle
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
.equ LOCALID_BRINEY_DEWFORD, 2
|
||||
.equ LOCALID_BOAT_DEWFORD, 4
|
||||
|
||||
.equ LOCALID_BOAT_R109, 1
|
||||
.equ LOCALID_BOAT_R109, 1
|
||||
.equ LOCALID_BRINEY_R109, 2
|
||||
|
||||
.equ LOCALID_BOAT_R104, 7
|
||||
|
||||
@@ -33,7 +33,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls:
|
||||
.2byte DECOR_PIKACHU_DOLL
|
||||
.2byte DECOR_MARILL_DOLL
|
||||
.2byte DECOR_JIGGLYPUFF_DOLL
|
||||
.2byte DECOR_DUSKULL_DOLL
|
||||
.2byte DECOR_DUSKULL_DOLL
|
||||
.2byte DECOR_WYNAUT_DOLL
|
||||
.2byte DECOR_BALTOY_DOLL
|
||||
.2byte DECOR_KECLEON_DOLL
|
||||
|
||||
@@ -29,7 +29,7 @@ LilycoveCity_Harbor_EventScript_FerryAttendant::
|
||||
goto_if_eq LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime
|
||||
compare VAR_TEMP_B, 4
|
||||
goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime
|
||||
compare VAR_TEMP_B, 8
|
||||
compare VAR_TEMP_B, 8
|
||||
goto_if_eq LilycoveCity_Harbor_EventScript_MysticTicketFirstTime
|
||||
compare VAR_TEMP_B, 0
|
||||
goto_if_ne LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map.
|
||||
@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map.
|
||||
@ These are labeled in DewfordTown/scripts.inc
|
||||
.set LOCALID_RIVAL, 34
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map.
|
||||
@ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map.
|
||||
@ These are labeled in DewfordTown/scripts.inc
|
||||
|
||||
Route109_MapScripts::
|
||||
|
||||
@@ -84,7 +84,7 @@ VictoryRoad_1F_EventScript_EntranceWally::
|
||||
msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_NPC
|
||||
end
|
||||
|
||||
@ This Wally appears and remains at the exit after the Hall of Fame is entered
|
||||
@ This Wally appears and remains at the exit after the Hall of Fame is entered
|
||||
VictoryRoad_1F_EventScript_ExitWally::
|
||||
trainerbattle_single TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
|
||||
specialvar VAR_RESULT, ShouldTryRematchBattle
|
||||
|
||||
@@ -641,7 +641,7 @@ BerryBlender_EventScript_DoLinkBerryBlending:
|
||||
fadescreen FADE_TO_BLACK
|
||||
removeobject 240 @ Unclear where these local IDs come from,
|
||||
removeobject 239 @ but presumably they'd be the 4 link players
|
||||
removeobject 238
|
||||
removeobject 238
|
||||
removeobject 237
|
||||
special DoBerryBlending
|
||||
waitstate
|
||||
|
||||
Reference in New Issue
Block a user