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

Keep table labels in the same files as their contents.

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-11 22:44:25 -05:00
parent fe9cb90049
commit f1f84743f7
67 changed files with 667 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/decorations.asm
View File

@@ -541,9 +541,7 @@ GetDecorationSprite: ; 26a44
ret
; 26a4f
DecorationAttributes: ; 26a4f
INCLUDE "data/decoration_attributes.asm"
; 26b8d
DecorationNames: ; 26b8d
db "CANCEL@"

1
engine/engine_flags.asm
View File

@@ -83,5 +83,4 @@ EngineFlagAction:: ; 80430
; 80462
EngineFlags: ; 80462
INCLUDE "data/engine_flags.asm"

4
engine/fruit_trees.asm
View File

@@ -102,9 +102,9 @@ GetFruitTreeItem: ; 4408a
ret
; 44097
FruitTreeItems: ; 44097
INCLUDE "data/fruit_tree_items.asm"
; 440b5
FruitBearingTreeText: ; 440b5
text_jump _FruitBearingTreeText

1
engine/landmarks.asm
View File

@@ -47,7 +47,6 @@ GetLandmarkName:: ; 0x1ca8a5
; 0x1ca8c3
Landmarks: ; 0x1ca8c3
INCLUDE "data/landmarks.asm"

3
engine/map_objects.asm
View File

@@ -1,9 +1,10 @@
INCLUDE "data/facings.asm"
SpriteMovementData:: ; 4273
INCLUDE "data/map_objects.asm"
; 4357
DeleteMapObject:: ; 4357
push bc

2
engine/mon_icons.asm
View File

@@ -465,7 +465,7 @@ ReadMonMenuIcon: ; 8eab3
ret
; 8eac4
MonMenuIcons: ; 8eac4
INCLUDE "data/mon_menu_icons.asm"

2
engine/npctrade.asm
View File

@@ -411,9 +411,7 @@ GetTradeMonNames: ; fce1b
; fce58
NPCTrades: ; fce58
INCLUDE "data/npc_trades.asm"
; fcf38
PrintTradeText: ; fcf38

52
engine/options_menu.asm
View File

@@ -106,9 +106,9 @@ GetOptionPointer: ; e42d6
const_def
const TEXT_SPEED_FAST ; 0
const TEXT_SPEED_MED ; 1
const TEXT_SPEED_SLOW ; 2
const OPT_TEXT_SPEED_FAST ; 0
const OPT_TEXT_SPEED_MED ; 1
const OPT_TEXT_SPEED_SLOW ; 2
Options_TextSpeed: ; e42f5
call GetTextSpeed
@@ -118,9 +118,9 @@ Options_TextSpeed: ; e42f5
bit D_RIGHT_F, a
jr z, .NonePressed
ld a, c ; right pressed
cp TEXT_SPEED_SLOW
cp OPT_TEXT_SPEED_SLOW
jr c, .Increase
ld c, TEXT_SPEED_FAST +- 1
ld c, OPT_TEXT_SPEED_FAST +- 1
.Increase:
inc c
@@ -131,7 +131,7 @@ Options_TextSpeed: ; e42f5
ld a, c
and a
jr nz, .Decrease
ld c, TEXT_SPEED_SLOW + 1
ld c, OPT_TEXT_SPEED_SLOW + 1
.Decrease:
dec c
@@ -159,7 +159,7 @@ Options_TextSpeed: ; e42f5
; e4331
.Strings:
; entries correspond to TEXT_SPEED_* constants
; entries correspond to OPT_TEXT_SPEED_* constants
dw .Fast
dw .Mid
dw .Slow
@@ -171,7 +171,7 @@ Options_TextSpeed: ; e42f5
GetTextSpeed: ; e4346
; converts TEXT_DELAY_* value in a to TEXT_SPEED_* value in c,
; converts TEXT_DELAY_* value in a to OPT_TEXT_SPEED_* value in c,
; with previous/next TEXT_DELAY_* values in d/e
ld a, [Options]
and $7
@@ -180,17 +180,17 @@ GetTextSpeed: ; e4346
cp TEXT_DELAY_FAST
jr z, .fast
; none of the above
ld c, TEXT_SPEED_MED
ld c, OPT_TEXT_SPEED_MED
lb de, TEXT_DELAY_FAST, TEXT_DELAY_SLOW
ret
.slow
ld c, TEXT_SPEED_SLOW
ld c, OPT_TEXT_SPEED_SLOW
lb de, TEXT_DELAY_MED, TEXT_DELAY_FAST
ret
.fast
ld c, TEXT_SPEED_FAST
ld c, OPT_TEXT_SPEED_FAST
lb de, TEXT_DELAY_SLOW, TEXT_DELAY_MED
ret
; e4365
@@ -328,11 +328,11 @@ Options_Sound: ; e43dd
const_def
const PRINT_LIGHTEST ; 0
const PRINT_LIGHTER ; 1
const PRINT_NORMAL ; 2
const PRINT_DARKER ; 3
const PRINT_DARKEST ; 4
const OPT_PRINT_LIGHTEST ; 0
const OPT_PRINT_LIGHTER ; 1
const OPT_PRINT_NORMAL ; 2
const OPT_PRINT_DARKER ; 3
const OPT_PRINT_DARKEST ; 4
Options_Print: ; e4424
call GetPrinterSetting
@@ -342,9 +342,9 @@ Options_Print: ; e4424
bit D_RIGHT_F, a
jr z, .NonePressed
ld a, c
cp PRINT_DARKEST
cp OPT_PRINT_DARKEST
jr c, .Increase
ld c, PRINT_LIGHTEST - 1
ld c, OPT_PRINT_LIGHTEST - 1
.Increase:
inc c
@@ -355,7 +355,7 @@ Options_Print: ; e4424
ld a, c
and a
jr nz, .Decrease
ld c, PRINT_DARKEST + 1
ld c, OPT_PRINT_DARKEST + 1
.Decrease:
dec c
@@ -380,7 +380,7 @@ Options_Print: ; e4424
; e445a
.Strings:
; entries correspond to PRINT_* constants
; entries correspond to OPT_PRINT_* constants
dw .Lightest
dw .Lighter
dw .Normal
@@ -396,7 +396,7 @@ Options_Print: ; e4424
GetPrinterSetting: ; e4491
; converts GBPRINTER_* value in a to PRINT_* value in c,
; converts GBPRINTER_* value in a to OPT_PRINT_* value in c,
; with previous/next GBPRINTER_* values in d/e
ld a, [GBPrinter]
and a
@@ -408,27 +408,27 @@ GetPrinterSetting: ; e4491
cp GBPRINTER_DARKEST
jr z, .IsDarkest
; none of the above
ld c, PRINT_NORMAL
ld c, OPT_PRINT_NORMAL
lb de, GBPRINTER_LIGHTER, GBPRINTER_DARKER
ret
.IsLightest:
ld c, PRINT_LIGHTEST
ld c, OPT_PRINT_LIGHTEST
lb de, GBPRINTER_DARKEST, GBPRINTER_LIGHTER
ret
.IsLight:
ld c, PRINT_LIGHTER
ld c, OPT_PRINT_LIGHTER
lb de, GBPRINTER_LIGHTEST, GBPRINTER_NORMAL
ret
.IsDark:
ld c, PRINT_DARKER
ld c, OPT_PRINT_DARKER
lb de, GBPRINTER_NORMAL, GBPRINTER_DARKEST
ret
.IsDarkest:
ld c, PRINT_DARKEST
ld c, OPT_PRINT_DARKEST
lb de, GBPRINTER_DARKER, GBPRINTER_LIGHTEST
ret
; e44c1

9
engine/overworld.asm
View File

@@ -717,19 +717,10 @@ LoadEmote:: ; 1442f
; 1444d
EmotesPointers: ; 144d
INCLUDE "data/emote_headers.asm"
; 14495
SpriteMons: ; 14495
INCLUDE "data/sprite_mons.asm"
; 144b8
INCLUDE "data/outdoor_sprites.asm"
SpriteHeaders: ; 14736
INCLUDE "gfx/sprite_headers.asm"
; 1499a

8
engine/phone.asm
View File

@@ -760,13 +760,11 @@ GetCallerLocation: ; 90439
ret
; 9045f
PhoneContacts: ; 9045f
INCLUDE "data/phone_contacts.asm"
; 90627
SpecialPhoneCallList: ; 90627
INCLUDE "data/phone_contacts.asm"
INCLUDE "data/phone_special.asm"
; 90657
UnknownScript_0x90657: ; 0x90657
writetext UnknownText_0x9065b

4
engine/save.asm
View File

@@ -726,9 +726,9 @@ TryLoadSaveData: ; 14f1c
ret
; 14f7c
DefaultOptions: ; 14f7c
INCLUDE "data/default_options.asm"
; 14f84
CheckPrimarySaveFile: ; 14f84
ld a, BANK(s1_a008)

1
engine/spawn_points.asm
View File

@@ -1,5 +1,4 @@
SpawnPoints: ; 0x152ab
INCLUDE "data/spawn_points.asm"

27
engine/sprites.asm
View File

@@ -550,15 +550,30 @@ BrokenGetStdGraphics: ; 8d1ac
ret
; 8d1c4
SpriteAnimSeqData: ; 8d1c4
INCLUDE "data/sprite_anim_seqs.asm"
; 8d24b
INCLUDE "engine/sprite_anims.asm" ; DoAnimFrame
INCLUDE "engine/sprite_anims.asm"
INCLUDE "data/sprite_anim_frames.asm"
INCLUDE "data/sprite_anim_oam.asm"
BrokenStdGFXPointers: ; Broken 2bpp pointers
dbbw $80, $01, .deleted ; 128-tile 2bpp at 1:672a (inside Multiply)
dbbw $80, $01, .deleted
dbbw $80, $01, .deleted
dbbw $80, $01, .deleted
dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within TilesetTrainStationGFX)
dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data)
dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data)
dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7)
dbbw $10, $21, .deleted ; 16-tile 2bpp at 21:672a (inside Function8671c)
.deleted
; 8e72a (23:672a)
INCLUDE "data/sprite_engine.asm"
; SpriteAnimFrameData
; SpriteAnimOAMData
Sprites_Cosine: ; 8e72a
add $10

3
engine/tmhm.asm
View File

@@ -45,6 +45,5 @@ GetTMHMMove: ; 1166a
ret
; 1167a
TMHMMoves: ; 1167a
INCLUDE "data/tmhm_moves.asm"
; 116b7