Merge pull request #75 from yenatch/master

Battle initialization and battle commenting.
This commit is contained in:
Bryan Bishop 2013-01-10 23:30:13 -08:00
commit ccef29a715
3 changed files with 662 additions and 220 deletions

View File

@ -1599,6 +1599,12 @@ THURSDAY EQU $04
FRIDAY EQU $05
SATURDAY EQU $06
; times of day
MORN EQU 0
DAY EQU 1
NITE EQU 2
DARKNESS EQU 3
; trainer groups
FALKNER EQU $01
WHITNEY EQU $02
@ -3247,17 +3253,15 @@ SPECIAL_DRATINI EQU $0094
SPECIAL_BEASTSCHECK EQU $0096
SPECIAL_MONCHECK EQU $0097
; battle scripts
BATTLE_FILLPP EQU $05
BATTLE_FILLSTATS EQU $0C
BATTLE_FILLMOVES EQU $1B
BATTLE_GETUNOWNLETTER EQU $2D
; predefs
PREDEF_FILLPP EQU $05
PREDEF_FILLSTATS EQU $0C
PREDEF_FILLMOVES EQU $1B
PREDEF_GETUNOWNLETTER EQU $2D
; vars
; script vars
NUM_VARS EQU $1b
VAR_MOVEMENT EQU $08
@ -3283,6 +3287,9 @@ MOVE_ACC EQU 4
MOVE_PP EQU 5
MOVE_CHANCE EQU 6
; base stats
BASE_STATS_LENGTH EQU 32
; stat constants
NUM_STATS EQU 6
STAT_HP EQU 1

857
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -539,7 +539,7 @@ BattleScriptBufferLocLo: ; c6b2
BattleScriptBufferLocHi: ; c6b3
ds 1
ds 24
ds 25
PlayerStatLevels: ; c6cc
; 07 neutral