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

Merge pull request #248 from yenatch/master

Browse Source 
Trainer card graphics, Kanto Special stats, unused item constants, mobile adapter lib
This commit is contained in:
Bryan Bishop 2014-05-01 22:43:19 -05:00
commit 6fbb99786f
132 changed files with 10551 additions and 1107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -15,6 +15,7 @@ TEXTQUEUE :=
CRYSTAL_OBJS := \
wram.o \
main.o \
lib/mobile/main.o \
home.o \
audio.o \
maps_crystal.o \

17
audio/engine.asm
View File

@ -201,8 +201,8 @@ _UpdateSound:: ; e805c
ld [CurChannel], a
cp a, $08 ; are we done?
jp nz, .loop ; do it all again
; writing to hardware registers?
call Functione8307
call PlayDanger
; fade music in/out
call FadeMusic
; write volume to hardware register
@ -240,7 +240,7 @@ UpdateChannels: ; e8125
dw .Channel8
.Channel1
ld a, [$c2a6]
ld a, [Danger]
bit 7, a
ret nz
.Channel5
@ -513,9 +513,8 @@ _CheckSFX: ; e82e7
ret
; e8307
Functione8307: ; e8307
; what is $c2a6?
ld a, [$c2a6]
PlayDanger: ; e8307
ld a, [Danger]
bit 7, a
ret z
and a, $7f
@ -524,7 +523,7 @@ Functione8307: ; e8307
jr c, .asm_e8335
and a
jr z, .asm_e8323
cp a, $10
cp a, 16 ; halfway
jr z, .asm_e831e
jr .asm_e8335
.asm_e831e
@ -546,12 +545,12 @@ Functione8307: ; e8307
.asm_e8335
ld a, d
inc a
cp a, $1e
cp a, 30
jr c, .asm_e833c
xor a
.asm_e833c
or a, $80
ld [$c2a6], a
ld [Danger], a
; is hw ch1 on?
ld a, [SoundOutput]
and a, $11

32
constants/item_constants.asm
View File

@ -4,6 +4,7 @@ ULTRA_BALL EQU $02
BRIGHTPOWDER EQU $03
GREAT_BALL EQU $04
POKE_BALL EQU $05
TOWN_MAP EQU $06
BICYCLE EQU $07
MOON_STONE EQU $08
ANTIDOTE EQU $09
@ -22,6 +23,7 @@ MAX_ELIXER EQU $15
FIRE_STONE EQU $16
THUNDERSTONE EQU $17
WATER_STONE EQU $18
ITEM_19 EQU $19
HP_UP EQU $1A
PROTEIN EQU $1B
IRON EQU $1C
@ -41,15 +43,18 @@ GUARD_SPEC EQU $29
SUPER_REPEL EQU $2A
MAX_REPEL EQU $2B
DIRE_HIT EQU $2C
ITEM_2D EQU $2D
FRESH_WATER EQU $2E
SODA_POP EQU $2F
LEMONADE EQU $30
X_ATTACK EQU $31
ITEM_32 EQU $32
X_DEFEND EQU $33
X_SPEED EQU $34
X_SPECIAL EQU $35
COIN_CASE EQU $36
ITEMFINDER EQU $37
POKE_FLUTE EQU $38
EXP_SHARE EQU $39
OLD_ROD EQU $3A
GOOD_ROD EQU $3B
@ -83,6 +88,7 @@ TINYMUSHROOM EQU $56
BIG_MUSHROOM EQU $57
SILVERPOWDER EQU $58
BLU_APRICORN EQU $59
ITEM_5A EQU $5A
AMULET_COIN EQU $5B
YLW_APRICORN EQU $5C
GRN_APRICORN EQU $5D
@ -92,6 +98,7 @@ TWISTEDSPOON EQU $60
WHT_APRICORN EQU $61
BLACKBELT EQU $62
BLK_APRICORN EQU $63
ITEM_64 EQU $64
PNK_APRICORN EQU $65
BLACKGLASSES EQU $66
SLOWPOKETAIL EQU $67
@ -111,6 +118,7 @@ BLUE_CARD EQU $74
MIRACLE_SEED EQU $75
THICK_CLUB EQU $76
FOCUS_BAND EQU $77
ITEM_78 EQU $78
ENERGYPOWDER EQU $79
ENERGY_ROOT EQU $7A
HEAL_POWDER EQU $7B
@ -125,21 +133,34 @@ STARDUST EQU $83
STAR_PIECE EQU $84
BASEMENT_KEY EQU $85
PASS EQU $86
ITEM_87 EQU $87
ITEM_88 EQU $88
ITEM_89 EQU $89
CHARCOAL EQU $8A
BERRY_JUICE EQU $8B
SCOPE_LENS EQU $8C
ITEM_8D EQU $8D
ITEM_8E EQU $8E
METAL_COAT EQU $8F
DRAGON_FANG EQU $90
ITEM_91 EQU $91
LEFTOVERS EQU $92
ITEM_93 EQU $93
ITEM_94 EQU $94
ITEM_95 EQU $95
MYSTERYBERRY EQU $96
DRAGON_SCALE EQU $97
BERSERK_GENE EQU $98
ITEM_99 EQU $99
ITEM_9A EQU $9A
ITEM_9B EQU $9B
SACRED_ASH EQU $9C
HEAVY_BALL EQU $9D
FLOWER_MAIL EQU $9E
LEVEL_BALL EQU $9F
LURE_BALL EQU $A0
FAST_BALL EQU $A1
ITEM_A2 EQU $A2
LIGHT_BALL EQU $A3
FRIEND_BALL EQU $A4
MOON_BALL EQU $A5
@ -148,12 +169,15 @@ NORMAL_BOX EQU $A7
GORGEOUS_BOX EQU $A8
SUN_STONE EQU $A9
POLKADOT_BOW EQU $AA
ITEM_AB EQU $AB
UP_GRADE EQU $AC
BERRY EQU $AD
GOLD_BERRY EQU $AE
SQUIRTBOTTLE EQU $AF
ITEM_B0 EQU $B0
PARK_BALL EQU $B1
RAINBOW_WING EQU $B2
ITEM_B3 EQU $B3
BRICK_PIECE EQU $B4
SURF_MAIL EQU $B5
LITEBLUEMAIL EQU $B6
@ -164,10 +188,12 @@ MORPH_MAIL EQU $BA
BLUESKY_MAIL EQU $BB
MUSIC_MAIL EQU $BC
MIRAGE_MAIL EQU $BD
ITEM_BE EQU $BE
TM_01 EQU $BF
TM_02 EQU $C0
TM_03 EQU $C1
TM_04 EQU $C2
ITEM_C3 EQU $C3
TM_05 EQU $C4
TM_06 EQU $C5
TM_07 EQU $C6
@ -192,6 +218,7 @@ TM_25 EQU $D8
TM_26 EQU $D9
TM_27 EQU $DA
TM_28 EQU $DB
ITEM_DC EQU $DC
TM_29 EQU $DD
TM_30 EQU $DE
TM_31 EQU $DF
@ -221,6 +248,7 @@ HM_04 EQU $F6
HM_05 EQU $F7
HM_06 EQU $F8
HM_07 EQU $F9
HM_08 EQU $FA
NUM_TMS EQU HM_01 - TM_01 - 2
@ -231,8 +259,8 @@ BALL EQU 3
TM_HM EQU 4
; item actions
CANT_SELECT EQU %01000000
CANT_TOSS EQU %10000000
CANT_SELECT EQU 1 << 6
CANT_TOSS EQU 1 << 7
; held item effects
HELD_BERRY EQU $01

3
constants/script_constants.asm
View File

@ -29,7 +29,8 @@ SPECIAL_HOOHCHAMBER EQU $008d
SPECIAL_CELEBI EQU $008f
SPECIAL_AFTERCELEBI EQU $0090
SPECIAL_POKESEER EQU $0091
SPECIAL_BUENAS_PASSWORD EQU $0092
SPECIAL_BUENA_PRIZE EQU $0093
SPECIAL_DRATINI EQU $0094
SPECIAL_BEASTSCHECK EQU $0096

37
engine/landmarks.asm
View File

@ -255,3 +255,40 @@ UndergroundName: db "UNDERGROUND@"
BattleTowerName: db "BATTLE", $1f, "TOWER@"
SpecialMapName: db "SPECIAL@"
RegionCheck: ; 0x1caea1
; Checks if the player is in Kanto or Johto.
; If in Johto, returns 0 in e.
; If in Kanto, returns 1 in e.
ld a, [MapGroup]
ld b, a
ld a, [MapNumber]
ld c, a
call GetWorldMapLocation
cp FAST_SHIP ; S.S. Aqua
jr z, .johto
cp SPECIAL_MAP
jr nz, .checkagain
; In a special map, get the backup map group / map id
ld a, [BackupMapGroup]
ld b, a
ld a, [BackupMapNumber]
ld c, a
call GetWorldMapLocation
.checkagain
cp KANTO_LANDMARK
jr c, .johto
; Victory Road area is considered to be Johto.
cp VICTORY_ROAD
jr c, .kanto
.johto
ld e, 0
ret
.kanto
ld e, 1
ret

BIN
gfx/misc/chris.5x7.2bpp Normal file
View File

Binary file not shown.

BIN
gfx/misc/chris.7x7.2bpp Normal file
View File

Binary file not shown.

BIN
gfx/misc/kris.5x7.2bpp Normal file
View File

Binary file not shown.

BIN
gfx/misc/kris.7x7.2bpp Normal file
View File

Binary file not shown.

BIN
gfx/misc/kris_back.6x6.2bpp Normal file
View File

Binary file not shown.

BIN
gfx/misc/trainer_card.2bpp Normal file
View File

Binary file not shown.

3
home.asm
View File

@ -842,10 +842,9 @@ NamesPointers:: ; 33ab
dbw 0, PartyMonOT
dbw 0, OTPartyMonOT
dbw BANK(TrainerClassNames), TrainerClassNames
dbw $04, $4b52 ; ????
dbw $04, MoveDescriptions ; ????
; 33c3
GetName:: ; 33c3
; Return name CurSpecies from name list $cf61 in StringBuffer1.

68
items/item_attributes.asm
View File

@ -43,7 +43,7 @@ Item2Attributes:
db $06 ; ball
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -195,7 +195,7 @@ Item2Attributes:
db $50 ; party menu
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -355,7 +355,7 @@ Item2Attributes:
db $06 ; ball
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -395,7 +395,7 @@ Item2Attributes:
db $06 ; ball
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -443,7 +443,7 @@ Item2Attributes:
db $60 ; overworld
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -715,7 +715,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -795,7 +795,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -955,7 +955,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1075,7 +1075,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1083,7 +1083,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1091,7 +1091,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1123,7 +1123,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1131,7 +1131,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1155,7 +1155,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1171,7 +1171,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1179,7 +1179,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1187,7 +1187,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1219,7 +1219,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1227,7 +1227,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1235,7 +1235,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1291,7 +1291,7 @@ Item2Attributes:
db $06 ; ball
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1363,7 +1363,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1403,7 +1403,7 @@ Item2Attributes:
db $60 ; overworld
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1427,7 +1427,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1515,7 +1515,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1555,7 +1555,7 @@ Item2Attributes:
db $50 ; party menu
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1755,7 +1755,7 @@ Item2Attributes:
db $50 ; party menu
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -1995,7 +1995,7 @@ Item2Attributes:
db $50 ; party menu
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -2003,7 +2003,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -2011,7 +2011,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -2019,7 +2019,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -2027,7 +2027,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -2035,7 +2035,7 @@ Item2Attributes:
db $00 ; can't use
; TERU-SAMA
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
@ -2043,7 +2043,7 @@ Item2Attributes:
db $00 ; can't use
; ?
dw 39321 ; price
dw $9999 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss

8
items/item_effects.asm
View File

@ -19,7 +19,7 @@ ItemEffects: ; e73c
dw Brightpowder
dw GreatBall
dw PokeBall
dw Item06
dw TownMap
dw Bicycle
dw MoonStone
dw Antidote
@ -69,7 +69,7 @@ ItemEffects: ; e73c
dw XSpecial
dw CoinCase
dw Itemfinder
dw Item38
dw PokeFlute
dw ExpShare
dw OldRod
dw GoodRod
@ -1152,7 +1152,7 @@ Functionedfa: ; edfa (3:6dfa)
callba Function2715c
ret
Item06: ; ee01
TownMap: ; ee01
callba Function91ae1
ret
; ee08
@ -2374,7 +2374,7 @@ Tablef504: ; f504
; f50c
Item38: ; f50c
PokeFlute: ; f50c
ld a, [IsInBattle]
and a
jr nz, .asm_f512

8099
lib/mobile/main.asm
View File

File diff suppressed because it is too large Load Diff

2726
main.asm
View File

File diff suppressed because it is too large Load Diff

2
maps/AzaleaGym.asm
View File

@ -21,7 +21,7 @@ BugsyScript_0x18ec1e: ; 0x18ec1e
setevent EVENT_BEAT_BUGSY
loadfont
2writetext UnknownText_0x18ee14
playsound $009c
playsound SFX_GET_BADGE
waitbutton
setflag $001c
checkcode $7

6
maps/AzaleaTown.asm
View File

@ -53,7 +53,7 @@ UnknownScript_0x198034: ; 0x198034
applymovement $b, MovementData_0x19813c
spriteface $0, $1
UnknownScript_0x198049: ; 0x198049
playmusic $001f
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x19814d
closetext
@ -93,14 +93,14 @@ UnknownScript_0x198081: ; 0x198081
; 0x198091
UnknownScript_0x198091: ; 0x198091
playmusic $0020
playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x198233
closetext
loadmovesprites
spriteface $0, $2
applymovement $b, MovementData_0x198144
playsound $0023
playsound SFX_EXIT_BUILDING
disappear $b
dotrigger $0
waitbutton

3
maps/BattleTower1F.asm
View File

@ -308,6 +308,7 @@ MovementData_0x9e578: ; 0x9e578
MovementData_0x9e57a: ; 0x9e57a
step_right
step_right
MovementData_0x9e57c: ; 0x9e57c
step_right
step_right
step_up
@ -319,8 +320,10 @@ MovementData_0x9e57a: ; 0x9e57a
MovementData_0x9e582: ; 0x9e582
step_left
step_left
MovementData_0x9e584: ; 0x9e584
step_left
step_left
MovementData_0x9e586: ; 0x9e586
step_left
step_left
step_up

4
maps/BattleTowerBattleRoom.asm
View File

@ -48,7 +48,7 @@ UnknownScript_0x9f425: ; 0x9f425
2writetext UnknownText_0x9ee92
closetext
loadmovesprites
playmusic $000d
playmusic MUSIC_HEAL
special $002e
special $00a4
pause 60
@ -75,7 +75,7 @@ UnknownScript_0x9f483: ; 0x9f483
special $0086
writebyte $3
special $0086
playsound $0025
playsound SFX_SAVE
waitbutton
special $002e
special $007e

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