Merge pull request #20 from iimarckus/minortextlabels

Minortextlabels
This commit is contained in:
Bryan Bishop 2012-07-04 22:14:27 -07:00
commit 45af84e336
3 changed files with 838 additions and 487 deletions

View File

@ -1533,6 +1533,15 @@ HM_05 EQU $F7
HM_06 EQU $F8
HM_07 EQU $F9
; days of the week
SUNDAY EQU $00
MONDAY EQU $01
TUESDAY EQU $02
WEDNESDAY EQU $03
THURSDAY EQU $04
FRIDAY EQU $05
SATURDAY EQU $06
; trainer groups
FALKNER EQU $01
WHITNEY EQU $02

1297
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -586,6 +586,12 @@ OTPartyMon5Nickname: ; d416
OTPartyMon6Nickname: ; d421
ds 11
SECTION "Player",BSS[$d47b]
PlayerID: ; 0xd47b
ds 2
PlayerName: ; 0xd47d
ds 11
SECTION "Events",BSS[$dad4]
;RoomDecorations: ; dac6
@ -635,6 +641,19 @@ Box13Name: ; 0xdb31
Box14Name: ; 0xdb3a
ds 9
SECTION "PlayerMapInfo", BSS[$dcb4]
WarpNumber: ; 0xdcb4
ds 1
MapGroup: ; 0xdcb5
ds 1 ; map group of current map
MapNumber: ; 0xdcb6
ds 1 ; map number of current map
YCoord: ; 0xdcb7
ds 1 ; current y coordinate relative to top-left corner of current map
XCoord: ; 0xdcb8
ds 1 ; current x coordinate relative to top-left corner of current map
SECTION "PlayerParty",BSS[$dcd7]
PartyCount: ; 0xdcd7