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

Fix triple newlines left over from removing address comments

Browse Source
This commit is contained in:
Rangi
2018-06-24 23:22:50 -04:00
parent 91f914718a
commit 67d1364c7a
193 changed files with 3 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
engine/events/battle_tower/battle_tower.asm
View File

@@ -264,7 +264,6 @@ RunBattleTowerTrainer:
ld [wBattleTowerBattleEnded], a
ret
ReadBTTrainerParty:
; Initialise the BattleTower-Trainer and his mon
call CopyBTTrainer_FromBT_OT_TowBT_OTTemp
@@ -555,7 +554,6 @@ Function17042c:
INCLUDE "data/battle_tower/unknown_levels.asm"
CopyBTTrainer_FromBT_OT_TowBT_OTTemp:
; copy the BattleTower-Trainer data that lies at 'wBT_OTTrainer' to 'wBT_OTTemp'
ld a, [rSVBK]
@@ -672,12 +670,10 @@ Function1704e1:
call .PlaceTextItems
jr .NextJumptableFunction
.Jumptable_1:
call SetPalettes
call .NextJumptableFunction
.Jumptable_2:
ld hl, hJoyPressed
ld a, [hl]
@@ -882,7 +878,6 @@ BattleTowerAction:
ld l, a
jp hl
.dw
dw BattleTowerAction_CheckExplanationRead ; 0x00
dw BattleTowerAction_SetExplanationRead ; 0x01
@@ -917,7 +912,6 @@ BattleTowerAction:
dw BattleTower_RandomlyChooseReward ; 0x1e
dw BattleTower_SaveOptions ; 0x1f
; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes)
ResetBattleTowerTrainersSRAM: ; BattleTowerAction $1a
ld a, BANK(sBTTrainers)
@@ -1200,7 +1194,6 @@ BattleTower_CheckSaveFileExistsAndIsYours: ; BattleTowerAction $09
ld [wScriptVar], a
ret
Function1708b1: ; BattleTowerAction $0a
xor a
ld [wMusicFade], a
@@ -1260,7 +1253,6 @@ Function1708f0: ; BattleTowerAction $0d
ld [wScriptVar], a
ret
Function170923:
ld a, $5
call GetSRAMBank
@@ -1273,7 +1265,6 @@ Function170923:
call CloseSRAM
ret
BattleTowerAction_EggTicket: ; BattleTowerAction $0e
xor a
ld [wScriptVar], a

1
engine/events/battle_tower/load_trainer.asm
View File

@@ -91,7 +91,6 @@ endc
ret
Function_LoadRandomBattleTowerMon:
ld c, BATTLETOWER_PARTY_LENGTH
.loop

4
engine/events/battle_tower/trainer_text.asm
View File

@@ -88,7 +88,6 @@ INCLUDE "mobile/fixed_words.asm"
INCLUDE "data/trainers/genders.asm"
BTMaleTrainerTexts:
dw .Greetings
dw .PlayerLost
@@ -175,7 +174,6 @@ BTMaleTrainerTexts:
dw BTWinM24
dw BTWinM25
BTFemaleTrainerTexts:
dw .Greetings
dw .PlayerLost
@@ -232,7 +230,6 @@ BTFemaleTrainerTexts:
dw BTWinF14
dw BTWinF15
BTGreetingM1:
text_jump BattleTowerText_0x1ec000
db "@"
@@ -535,7 +532,6 @@ BTWinM25:
BTGreetingF1:
text_jump UnknownText_0x1ec9bd
db "@"

2
engine/events/bug_contest/judging.asm
View File

@@ -125,10 +125,8 @@ LoadContestantName:
ld bc, NAME_LENGTH
jp CopyBytes
INCLUDE "data/events/bug_contest_winners.asm"
BugContest_GetPlayersResult:
ld hl, wBugContestThirdPlaceWinnerID
ld de, - BUG_CONTESTANT_SIZE

19
engine/events/celebi.asm
View File

@@ -41,7 +41,6 @@ CelebiShrineEvent:
pop bc
jr .loop
.done
pop af
ld [wVramState], a
@@ -49,7 +48,6 @@ CelebiShrineEvent:
call CelebiEvent_SetBattleType
ret
.RestorePlayerSprite_DespawnLeaves:
ld hl, wVirtualOAMSprite00TileID
xor a
@@ -68,7 +66,6 @@ endr
call ByteFill
ret
LoadCelebiGFX:
farcall ClearSpriteAnims
ld de, SpecialCelebiLeafGFX
@@ -83,7 +80,6 @@ LoadCelebiGFX:
ld [wJumptableIndex], a
ret
CelebiEvent_CountDown:
ld hl, wFrameCounter
ld a, [hl]
@@ -92,13 +88,11 @@ CelebiEvent_CountDown:
dec [hl]
ret
.done
ld hl, wJumptableIndex
set 7, [hl]
ret
CelebiEvent_SpawnLeaf:
; unused
ld hl, wcf65
@@ -119,7 +113,6 @@ CelebiEvent_SpawnLeaf:
ld [hl], $80
ret
SpecialCelebiLeafGFX:
INCBIN "gfx/overworld/cut_grass.2bpp"
@@ -129,7 +122,6 @@ INCBIN "gfx/overworld/celebi/2.2bpp"
INCBIN "gfx/overworld/celebi/3.2bpp"
INCBIN "gfx/overworld/celebi/4.2bpp"
UpdateCelebiPosition:
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
@@ -224,7 +216,6 @@ UpdateCelebiPosition:
.done
ret
.FreezeCelebiPosition:
pop af
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
@@ -233,7 +224,6 @@ UpdateCelebiPosition:
call ReinitSpriteAnimFrame
ret
CelebiEvent_Cosine:
; a = d * cos(a * pi/32)
add %010000 ; cos(x) = sin(x + pi/2)
@@ -261,22 +251,18 @@ GetCelebiSpriteTile:
jr c, .done
jr .restart
.Frame1:
ld a, SPECIALCELEBIEVENT_CELEBI
jr .load_tile
.Frame2:
ld a, SPECIALCELEBIEVENT_CELEBI + 4
jr .load_tile
.Frame3:
ld a, SPECIALCELEBIEVENT_CELEBI + 8
jr .load_tile
.Frame4:
ld a, SPECIALCELEBIEVENT_CELEBI + 12
@@ -286,7 +272,6 @@ GetCelebiSpriteTile:
ld [hl], a
jr .done
.restart
pop de
ld d, $ff
@@ -298,7 +283,6 @@ GetCelebiSpriteTile:
pop hl
ret
.AddE:
push af
ld a, d
@@ -307,13 +291,11 @@ GetCelebiSpriteTile:
pop af
ret
CelebiEvent_SetBattleType:
ld a, BATTLETYPE_CELEBI
ld [wBattleType], a
ret
CheckCaughtCelebi:
ld a, [wBattleResult]
bit BATTLERESULT_CAUGHT_CELEBI, a
@@ -322,7 +304,6 @@ CheckCaughtCelebi:
ld [wScriptVar], a
jr .done
.false
xor a ; FALSE
ld [wScriptVar], a

2
engine/events/elevator.asm
View File

@@ -142,7 +142,6 @@ Elevator_WhichFloorText:
text_jump UnknownText_0x1bd2bc
db "@"
Elevator_GetCurrentFloorText:
ld hl, wOptions
ld a, [hl]
@@ -164,7 +163,6 @@ Elevator_GetCurrentFloorText:
Elevator_CurrentFloorText:
db "Now on:@"
Elevator_GetCurrentFloorString:
push hl
ld a, [wElevatorOriginFloor]

2
engine/events/engine_flags.asm
View File

@@ -7,7 +7,6 @@ EngineFlagAction::
;
; Setting/resetting does not return a result.
; 16-bit flag ids are considered invalid, but it's nice
; to know that the infrastructure is there.
@@ -81,5 +80,4 @@ EngineFlagAction::
ld [de], a
ret
INCLUDE "data/engine_flags.asm"

3
engine/events/field_moves.asm
View File

@@ -161,14 +161,12 @@ OWCutJumptable:
ld l, a
jp hl
.dw
dw Cut_SpawnAnimateTree
dw Cut_SpawnAnimateLeaves
dw Cut_StartWaiting
dw Cut_WaitAnimSFX
Cut_SpawnAnimateTree:
call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
@@ -303,7 +301,6 @@ Cut_Headbutt_GetPixelFacing:
dbpixel 8, 11
dbpixel 12, 11
FlyFromAnim:
call DelayFrame
ld a, [wVramState]

3
engine/events/fish.asm
View File

@@ -21,7 +21,6 @@ endr
pop af
ret
.Fish:
; Fish for monsters with rod b from encounter data in FishGroup at hl.
; Return monster e at level d.
@@ -90,7 +89,6 @@ endr
inc hl
ret
GetFishGroupIndex:
; Return the index of fishgroup d in de.
@@ -126,5 +124,4 @@ GetFishGroupIndex:
ld d, FISHGROUP_REMORAID_SWARM
jr .done
INCLUDE "data/wild/fish.asm"

2
engine/events/fruit_trees.asm
View File

@@ -94,10 +94,8 @@ GetFruitTreeItem:
pop hl
ret
INCLUDE "data/items/fruit_trees.asm"
FruitBearingTreeText:
text_jump _FruitBearingTreeText
db "@"

1
engine/events/halloffame.asm
View File

@@ -134,7 +134,6 @@ AnimateHallOfFame:
.String_NewHallOfFamer:
db "New Hall of Famer!@"
GetHallOfFameParty:
ld hl, wHallOfFamePokemonList
ld bc, wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1

3
engine/events/happiness_egg.asm
View File

@@ -102,10 +102,8 @@ ChangeHappiness:
ld [wBattleMonHappiness], a
ret
INCLUDE "data/events/happiness_changes.asm"
StepHappiness::
; Raise the party's happiness by 1 point every other step cycle.
@@ -141,7 +139,6 @@ StepHappiness::
jr nz, .loop
ret
DayCareStep::
; Raise the experience of Day-Care Pokémon every step cycle.

2
engine/events/magikarp.asm
View File

@@ -139,7 +139,6 @@ CalcMagikarpLength:
; if b = 252-253: x = 65210, y = 5, z = 13
; if b = 254: x = 65410, y = 2, z = 14
; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id)
; id
@@ -303,7 +302,6 @@ CalcMagikarpLength:
INCLUDE "data/events/magikarp_lengths.asm"
MagikarpHouseSign:
ld a, [wBestMagikarpLengthFeet]
ld [wMagikarpLength], a

4
engine/events/map_name_sign.asm
View File

@@ -96,7 +96,6 @@ ReturnFromMapSetupScript::
cp MAP_ROUTE_36_NATIONAL_PARK_GATE
ret
PlaceMapNameSign::
ld hl, wLandmarkSignTimer
ld a, [hl]
@@ -125,7 +124,6 @@ PlaceMapNameSign::
ld [hLCDCPointer], a
ret
LoadMapNameSignGFX:
ld de, MapEntryFrameGFX
ld hl, vTiles2 tile MAP_NAME_SIGN_START
@@ -141,7 +139,6 @@ InitMapNameFrame:
call PlaceMapNameFrame
ret
PlaceMapNameCenterAlign:
ld a, [wCurrentLandmark]
ld e, a
@@ -174,7 +171,6 @@ PlaceMapNameCenterAlign:
pop hl
ret
InitMapSignAttrMap:
ld de, wAttrMap - wTileMap
add hl, de

4
engine/events/mom_phone.asm
View File

@@ -113,7 +113,6 @@ CheckBalance_MomItem2:
farcall AddMoney
ret
MomBuysItem_DeductFunds:
call GetItemFromMom
ld de, 3 ; cost
@@ -129,7 +128,6 @@ MomBuysItem_DeductFunds:
farcall TakeMoney
ret
Mom_GiveItemOrDoll:
call GetItemFromMom
ld de, 6 ; item type
@@ -153,7 +151,6 @@ Mom_GiveItemOrDoll:
call ReceiveItem
ret
Mom_GetScriptPointer:
call GetItemFromMom
ld de, 6 ; item type
@@ -179,7 +176,6 @@ Mom_GetScriptPointer:
writetext _MomText_ItsInRoom
end
GetItemFromMom:
ld a, [wWhichMomItemSet]
and a

2
engine/events/money.asm
View File

@@ -25,7 +25,6 @@ GiveMoney::
MaxMoney:
dt MAX_MONEY
TakeMoney::
ld a, 3
call SubtractMoney
@@ -187,7 +186,6 @@ GiveCoins::
.maxcoins
bigdw MAX_COINS
TakeCoins::
ld a, 2
ld de, wCoins

9
engine/events/npc_trade.asm
View File

@@ -271,7 +271,6 @@ DoNPCTrade:
pop af
ret
GetTradeAttribute:
ld d, 0
push de
@@ -384,10 +383,8 @@ GetTradeMonNames:
ld [hl], "@"
ret
INCLUDE "data/events/npc_trades.asm"
PrintTradeText:
push af
call GetTradeMonNames
@@ -433,13 +430,11 @@ TradeTexts:
dw TradeAfterText3
dw TradeAfterText4
ConnectLinkCableText:
; OK, connect the Game Link Cable.
text_jump UnknownText_0x1bd407
db "@"
TradedForText:
; traded givemon for getmon
text_jump UnknownText_0x1bd429
@@ -456,7 +451,6 @@ TradedForText:
text_jump UnknownText_0x1bd445
db "@"
TradeIntroText1:
; I collect #MON. Do you have @ ? Want to trade it for my @ ?
text_jump UnknownText_0x1bd449
@@ -482,7 +476,6 @@ TradeAfterText1:
text_jump UnknownText_0x1bd4f4
db "@"
TradeIntroText2:
TradeIntroText3:
; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ?
@@ -511,7 +504,6 @@ TradeAfterText2:
text_jump UnknownText_0x1bd5f4
db "@"
TradeIntroText4:
; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ?
text_jump UnknownText_0x1bd621
@@ -537,7 +529,6 @@ TradeAfterText4:
text_jump UnknownText_0x1bd6f5
db "@"
TradeCompleteText3:
; Uh? What happened?
text_jump UnknownText_0x1bd731

2
engine/events/overworld.asm
View File

@@ -276,10 +276,8 @@ CheckOverworldTileArrays:
xor a
ret
INCLUDE "data/events/field_move_blocks.asm"
OWFlash:
call .CheckUseFlash
and $7f

3
engine/events/poke_seer.asm
View File

@@ -48,7 +48,6 @@ PokeSeer:
call PrintSeerText
ret
SeerAction:
ld a, [wSeerAction]
ld hl, SeerActions
@@ -337,7 +336,6 @@ SeerCancelText:
text_jump UnknownText_0x1c4955
db "@"
SeerAdvice:
ld a, MON_LEVEL
call GetPartyParamLocation
@@ -398,7 +396,6 @@ SeerAdvice5:
text_jump UnknownText_0x1c4ae5
db "@"
GetCaughtGender:
ld hl, MON_CAUGHTGENDER
add hl, bc

5
engine/events/specials.asm
View File

@@ -291,7 +291,6 @@ ActivateFishingSwarm:
ld [wFishingSwarmFlag], a
ret
StoreSwarmMapIndices::
ld a, c
and a
@@ -310,7 +309,6 @@ StoreSwarmMapIndices::
ld [wYanmaMapNumber], a
ret
CheckPokerus:
; Check if a monster in your party has Pokerus
farcall _CheckPokerus
@@ -377,12 +375,10 @@ SnorlaxAwake:
db 36, 9 ; right
db -1
PlayCurMonCry:
ld a, [wCurPartySpecies]
jp PlayMonCry
GameboyCheck:
ld a, [hCGB]
and a
@@ -404,7 +400,6 @@ GameboyCheck:
ld [wScriptVar], a
ret
FadeOutMusic:
ld a, LOW(MUSIC_NONE)
ld [wMusicFadeID], a

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