Merge iimarckus/pokered changes.

hg-commit-id: 74b9dcfd9e1b
This commit is contained in:
Bryan Bishop 2012-01-20 22:57:43 -06:00
commit cab7304a92

View file

@ -425,16 +425,40 @@ W_CURMAP EQU $D35E
W_YCOORD EQU $D361 ; players position on the current map
W_XCOORD EQU $D362
W_YBLOCKCOORD EQU $D363 ; player's y position (by block)
W_XBLOCKCOORD EQU $D364
W_CURMAPTILESET EQU $D367
W_CURMAPHEIGHT EQU $D368 ; blocks
W_CURMAPWIDTH EQU $D369 ; blocks
W_MAPDATAPTR EQU $D36A
W_MAPTEXTPTR EQU $D36C
W_MAPSCRIPTPTR EQU $D36E
W_MAPCONNECTIONS EQU $D370 ; connection byte
W_MAPCONN1PTR EQU $D371
W_MAPCONN2PTR EQU $D37C
W_MAPCONN3PTR EQU $D387
W_MAPCONN4PTR EQU $D392
W_PEOPLEMOVEPERMISSIONS EQU $D4E4
; coins are in decimal
W_PLAYERCOINS EQU $D5A4 ; two bytes
W_PLAYERCOINS1 EQU $D5A4
W_PLAYERCOINS2 EQU $D5A5
W_HASTOWNMAP EQU $D5F3
W_HASOAKSPARCEL EQU $D60D
W_LAPRAS EQU $D72E
W_ARTICUNO EQU $D782
W_ZAPDOS EQU $D7D4
W_VERMILIONSNORLAX EQU $D7D8
W_CELADONSNORLAX EQU $D7E0
W_MOLTRES EQU $D7EE
W_SSANNE EQU $D803
W_MEWTWO EQU $D85F
W_OAKSLABCURSCRIPT EQU $D5F0
W_RIVALSTARTER EQU $D715
@ -462,13 +486,14 @@ W_ENEMYMON5MOVE3 EQU $D95E
W_ENEMYMON6MOVE3 EQU $D98A
W_PLAYTIMEHOURSHI EQU $DA40
W_PLAYTIMEHOURSLO EQU $DA41
W_PLAYTIMEMINUTESHI EQU $DA42
W_PLAYTIMEMINUETSLO EQU $DA43
W_PLAYTIMEHOURS EQU $DA40 ; two bytes
W_PLAYTIMEMINUTES EQU $DA42 ; two bytes
W_PLAYTIMESECONDS EQU $DA44 ; one byte
W_PLAYTIMEFRAMES EQU $DA45 ; one byte
W_NUMSAFARIBALLS EQU $DA47
; number of mons in current box
W_NUMINBOX EQU $DA80
;number of items in box
@ -577,12 +602,8 @@ W_BOXITEM50 EQU $D59D
W_BOXITEM50QTY EQU $D59E
;box end of list $D59F
; coins are in decimal
W_PLAYERCOINSHI EQU $D5A4
W_PLAYERCOINSLO EQU $D5A5
W_SAFARITIMERHI EQU $D70D ; use 01 for maximum
W_SAFARITIMERLO EQU $D70E ; use F4 for maximum
W_SAFARITIMER1 EQU $D70D ; use 01 for maximum
W_SAFARITIMER2 EQU $D70E ; use F4 for maximum
H_RAND1 EQU $FFD3
H_RAND2 EQU $FFD4
@ -2554,4 +2575,4 @@ BRUNOS_ROOM_WIDTH EQU $05
; Agatha_h map_id=247
AGATHAS_ROOM_HEIGHT EQU $06
AGATHAS_ROOM_WIDTH EQU $05
AGATHAS_ROOM_WIDTH EQU $05