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

Merge pull request #654 from Rangi42/master

Browse Source 
Miscellaneous cleanup issues
This commit is contained in:
Rangi
2019-11-04 19:40:58 -05:00
committed by GitHub
parent c9563d5c5e d076159745
commit 9ebe549347
243 changed files with 1921 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -166,6 +166,7 @@ gfx/mail/flower_mail_border.1bpp: tools/gfx += --remove-whitespace
gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace
gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
gfx/pokedex/question_mark.2bpp: rgbgfx += -h
gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace
gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace

4
constants/map_object_constants.asm
View File

@@ -34,7 +34,7 @@
const OBJECT_1F ; 1f const OBJECT_1F ; 1f
const OBJECT_RANGE ; 20 const OBJECT_RANGE ; 20
; 21-27 are not used ; 21-27 are not used
OBJECT_STRUCT_LENGTH EQU 40 OBJECT_LENGTH EQU 40
NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
; object_struct OBJECT_FACING values ; object_struct OBJECT_FACING values
@@ -114,7 +114,7 @@ ABSOLUTE_TILE_ID EQU 1 << ABSOLUTE_TILE_ID_F
const MAPOBJECT_FLAG_HI ; d const MAPOBJECT_FLAG_HI ; d
const MAPOBJECT_E ; unused const MAPOBJECT_E ; unused
const MAPOBJECT_F ; unused const MAPOBJECT_F ; unused
OBJECT_LENGTH EQU const_value MAPOBJECT_LENGTH EQU const_value
; SpriteMovementData struct members (see data/sprites/map_objects.asm) ; SpriteMovementData struct members (see data/sprites/map_objects.asm)
const_def const_def

11
constants/script_constants.asm
View File

@@ -92,6 +92,17 @@ RETVAR_EXECUTE EQU (2 << 6)
const PLAYEREVENT_JOYCHANGEFACING const PLAYEREVENT_JOYCHANGEFACING
NUM_PLAYER_EVENTS EQU const_value NUM_PLAYER_EVENTS EQU const_value
; PlayerMovement.pointers indexes (see engine/overworld/events.asm)
const_def
const PLAYERMOVEMENT_NORMAL
const PLAYERMOVEMENT_WARP
const PLAYERMOVEMENT_TURN
const PLAYERMOVEMENT_FORCE_TURN
const PLAYERMOVEMENT_FINISH
const PLAYERMOVEMENT_CONTINUE
const PLAYERMOVEMENT_EXIT_WATER
const PLAYERMOVEMENT_JUMP
; script data sizes (see macros/scripts/maps.asm) ; script data sizes (see macros/scripts/maps.asm)
SCENE_SCRIPT_SIZE EQU 4 ; scene_script SCENE_SCRIPT_SIZE EQU 4 ; scene_script
CALLBACK_SIZE EQU 3 ; callback CALLBACK_SIZE EQU 3 ; callback

4
constants/text_constants.asm
View File

@@ -33,12 +33,12 @@ TEXTBOX_INNERY EQU TEXTBOX_Y + 2
; PrintNum bit flags ; PrintNum bit flags
const_def 5 const_def 5
const PRINTNUM_MONEY_F ; 5 const PRINTNUM_MONEY_F ; 5
const PRINTNUM_RIGHTALIGN_F ; 6 const PRINTNUM_LEFTALIGN_F ; 6
const PRINTNUM_LEADINGZEROS_F ; 7 const PRINTNUM_LEADINGZEROS_F ; 7
; PrintNum arguments (see engine/math/print_num.asm) ; PrintNum arguments (see engine/math/print_num.asm)
PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F
PRINTNUM_RIGHTALIGN EQU 1 << PRINTNUM_RIGHTALIGN_F PRINTNUM_LEFTALIGN EQU 1 << PRINTNUM_LEFTALIGN_F
PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F
; character sets (see charmap.asm) ; character sets (see charmap.asm)

2
constants/tileset_constants.asm
View File

@@ -21,7 +21,7 @@
const TILESET_LIGHTHOUSE ; 13 const TILESET_LIGHTHOUSE ; 13
const TILESET_PLAYERS_ROOM ; 14 const TILESET_PLAYERS_ROOM ; 14
const TILESET_POKECOM_CENTER ; 15 const TILESET_POKECOM_CENTER ; 15
const TILESET_BATTLE_TOWER ; 16 const TILESET_BATTLE_TOWER_INSIDE ; 16
const TILESET_TOWER ; 17 const TILESET_TOWER ; 17
const TILESET_CAVE ; 18 const TILESET_CAVE ; 18
const TILESET_PARK ; 19 const TILESET_PARK ; 19

8
data/maps/maps.asm
View File

@@ -416,10 +416,10 @@ MapGroup_Cianwood:
map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BattleTower1F, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerBattleRoom, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerElevator, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

502
data/pokemon/cries.asm
View File

File diff suppressed because it is too large Load Diff

4
data/text/common_1.asm
View File

@@ -94,7 +94,7 @@ _GrewToLevelText::
text_decimal wCurPartyLevel, 1, 3 text_decimal wCurPartyLevel, 1, 3
text "!@" text "!@"
sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1343,7 +1343,7 @@ _ReceiveItemText::
text_ram wStringBuffer1 text_ram wStringBuffer1
text "!@" text "!@"
sound_item sound_item
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused

8
data/text/common_2.asm
View File

@@ -314,7 +314,7 @@ _CutNothingText::
_BlindingFlashText:: _BlindingFlashText::
text "A blinding FLASH" text "A blinding FLASH"
line "lights the area!@" line "lights the area!@"
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -794,7 +794,7 @@ _BreedEggHatchText::
text " came" text " came"
line "out of its EGG!@" line "out of its EGG!@"
sound_caught_mon sound_caught_mon
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1055,7 +1055,7 @@ _KarpGuruRecordText::
text " caught by" text " caught by"
line "@" line "@"
text_ram wMagikarpRecordHoldersName text_ram wMagikarpRecordHoldersName
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1551,7 +1551,7 @@ _OakText2::
text_end text_end
_OakText3:: _OakText3::
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused

8
data/text/common_3.asm
View File

@@ -959,7 +959,7 @@ _LearnedMoveText::
text_ram wStringBuffer2 text_ram wStringBuffer2
text "!@" text "!@"
sound_dex_fanfare_50_79 sound_dex_fanfare_50_79
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1244,7 +1244,7 @@ Text_BallCaught::
text_end ; unused text_end ; unused
_WaitButtonText:: _WaitButtonText::
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1261,7 +1261,7 @@ _NewDexDataText::
line "was newly added to" line "was newly added to"
cont "the #DEX.@" cont "the #DEX.@"
sound_slot_machine_start sound_slot_machine_start
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1308,7 +1308,7 @@ _FluteWakeUpText::
Text_PlayedPokeFlute:: Text_PlayedPokeFlute::
text "<PLAYER> played the" text "<PLAYER> played the"
line "# FLUTE.@" line "# FLUTE.@"
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused

2
data/tilesets.asm
View File

@@ -34,7 +34,7 @@ Tilesets::
tileset TilesetLighthouse tileset TilesetLighthouse
tileset TilesetPlayersRoom tileset TilesetPlayersRoom
tileset TilesetPokeComCenter tileset TilesetPokeComCenter
tileset TilesetBattleTower tileset TilesetBattleTowerInside
tileset TilesetTower tileset TilesetTower
tileset TilesetCave tileset TilesetCave
tileset TilesetPark tileset TilesetPark

0
data/tilesets/battle_tower_collision.asm → data/tilesets/battle_tower_inside_collision.asm
View File

0
data/tilesets/battle_tower_metatiles.bin → data/tilesets/battle_tower_inside_metatiles.bin
View File

11
docs/design_flaws.md
View File

@@ -216,6 +216,17 @@ INCBIN "gfx/footprints/wartortle.1bpp"
Edit `Pokedex_LoadAnyFootprint`: Edit `Pokedex_LoadAnyFootprint`:
```diff ```diff
ld a, [wTempSpecies]
dec a
and %111
swap a ; * $10
+ add a, a
ld l, a
ld h, 0
add hl, de
ld de, Footprints
add hl, de
- push hl - push hl
ld e, l ld e, l
ld d, h ld d, h

2
docs/event_commands.md
View File

@@ -298,7 +298,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$54`: `waitbutton` ## `$54`: `waitbutton`
## `$55`: `buttonsound` ## `$55`: `promptbutton`
## `$56`: <code>pokepic <i>mon_id</i></code> ## `$56`: <code>pokepic <i>mon_id</i></code>

4
docs/text_commands.md
View File

@@ -35,7 +35,7 @@ Draw a box.
Write text at (1, 16). Write text at (1, 16).
## `$06`: `text_waitbutton` ## `$06`: `text_promptbutton`
Wait for button press; show arrow. Wait for button press; show arrow.
@@ -71,7 +71,7 @@ Play `SFX_DEX_FANFARE_50_79`.
Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed. Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed.
## `$0D`: `text_linkwaitbutton` ## `$0D`: `text_linkpromptbutton`
Wait for button press; show arrow. Wait for button press; show arrow.

2
engine/events/diploma.asm
View File

@@ -86,3 +86,5 @@ INCBIN "gfx/diploma/page1.tilemap"
DiplomaPage2Tilemap: DiplomaPage2Tilemap:
INCBIN "gfx/diploma/page2.tilemap" INCBIN "gfx/diploma/page2.tilemap"
ret ; unused

4
engine/events/fish.asm
View File

@@ -1,7 +1,7 @@
Fish: Fish:
; Using a fishing rod. ; Using a fishing rod.
; Fish for monsters with rod e in encounter group d. ; Fish for monsters with rod e in encounter group d.
; Return monster e at level d. ; Return monster d at level e.
push af push af
push bc push bc
@@ -23,7 +23,7 @@ endr
.Fish: .Fish:
; Fish for monsters with rod b from encounter data in FishGroup at hl. ; Fish for monsters with rod b from encounter data in FishGroup at hl.
; Return monster e at level d. ; Return monster d at level e.
call Random call Random
cp [hl] cp [hl]

6
engine/events/fruit_trees.asm
View File

@@ -4,7 +4,7 @@ FruitTreeScript::
readmem wCurFruit readmem wCurFruit
getitemname STRING_BUFFER_3, USE_SCRIPT_VAR getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
writetext FruitBearingTreeText writetext FruitBearingTreeText
buttonsound promptbutton
callasm TryResetFruitTrees callasm TryResetFruitTrees
callasm CheckFruitTree callasm CheckFruitTree
iffalse .fruit iffalse .fruit
@@ -17,7 +17,7 @@ FruitTreeScript::
readmem wCurFruit readmem wCurFruit
giveitem ITEM_FROM_MEM giveitem ITEM_FROM_MEM
iffalse .packisfull iffalse .packisfull
buttonsound promptbutton
writetext ObtainedFruitText writetext ObtainedFruitText
callasm PickedFruitTree callasm PickedFruitTree
specialsound specialsound
@@ -25,7 +25,7 @@ FruitTreeScript::
sjump .end sjump .end
.packisfull .packisfull
buttonsound promptbutton
writetext FruitPackIsFullText writetext FruitPackIsFullText
waitbutton waitbutton

4
engine/events/magikarp.asm
View File

@@ -89,12 +89,12 @@ PrintMagikarpLength:
call Magikarp_LoadFeetInchesChars call Magikarp_LoadFeetInchesChars
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld de, wMagikarpLength ld de, wMagikarpLength
lb bc, PRINTNUM_RIGHTALIGN | 1, 2 lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum call PrintNum
ld [hl], "′" ld [hl], "′"
inc hl inc hl
ld de, wMagikarpLength + 1 ld de, wMagikarpLength + 1
lb bc, PRINTNUM_RIGHTALIGN | 1, 2 lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum call PrintNum
ld [hl], "″" ld [hl], "″"
inc hl inc hl

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