pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -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

65
engine/pokegear/pokegear.asm
View File

@@ -157,7 +157,6 @@ Pokegear_LoadGFX:
call CopyBytes
ret
FastShipGFX:
INCBIN "gfx/pokegear/fast_ship.2bpp"
@@ -182,7 +181,6 @@ AnimatePokegearModeIndicatorArrow:
ld [hl], a
ret
.XCoords:
db $00 ; POKEGEARCARD_CLOCK
db $10 ; POKEGEARCARD_MAP
@@ -204,7 +202,6 @@ TownMap_GetCurrentLandmark:
call GetWorldMapLocation
ret
TownMap_InitCursorAndPlayerIconPositions:
ld a, [wMapGroup]
ld b, a
@@ -301,7 +298,6 @@ InitPokegearTilemap:
call WaitBGMap
ret
.Jumptable:
; entries correspond to POKEGEARCARD_* constants
dw .Clock
@@ -321,7 +317,6 @@ InitPokegearTilemap:
call Pokegear_UpdateClock
ret
.switch
db " SWITCHâ–¶@"
@@ -351,7 +346,6 @@ InitPokegearTilemap:
call PokegearMap_UpdateLandmarkName
ret
.Radio:
ld de, RadioTilemapRLE
call Pokegear_LoadTilemapRLE
@@ -360,7 +354,6 @@ InitPokegearTilemap:
call TextBox
ret
.Phone:
ld de, PhoneTilemapRLE
call Pokegear_LoadTilemapRLE
@@ -371,7 +364,6 @@ InitPokegearTilemap:
call PokegearPhone_UpdateDisplayList
ret
.PlacePhoneBars:
hlcoord 17, 1
ld a, $3c
@@ -543,7 +535,6 @@ Pokegear_UpdateClock:
text_jump UnknownText_0x1c5821
db "@"
PokegearMap_CheckRegion:
ld a, [wPokegearMapPlayerIconLandmark]
cp FAST_SHIP
@@ -695,7 +686,6 @@ PokegearMap_InitPlayerIcon:
ld [hl], d
ret
PokegearMap_InitCursor:
push af
depixel 0, 0
@@ -713,7 +703,6 @@ PokegearMap_InitCursor:
pop bc
ret
PokegearMap_UpdateLandmarkName:
push af
hlcoord 8, 0
@@ -729,7 +718,6 @@ PokegearMap_UpdateLandmarkName:
ld [hl], $34
ret
PokegearMap_UpdateCursorPosition:
push bc
ld e, a
@@ -743,7 +731,6 @@ PokegearMap_UpdateCursorPosition:
ld [hl], d
ret
TownMap_GetKantoLandmarkLimits:
ld a, [wStatusFlags]
bit STATUSFLAGS_HALL_OF_FAME_F, a
@@ -757,7 +744,6 @@ TownMap_GetKantoLandmarkLimits:
ld e, VICTORY_ROAD
ret
PokegearRadio_Init:
call InitPokegearTilemap
depixel 4, 10, 4, 4
@@ -948,19 +934,16 @@ PokegearPhone_MakePhoneCall:
call PrintText
ret
.dotdotdot
;
text_jump UnknownText_0x1c5824
db "@"
.OutOfServiceArea:
; You're out of the service area.
text_jump UnknownText_0x1c5827
db "@"
PokegearPhone_FinishPhoneCall:
ld a, [hJoyPressed]
and A_BUTTON | B_BUTTON
@@ -1088,7 +1071,6 @@ PokegearPhone_UpdateDisplayList:
call PokegearPhone_UpdateCursor
ret
PokegearPhone_DeletePhoneNumber:
ld hl, wPhoneList
ld a, [wPokegearPhoneScrollPosition]
@@ -1114,7 +1096,6 @@ PokegearPhone_DeletePhoneNumber:
jr nz, .loop
ret
PokegearPhoneContactSubmenu:
ld hl, wPhoneList
ld a, [wPokegearPhoneScrollPosition]
@@ -1230,7 +1211,6 @@ PokegearPhoneContactSubmenu:
scf
ret
.Delete:
ld hl, PokegearText_DeleteStoredNumber
call MenuTextBox
@@ -1248,12 +1228,10 @@ PokegearPhoneContactSubmenu:
scf
ret
.Call:
and a
ret
.UpdateCursor:
push de
ld a, [de]
@@ -1280,7 +1258,6 @@ PokegearPhoneContactSubmenu:
pop de
ret
.CallDeleteCancelStrings:
dwcoord 10, 6
db 3
@@ -1294,7 +1271,6 @@ PokegearPhoneContactSubmenu:
dw .Delete
dw .Cancel
.CallCancelStrings:
dwcoord 10, 8
db 2
@@ -1306,7 +1282,6 @@ PokegearPhoneContactSubmenu:
dw .Call
dw .Cancel
; unused
ld a, [hHours]
cp 12
@@ -1321,7 +1296,6 @@ PokegearPhoneContactSubmenu:
and a
ret
Pokegear_SwitchPage:
ld de, SFX_READ_TEXT_2
call PlaySFX
@@ -1348,7 +1322,6 @@ ExitPokegearRadio_HandleMusic:
ld [wPokegearRadioMusicPlaying], a
ret
DeleteSpriteAnimStruct2ToEnd:
ld hl, wSpriteAnim2
ld bc, wSpriteAnimationStructsEnd - wSpriteAnim2
@@ -1378,25 +1351,21 @@ Pokegear_LoadTilemapRLE:
jr nz, .load
jr .loop
PokegearText_WhomToCall:
; Whom do you want to call?
text_jump UnknownText_0x1c5847
db "@"
PokegearText_PressAnyButtonToExit:
; Press any button to exit.
text_jump UnknownText_0x1c5862
db "@"
PokegearText_DeleteStoredNumber:
; Delete this stored phone number?
text_jump UnknownText_0x1c587d
db "@"
PokegearSpritesGFX:
INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz"
@@ -1487,7 +1456,6 @@ UpdateRadioStation:
ld [hBGMapMode], a
ret
; unused
ld [wPokegearRadioChannelBank], a
ld a, [hli]
@@ -1496,7 +1464,6 @@ UpdateRadioStation:
ld [wPokegearRadioChannelAddr + 1], a
ret
RadioChannels:
; entries correspond to constants/radio_constants.asm
@@ -1662,7 +1629,6 @@ LoadStation_BuenasPassword:
ld de, BuenasPasswordName
ret
BuenasPasswordName: db "BUENA'S PASSWORD@"
NotBuenasPasswordName: db "@"
@@ -1699,7 +1665,6 @@ LoadStation_LetsAllSing:
ld de, LetsAllSingName
ret
LoadStation_RocketRadio:
ld a, ROCKET_RADIO
ld [wCurrentRadioLine], a
@@ -1711,7 +1676,6 @@ LoadStation_RocketRadio:
ld de, LetsAllSingName
ret
LoadStation_PokeFluteRadio:
ld a, POKE_FLUTE_RADIO
ld [wCurrentRadioLine], a
@@ -1734,7 +1698,6 @@ LoadStation_EvolutionRadio:
ld de, UnownStationName
ret
Unreferenced_LoadStation:
ret
@@ -1798,7 +1761,6 @@ NoRadioName:
call TextBox
ret
OaksPKMNTalkName: db "OAK's <PK><MN> Talk@"
PokedexShowName: db "#DEX Show@"
PokemonMusicName: db "#MON Music@"
@@ -2008,7 +1970,6 @@ PlayRadio:
call ExitPokegearRadio_HandleMusic
ret
.PlayStation:
ld a, ENTER_MAP_MUSIC
ld [wPokegearRadioMusicPlaying], a
@@ -2039,7 +2000,6 @@ PlayRadio:
call WaitBGMap
ret
.StationPointers:
; entries correspond to MAPRADIO_* constants
dw .OakOrPnP
@@ -2052,7 +2012,6 @@ PlayRadio:
dw LoadStation_LetsAllSing
dw LoadStation_RocketRadio
.OakOrPnP:
call IsInJohto
and a
@@ -2066,7 +2025,6 @@ PlayRadio:
.kanto
jp LoadStation_PlacesAndPeople
PokegearMap:
ld a, e
and a
@@ -2080,7 +2038,6 @@ PokegearMap:
call FillKantoMap
ret
_FlyMap:
call ClearBGPalettes
call ClearTileMap
@@ -2144,7 +2101,6 @@ _FlyMap:
ld e, a
ret
FlyMapScroll:
ld a, [wStartFlypoint]
ld e, a
@@ -2192,7 +2148,6 @@ FlyMapScroll:
ld [hBGMapMode], a
ret
TownMapBubble:
; Draw the bubble containing the location text in the town map HUD
@@ -2255,7 +2210,6 @@ TownMapBubble:
call PlaceString
ret
GetMapCursorCoordinates:
ld a, [wTownMapPlayerIconLandmark]
ld l, a
@@ -2277,7 +2231,6 @@ GetMapCursorCoordinates:
ld [hl], d
ret
CheckIfVisitedFlypoint:
; Check if the flypoint loaded in [hl] has been visited yet.
push bc
@@ -2296,7 +2249,6 @@ CheckIfVisitedFlypoint:
and a
ret
HasVisitedSpawn:
; Check if spawn point c has been visited.
ld hl, wVisitedSpawns
@@ -2306,13 +2258,11 @@ HasVisitedSpawn:
ld a, c
ret
INCLUDE "data/maps/flypoints.asm"
ret_91c8f:
ret
FlyMap:
ld a, [wMapGroup]
ld b, a
@@ -2407,7 +2357,6 @@ FlyMap:
ld [wTownMapCursorCoordinates + 1], a
ret
Pokedex_GetArea:
; e: Current landmark
ld a, [wTownMapPlayerIconLandmark]
@@ -2474,7 +2423,6 @@ Pokedex_GetArea:
ld [wTownMapPlayerIconLandmark], a
ret
.LeftRightInput:
ld a, [hl]
and D_LEFT
@@ -2509,7 +2457,6 @@ Pokedex_GetArea:
call .GetAndPlaceNest
ret
.BlinkNestIcons:
ld a, [hVBlankCounter]
ld e, a
@@ -2528,7 +2475,6 @@ Pokedex_GetArea:
call CopyBytes
ret
.PlaceString_MonsNest:
hlcoord 0, 0
ld bc, SCREEN_WIDTH
@@ -2550,7 +2496,6 @@ Pokedex_GetArea:
call PlaceString
ret
.String_SNest:
db "'S NEST@"
@@ -2592,7 +2537,6 @@ Pokedex_GetArea:
call CopyBytes
ret
.HideNestsShowPlayer:
call .CheckPlayerLocation
ret c
@@ -2637,7 +2581,6 @@ Pokedex_GetArea:
call ByteFill
ret
.PlayerOAM:
; y pxl, x pxl, tile offset
db -1 * 8, -1 * 8, 0 ; top left
@@ -2677,7 +2620,6 @@ Pokedex_GetArea:
scf
ret
.GetPlayerOrFastShipIcon:
ld a, [wTownMapPlayerIconLandmark]
cp FAST_SHIP
@@ -2690,7 +2632,6 @@ Pokedex_GetArea:
ld b, BANK(FastShipGFX)
ret
TownMapBGUpdate:
; Update BG Map tiles and attributes
@@ -2719,7 +2660,6 @@ TownMapBGUpdate:
ld [hBGMapMode], a
ret
FillJohtoMap:
ld de, JohtoMap
jr FillTownMap
@@ -2737,7 +2677,6 @@ FillTownMap:
inc de
jr .loop
TownMapPals:
; Assign palettes based on tile ids
hlcoord 0, 0
@@ -2818,7 +2757,6 @@ TownMapMon:
ld [hl], SPRITE_ANIM_SEQ_NULL
ret
TownMapPlayerIcon:
; Draw the player icon at town map location in a
push af
@@ -2862,7 +2800,6 @@ TownMapPlayerIcon:
ld [hl], d
ret
LoadTownMapGFX:
ld hl, TownMapGFX
ld de, vTiles2
@@ -2870,7 +2807,6 @@ LoadTownMapGFX:
call DecompressRequest2bpp
ret
JohtoMap:
INCBIN "gfx/pokegear/johto.bin"
@@ -2960,7 +2896,6 @@ Unreferenced_Function92311:
ld e, a
ret
.HandleDPad:
ld hl, hJoyLast
ld a, [hl]

1
engine/pokegear/radio.asm
View File

@@ -126,7 +126,6 @@ RadioJumptable:
dw PokedexShow7 ; $56
dw PokedexShow8 ; $57
PrintRadioLine:
ld [wNextRadioLine], a
ld hl, wRadioText