Merge pull request #146 from yenatch/master

statdown comments + fix make pngs
This commit is contained in:
Bryan Bishop 2013-06-13 14:57:26 -07:00
commit d9779c5852
6 changed files with 179 additions and 118 deletions

10
.gitattributes vendored
View File

@ -1,2 +1,12 @@
# No monkey business with line endings
* -text
# hexdump binary files
*.png diff=hex
*.lz diff=hex
*.2bpp diff=hex
*.1bpp diff=hex
*.pal diff=hex
*.bin diff=hex
*.blk diff=hex

View File

@ -41,6 +41,9 @@ cd pokecrystal
# install python requirements
pip install -r requirements.txt
# use hexdump to diff binary files
git config diff.hex.textconv hexdump
```
To compile the ROM from ASM source:

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,14 @@
MAX_LEVEL EQU 100
NUM_MOVES EQU 4
ATTACK EQU 0
DEFENSE EQU 1
SPEED EQU 2
SP_ATTACK EQU 3
SP_DEFENSE EQU 4
ACCURACY EQU 5
EVASION EQU 6
; move struct
MOVE_LENGTH EQU 7
MOVE_ANIM EQU 0

View File

@ -1563,6 +1563,9 @@ if __name__ == "__main__":
if argv[1] == 'dump-pngs':
mass_to_colored_png()
elif argv[1] == 'mass-decompress':
mass_decompress()
elif argv[1] == 'front-to-2bpp':
decompress_frontpic(argv[2])

View File

@ -621,7 +621,14 @@ BattleScriptBuffer: ; c68a
BattleScriptBufferLoc: ; c6b2
ds 2
ds 24
ds 2
PlayerStats: ; c6b6
ds 10
ds 1
EnemyStats: ; c6c1
ds 10
ds 1
PlayerStatLevels: ; c6cc
; 07 neutral
@ -749,7 +756,14 @@ WeatherCount: ; c70b
; # turns remaining
ds 1
ds 6
LoweredStat: ; c70c
ds 1
EffectFailed: ; c70d
ds 1
FailedMessage: ; c70e
ds 1
ds 3
PlayerUsedMoves: ; c712
; add a move that has been used once by the player