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 #30 from yenatch/master

Browse Source 
compiles again
This commit is contained in:
Bryan Bishop 2012-09-26 12:48:44 -07:00
commit 6f878dc609
3 changed files with 662 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
constants.asm
View File

@ -1,5 +1,22 @@
_CRYSTAL EQU 1 _CRYSTAL EQU 1
dwb: MACRO
dw \1
db \2
ENDM
callab: MACRO
ld hl, \1
ld a, BANK(\1)
rst $08
ENDM
callba: MACRO
ld a, BANK(\1)
ld hl, \1
rst $08
ENDM
TX_FAR: MACRO TX_FAR: MACRO
db $16 db $16
dw \1 dw \1
@ -258,6 +275,8 @@ LUGIA EQU 249
HO_OH EQU 250 HO_OH EQU 250
CELEBI EQU 251 CELEBI EQU 251
EGG EQU 253
; move name constants ; move name constants
POUND EQU $01 POUND EQU $01
KARATE_CHOP EQU $02 KARATE_CHOP EQU $02
@ -2983,3 +3002,7 @@ OPTION EQU 2
MYSTERY_GIFT EQU 3 MYSTERY_GIFT EQU 3
MOBILE EQU 4 MOBILE EQU 4
MOBILE_STUDIUM EQU 5 MOBILE_STUDIUM EQU 5
; name length
PLAYER_NAME_LENGTH EQU 8
PKMN_NAME_LENGTH EQU 11

644
main.asm
View File

File diff suppressed because it is too large Load Diff

48
wram.asm
View File

@ -107,10 +107,17 @@ EnemyMonLevel: ; d213
EnemyMonStatus: ; d214 EnemyMonStatus: ; d214
ds 2 ds 2
EnemyMonHP: ; d216 EnemyMonHP:
ds 2 EnemyMonHPHi: ; d216
EnemyMonMaxHP: ; d218 ds 1
ds 2 EnemyMonHPLo: ; d217
ds 1
EnemyMonMaxHP:
EnemyMonMaxHPHi: ; d218
ds 1
EnemyMonMaxHPLo: ; d219
ds 1
EnemyMonAtk: ; d21a EnemyMonAtk: ; d21a
ds 2 ds 2
@ -131,8 +138,8 @@ OtherTrainerClass: ; 0xd22f
ds 1 ds 1
BattleType: ; 0xd230 BattleType: ; 0xd230
; 00 trainer ; 00 normal
; 08 headbutt ; 08 headbutt/rock smash. probably bit 3
ds 1 ds 1
OtherTrainerID: ; 0xd231 OtherTrainerID: ; 0xd231
@ -687,12 +694,23 @@ PlayerName: ; 0xd47d
PlayerSprite: ; 0xd4d8 PlayerSprite: ; 0xd4d8
ds 1 ds 1
PlayerDirection: ; d4de
; uses bits 2 and 3 / $0c / %00001100
; %00 down
; %01 up
; %10 left
; $11 right
ds 1
SECTION "Status",BSS[$d84e] SECTION "Status",BSS[$d84e]
Money: ; d84e Money: ; d84e
ds 3 ds 3
Badges: ; d857 Badges:
ds 2 JohtoBadges: ; d857
ds 1
KantoBadges: ; d858
ds 1
SECTION "Items",BSS[$d859] SECTION "Items",BSS[$d859]
TMsHMs: ; d859 TMsHMs: ; d859
@ -713,6 +731,14 @@ NumBalls: ; d8d7
Balls: ; d8d8 Balls: ; d8d8
ds 25 ds 25
SECTION "overworld",BSS[$d95d]
PlayerState: ; d95d
; $00: normal
; $01: bicycle
; $04: surf
; $08: surf (pikachu)
ds 1
SECTION "scriptram",BSS[$d962] SECTION "scriptram",BSS[$d962]
MooMooBerries: ; 0xd962 MooMooBerries: ; 0xd962
ds 1 ; how many berries fed to MooMoo ds 1 ; how many berries fed to MooMoo
@ -763,11 +789,11 @@ Box10Name: ; 0xdc16
ds 9 ds 9
Box11Name: ; 0xdc1f Box11Name: ; 0xdc1f
ds 9 ds 9
Box12Name: ; 0xdb28 Box12Name: ; 0xdc28
ds 9 ds 9
Box13Name: ; 0xdb31 Box13Name: ; 0xdc31
ds 9 ds 9
Box14Name: ; 0xdb3a Box14Name: ; 0xdc3a
ds 9 ds 9
SECTION "BackupMapInfo", BSS[$dcad] SECTION "BackupMapInfo", BSS[$dcad]