Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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

5
engine/overworld/decorations.asm
View File

@@ -415,7 +415,6 @@ PopulateDecoCategoryMenu:
dbw 0, 0
dbw 0, 0
GetDecorationData:
ld hl, DecorationAttributes
ld bc, 6
@@ -466,7 +465,6 @@ DoDecorationAction2:
dw DecoAction_setupornament
dw DecoAction_putawayornament
GetDecorationFlag:
call GetDecorationData
ld de, 3 ; event flag
@@ -515,7 +513,6 @@ GetDecoName:
dw .doll
dw .bigdoll
.invalid
ret
@@ -922,7 +919,6 @@ DecorationFlagAction_c:
ld a, c
jp DecorationFlagAction
GetDecorationName_c:
ld a, c
call GetDecorationID
@@ -932,7 +928,6 @@ GetDecorationName_c:
pop de
ret
SetSpecificDecorationFlag:
ld a, c
call GetDecorationID

4
engine/overworld/events_2.asm
View File

@@ -1,6 +1,5 @@
; More overworld event handling.
WarpToSpawnPoint::
ld hl, wStatusFlags2
res STATUSFLAGS2_SAFARI_GAME_F, [hl]
@@ -96,7 +95,6 @@ TryTileCollisionEvent::
scf
ret
RandomEncounter::
; Random encounter
@@ -243,10 +241,8 @@ TryWildEncounter_BugContest:
and a
ret
INCLUDE "data/wild/bug_contest_mons.asm"
DoBikeStep::
nop
nop

3
engine/overworld/landmarks.asm
View File

@@ -13,7 +13,6 @@ GetLandmarkCoords:
pop hl
ret
GetLandmarkName::
; Copy the name of landmark e to wStringBuffer1.
push hl
@@ -44,10 +43,8 @@ GetLandmarkName::
pop hl
ret
INCLUDE "data/maps/landmarks.asm"
RegionCheck:
; Checks if the player is in Kanto or Johto.
; If in Johto, returns 0 in e.

2
engine/overworld/map_objects.asm
View File

@@ -2,7 +2,6 @@ INCLUDE "data/sprites/facings.asm"
INCLUDE "data/sprites/map_objects.asm"
DeleteMapObject::
push bc
ld hl, OBJECT_MAP_OBJECT_INDEX
@@ -2765,7 +2764,6 @@ ApplyBGMapAnchorToObjects:
pop hl
ret
PRIORITY_LOW EQU $10
PRIORITY_NORM EQU $20
PRIORITY_HIGH EQU $30

1
engine/overworld/map_setup.asm
View File

@@ -107,7 +107,6 @@ MapSetupCommands:
dba DontScrollText ; 2c
dba ReturnFromMapSetupScript ; 2d
DontScrollText:
xor a
ld [wDisableTextAcceleration], a

7
engine/overworld/movement.asm
View File

@@ -91,7 +91,6 @@ MovementPointers:
dw Movement_return_dig ; 58
dw Movement_skyfall_top ; 59
Movement_teleport_from:
ld hl, OBJECT_STEP_TYPE
add hl, bc
@@ -486,7 +485,6 @@ Movement_big_step_right:
ld a, STEP_BIKE << 2 | RIGHT
jp NormalStep
Movement_turn_away_down:
ld a, STEP_SLOW << 2 | DOWN
jp TurningStep
@@ -535,7 +533,6 @@ Movement_turn_waterfall_right:
ld a, STEP_BIKE << 2 | RIGHT
jp TurningStep
Movement_slow_slide_step_down:
ld a, STEP_SLOW << 2 | DOWN
jp SlideStep
@@ -584,7 +581,6 @@ Movement_fast_slide_step_right:
ld a, STEP_BIKE << 2 | RIGHT
jp SlideStep
Movement_slow_jump_step_down:
ld a, STEP_SLOW << 2 | DOWN
jp JumpStep
@@ -633,7 +629,6 @@ Movement_fast_jump_step_right:
ld a, STEP_BIKE << 2 | RIGHT
jp JumpStep
Movement_turn_step_down:
ld a, OW_DOWN
jr TurnStep
@@ -724,7 +719,6 @@ TurningStep:
ld [hl], STEP_TYPE_PLAYER_WALK
ret
SlideStep:
call InitStep
call UpdateTallGrassFlags
@@ -749,7 +743,6 @@ SlideStep:
ld [hl], STEP_TYPE_PLAYER_WALK
ret
JumpStep:
call InitStep
ld hl, OBJECT_1F

4
engine/overworld/npc_movement.asm
View File

@@ -58,7 +58,6 @@ CanObjectMoveInDirection:
and a
ret
WillObjectBumpIntoWater:
call Function6f5f
ret c
@@ -217,7 +216,6 @@ Function6fa1:
ret
CheckFacingObject::
call GetFacingTileCoord
@@ -258,7 +256,6 @@ CheckFacingObject::
scf
ret
WillObjectBumpIntoSomeoneElse:
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
@@ -532,7 +529,6 @@ Unreferenced_Function7113:
scf
ret
Function7171:
ld hl, OBJECT_NEXT_MAP_X
add hl, bc

16
engine/overworld/overworld.asm
View File

@@ -91,7 +91,6 @@ GetPlayerSprite:
INCLUDE "data/sprites/player_sprites.asm"
AddMapSprites:
call GetMapEnvironment
call CheckOutdoorMap
@@ -103,7 +102,6 @@ AddMapSprites:
call AddOutdoorSprites
ret
AddIndoorSprites:
ld hl, wMap1ObjectSprite
ld a, 1
@@ -119,7 +117,6 @@ AddIndoorSprites:
jr nz, .loop
ret
AddOutdoorSprites:
ld a, [wMapGroup]
dec a
@@ -141,7 +138,6 @@ AddOutdoorSprites:
jr nz, .loop
ret
LoadUsedSpritesGFX:
ld a, MAPCALLBACK_SPRITES
call RunMapCallback
@@ -166,7 +162,6 @@ LoadUsedSpritesGFX:
ret
SafeGetSprite:
push hl
call GetSprite
@@ -200,7 +195,6 @@ GetSprite:
ld h, a
ret
GetMonSprite:
; Return carry if a monster sprite was loaded.
@@ -263,7 +257,6 @@ GetMonSprite:
and a
ret
_DoesSpriteHaveFacings::
; Checks to see whether we can apply a facing to a sprite.
; Returns carry unless the sprite is a Pokemon or a Still Sprite.
@@ -290,7 +283,6 @@ _DoesSpriteHaveFacings::
and a
ret
_GetSpritePalette::
ld a, c
call GetMonSprite
@@ -310,14 +302,12 @@ _GetSpritePalette::
ld c, a
ret
LoadAndSortSprites:
call LoadSpriteGFX
call SortUsedSprites
call ArrangeUsedSprites
ret
AddSpriteGFX:
; Add any new sprite ids to a list of graphics to be loaded.
; Return carry if the list is full.
@@ -356,7 +346,6 @@ AddSpriteGFX:
and a
ret
LoadSpriteGFX:
; Bug: b is not preserved, so it's useless as a next count.
; Uncomment the lines below to fix.
@@ -384,7 +373,6 @@ LoadSpriteGFX:
ld a, l
ret
SortUsedSprites:
; Bubble-sort sprites by type.
@@ -455,7 +443,6 @@ SortUsedSprites:
.quit
ret
ArrangeUsedSprites:
; Get the length of each sprite and space them out in VRAM.
; Crystal introduces a second table in VRAM bank 0.
@@ -514,7 +501,6 @@ ArrangeUsedSprites:
.quit
ret
GetSpriteLength:
; Return the length of sprite type a in tiles.
@@ -536,7 +522,6 @@ GetSpriteLength:
ld a, 4
ret
GetUsedSprites:
ld hl, wUsedSprites
ld c, SPRITE_GFX_LIST_CAPACITY
@@ -678,7 +663,6 @@ LoadEmote::
call GetEmote2bpp
ret
INCLUDE "data/sprites/emotes.asm"
INCLUDE "data/sprites/sprite_mons.asm"

13
engine/overworld/scripting.asm
View File

@@ -1,6 +1,5 @@
; Event scripting commands.
EnableScriptMode::
push af
ld a, SCRIPT_READ
@@ -62,7 +61,6 @@ RunScriptCommand:
rst JumpTable
ret
ScriptCommandTable:
; entries correspond to macros/scripts/events.asm enumeration
dw Script_scall ; 00
@@ -332,7 +330,6 @@ JumpTextScript:
closetext
end
if _CRYSTAL
Script_farjumptext:
@@ -351,7 +348,6 @@ Script_farjumptext:
endc
Script_writetext:
; script command 0x4c
; parameters: text_pointer
@@ -521,7 +517,6 @@ Script_verbosegiveitem:
ld de, GiveItemScript
jp ScriptCall
ret_96f76:
ret
@@ -544,7 +539,6 @@ ReceivedItemText:
text_jump UnknownText_0x1c4719
db "@"
Script_verbosegiveitem2:
; script command 0x9f
; parameters: item, var
@@ -608,7 +602,6 @@ Script_specialsound:
call WaitSFX
ret
GetPocketName:
farcall CheckItemPocket
ld a, [wItemAttributeParamBuffer]
@@ -634,7 +627,6 @@ CurItemName:
call GetItemName
ret
PutItemInPocketText:
text_jump UnknownText_0x1c472c
db "@"
@@ -643,7 +635,6 @@ PocketIsFullText:
text_jump UnknownText_0x1c474b
db "@"
Script_pokemart:
; script command 0x94
; parameters: dialog_id, mart_id
@@ -1274,7 +1265,6 @@ ShowEmoteScript:
step_sleep 1
step_end
Script_earthquake:
; script command 0x78
; parameters: param
@@ -1301,7 +1291,6 @@ EarthquakeMovement:
step_end
.End
Script_loadpikachudata:
; script command 0x5a
@@ -2664,7 +2653,6 @@ Script_closetext:
call CloseText
ret
Script_passtoengine:
; script command 0x89
; parameters: data_pointer
@@ -2834,7 +2822,6 @@ Script_checksave:
ld [wScriptVar], a
ret
; unused
ld a, [.byte]
ld [wScriptVar], a

5
engine/overworld/select_menu.asm
View File

@@ -12,12 +12,10 @@ SelectMenu::
call WaitButton
jp CloseText
ItemMayBeRegisteredText:
text_jump UnknownText_0x1c1cf3
db "@"
CheckRegisteredItem:
ld a, [wWhichRegisteredItem]
@@ -85,7 +83,6 @@ CheckRegisteredItem:
scf
ret
.CheckRegisteredNo:
ld a, [wWhichRegisteredItem]
and REGISTERED_NUMBER
@@ -100,7 +97,6 @@ CheckRegisteredItem:
scf
ret
.IsSameItem:
ld a, [wRegisteredItem]
cp [hl]
@@ -113,7 +109,6 @@ CheckRegisteredItem:
scf
ret
UseRegisteredItem:
farcall CheckItemMenu

2
engine/overworld/spawn_points.asm
View File

@@ -1,6 +1,5 @@
INCLUDE "data/maps/spawn_points.asm"
LoadSpawnPoint:
; loads the spawn point in wDefaultSpawnpoint
push hl
@@ -27,7 +26,6 @@ LoadSpawnPoint:
pop hl
ret
IsSpawnPoint:
; Checks if the map loaded in de is a spawn point. Returns carry if it's a spawn point.
ld hl, SpawnPoints

2
engine/overworld/time.asm
View File

@@ -137,7 +137,6 @@ StartBugContestTimer:
call CopyDayHourMinSecToHL
ret
CheckBugContestTimer::
ld hl, wBugContestStartTime
call CalcSecsMinsHoursDaysSince
@@ -172,7 +171,6 @@ CheckBugContestTimer::
scf
ret
InitializeStartDay:
call UpdateTime
ld hl, wTimerEventStartDay

2
engine/overworld/warp_connection.asm
View File

@@ -15,7 +15,6 @@ InitCommandQueue:
ld [wMapTimeOfDay], a
ret
EnterMapConnection:
; Return carry if a connection has been entered.
ld a, [wPlayerStepDirection]
@@ -388,7 +387,6 @@ CheckMovingOffEdgeOfMap::
scf
ret
GetCoordOfUpperLeftCorner::
ld hl, wOverworldMapBlocks
ld a, [wXCoord]

7
engine/overworld/wildmons.asm
View File

@@ -490,7 +490,6 @@ LookUpWildmonsForMapDE:
scf
ret
InitRoamMons:
; initialize wRoamMon structs
@@ -524,7 +523,6 @@ InitRoamMons:
ret
CheckEncounterRoamMon:
push hl
; Don't trigger an encounter if we're on water.
@@ -572,7 +570,6 @@ CheckEncounterRoamMon:
and a
ret
UpdateRoamMons:
ld a, [wRoamMon1MapGroup]
cp GROUP_N_A
@@ -615,7 +612,6 @@ UpdateRoamMons:
.Finished:
jp _BackUpMapIndices
.Update:
ld hl, RoamMaps
.loop
@@ -752,10 +748,8 @@ _BackUpMapIndices:
ld [wRoamMons_CurrentMapGroup], a
ret
INCLUDE "data/wild/roammon_maps.asm"
ValidateTempWildMonSpecies:
; Due to a development oversight, this function is called with the wild Pokemon's level, not its species, in a.
and a
@@ -965,7 +959,6 @@ RandomPhoneMon:
ld bc, MON_NAME_LENGTH
jp CopyBytes
INCLUDE "data/wild/johto_grass.asm"
INCLUDE "data/wild/johto_water.asm"
INCLUDE "data/wild/kanto_grass.asm"