hg-commit-id: a3be68843101
This commit is contained in:
Sanky 2012-01-19 23:20:44 +01:00
commit 5e4bcfc0b2
23 changed files with 1195 additions and 358 deletions

1340
common.asm

File diff suppressed because it is too large Load diff

View file

@ -88,6 +88,7 @@ TX_RAM: MACRO
ENDM
; wram locations
W_AICOUNT EQU $CCDF ; number of times remaining that AI action can occur
W_WHICHTRADE EQU $CD3D ; which entry from TradeMons to select
@ -157,6 +158,56 @@ W_PLAYERNAME EQU $D158 ; 11 characters, including null
W_NUMINPARTY EQU $D163
;number of items in bag
W_NUMBAGITEMS EQU $D31D
; BAGITEM01 is an item id
; BAGCOUNT01 is how many of this item
W_BAGITEM01 EQU $D31E
W_BAGCOUNT01 EQU $D31F
W_BAGITEM02 EQU $D320
W_BAGCOUNT02 EQU $D321
W_BAGITEM03 EQU $D322
W_BAGCOUNT03 EQU $D323
W_BAGITEM04 EQU $D324
W_BAGCOUNT04 EQU $D325
W_BAGITEM05 EQU $D326
W_BAGCOUNT05 EQU $D327
W_BAGITEM06 EQU $D328
W_BAGCOUNT06 EQU $D329
W_BAGITEM07 EQU $D32A
W_BAGCOUNT07 EQU $D32B
W_BAGITEM08 EQU $D32C
W_BAGCOUNT08 EQU $D32D
W_BAGITEM09 EQU $D32E
W_BAGCOUNT09 EQU $D32F
W_BAGITEM10 EQU $D330
W_BAGCOUNT10 EQU $D331
W_BAGITEM11 EQU $D332
W_BAGCOUNT11 EQU $D333
W_BAGITEM12 EQU $D334
W_BAGCOUNT12 EQU $D335
W_BAGITEM13 EQU $D336
W_BAGCOUNT13 EQU $D337
W_BAGITEM14 EQU $D338
W_BAGCOUNT14 EQU $D339
W_BAGITEM15 EQU $D33A
W_BAGCOUNT15 EQU $D33B
W_BAGITEM16 EQU $D33C
W_BAGCOUNT16 EQU $D33D
W_BAGITEM17 EQU $D33E
W_BAGCOUNT17 EQU $D33F
W_BAGITEM18 EQU $D340
W_BAGCOUNT18 EQU $D341
W_BAGITEM19 EQU $D342
W_BAGCOUNT19 EQU $D343
W_BAGITEM20 EQU $D344
W_BAGCOUNT20 EQU $D345
; money is in decimal
W_PLAYERMONEY3 EQU $D347
W_PLAYERMONEY2 EQU $D348
W_PLAYERMONEY1 EQU $D349
W_PARTYMON1 EQU $D164
W_PARTYMON2 EQU $D165
W_PARTYMON3 EQU $D166
@ -365,11 +416,11 @@ W_PARTYMON4NAME EQU $D2D6
W_PARTYMON5NAME EQU $D2E1
W_PARTYMON6NAME EQU $D2EC
W_NUMBAGITEMS EQU $D31D
W_BAGITEM01 EQU $D31E
W_RIVALNAME EQU $D34A ; 11 characters, including null
W_PLAYERIDHI EQU $D359
W_PLAYERIDLO EQU $D35A
W_CURMAP EQU $D35E
W_YCOORD EQU $D361 ; players position on the current map
@ -411,10 +462,128 @@ 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_NUMSAFARIBALLS EQU $DA47
W_NUMINBOX EQU $DA80
;number of items in box
W_NUMBOXITEMS EQU $D53A
; BOXITEM01 is an item id
; BOXCOUNT01 is how many of this item
W_BOXITEM01 EQU $D53B
W_BOXCOUNT01 EQU $D53C
W_BOXITEM02 EQU $D53D
W_BOXCOUNT02 EQU $D53E
W_BOXITEM03 EQU $D53F
W_BOXCOUNT03 EQU $D540
W_BOXITEM04 EQU $D541
W_BOXCOUNT04 EQU $D542
W_BOXITEM05 EQU $D543
W_BOXCOUNT05 EQU $D544
W_BOXITEM06 EQU $D545
W_BOXCOUNT06 EQU $D546
W_BOXITEM07 EQU $D547
W_BOXCOUNT07 EQU $D548
W_BOXITEM08 EQU $D549
W_BOXCOUNT08 EQU $D54A
W_BOXITEM09 EQU $D54B
W_BOXCOUNT09 EQU $D54C
W_BOXITEM10 EQU $D54D
W_BOXCOUNT10 EQU $D54E
W_BOXITEM11 EQU $D54F
W_BOXCOUNT11 EQU $D550
W_BOXITEM12 EQU $D551
W_BOXCOUNT12 EQU $D552
W_BOXITEM13 EQU $D553
W_BOXCOUNT13 EQU $D554
W_BOXITEM14 EQU $D555
W_BOXCOUNT14 EQU $D556
W_BOXITEM15 EQU $D557
W_BOXCOUNT15 EQU $D558
W_BOXITEM16 EQU $D559
W_BOXCOUNT16 EQU $D55A
W_BOXITEM17 EQU $D55B
W_BOXCOUNT17 EQU $D55C
W_BOXITEM18 EQU $D55D
W_BOXCOUNT18 EQU $D55E
W_BOXITEM19 EQU $D55F
W_BOXCOUNT19 EQU $D560
W_BOXITEM20 EQU $D561
W_BOXCOUNT20 EQU $D562
W_BOXITEM21 EQU $D563
W_BOXCOUNT21 EQU $D564
W_BOXITEM22 EQU $D565
W_BOXCOUNT22 EQU $D566
W_BOXITEM23 EQU $D567
W_BOXCOUNT23 EQU $D568
W_BOXITEM24 EQU $D569
W_BOXCOUNT24 EQU $D56A
W_BOXITEM25 EQU $D56B
W_BOXCOUNT25 EQU $D56C
W_BOXITEM26 EQU $D56D
W_BOXCOUNT26 EQU $D56E
W_BOXITEM27 EQU $D56F
W_BOXCOUNT27 EQU $D570
W_BOXITEM28 EQU $D571
W_BOXCOUNT28 EQU $D572
W_BOXITEM29 EQU $D573
W_BOXCOUNT29 EQU $D574
W_BOXITEM30 EQU $D575
W_BOXCOUNT30 EQU $D576
W_BOXITEM31 EQU $D577
W_BOXCOUNT31 EQU $D578
W_BOXITEM32 EQU $D579
W_BOXCOUNT32 EQU $D57A
W_BOXITEM33 EQU $D57B
W_BOXCOUNT33 EQU $D57C
W_BOXITEM34 EQU $D57D
W_BOXCOUNT34 EQU $D57E
W_BOXITEM35 EQU $D57F
W_BOXCOUNT35 EQU $D580
W_BOXITEM36 EQU $D581
W_BOXCOUNT36 EQU $D582
W_BOXITEM37 EQU $D583
W_BOXCOUNT37 EQU $D584
W_BOXITEM38 EQU $D585
W_BOXCOUNT38 EQU $D586
W_BOXITEM39 EQU $D587
W_BOXCOUNT39 EQU $D588
W_BOXITEM40 EQU $D589
W_BOXCOUNT40 EQU $D58A
W_BOXITEM41 EQU $D58B
W_BOXCOUNT41 EQU $D58C
W_BOXITEM42 EQU $D58D
W_BOXCOUNT42 EQU $D58E
W_BOXITEM43 EQU $D58F
W_BOXCOUNT43 EQU $D590
W_BOXITEM44 EQU $D591
W_BOXCOUNT44 EQU $D592
W_BOXITEM45 EQU $D593
W_BOXCOUNT45 EQU $D594
W_BOXITEM46 EQU $D595
W_BOXCOUNT46 EQU $D596
W_BOXITEM47 EQU $D597
W_BOXCOUNT47 EQU $D598
W_BOXITEM48 EQU $D599
W_BOXCOUNT48 EQU $D59A
W_BOXITEM49 EQU $D59B
W_BOXCOUNT49 EQU $D59C
W_BOXITEM50 EQU $D59D
W_BOXCOUNT50 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
H_RAND1 EQU $FFD3
H_RAND2 EQU $FFD4

View file

@ -488,6 +488,16 @@ def text_pretty_printer_at(start_address, label="SomeLabel"):
output += "\n" + spacing + "db $11"
byte_count += 1
had_db_last = True
elif command["type"] == 0x6: #wait for keypress
if first_line:
output = "\n" + label + ": ; " + hex(start_address)
first_line = False
if had_db_last:
output += ", $6"
else:
output += "\n" + spacing + "db $6"
byte_count += 1
had_db_last = True
else:
print "ERROR in command: " + hex(command["type"])
had_db_last = False

9
extras/print_pc_items.py Normal file
View file

@ -0,0 +1,9 @@
#!/usr/bin/python
#author: Bryan Bishop <kanzure@gmail.com>
#date: 2012-01-19
#spit out some constants
for x in range(1, 51):
print "BOXITEM%.2d EQU $%s" % (x, ("%.2x" % (0xd539+(x*2))).upper())
print "BOXCOUNT%.2d EQU $%s" % (x, ("%.2x" % (0xd539+(x*2)+1)).upper())

BIN
gfx/tilesets/00.tilecoll Normal file

Binary file not shown.

1
gfx/tilesets/01.tilecoll Normal file
View file

@ -0,0 +1 @@
<1A>

1
gfx/tilesets/02.tilecoll Normal file
View file

@ -0,0 +1 @@
<^<5E>

1
gfx/tilesets/03.tilecoll Normal file
View file

@ -0,0 +1 @@
 .0479:@QRZ\^_<>

1
gfx/tilesets/05.tilecoll Normal file
View file

@ -0,0 +1 @@
+<=?JLM<03>

1
gfx/tilesets/08.tilecoll Normal file
View file

@ -0,0 +1 @@
(27DT\<5C>

1
gfx/tilesets/09.tilecoll Normal file
View file

@ -0,0 +1 @@
78;<^<5E>

1
gfx/tilesets/0b.tilecoll Normal file
View file

@ -0,0 +1 @@
<18>

1
gfx/tilesets/0d.tilecoll Normal file
View file

@ -0,0 +1 @@
 #479J<39>

2
gfx/tilesets/0e.tilecoll Normal file
View file

@ -0,0 +1,2 @@
2;<3B>

1
gfx/tilesets/0f.tilecoll Normal file
View file

@ -0,0 +1 @@
"BR<42>

1
gfx/tilesets/10.tilecoll Normal file
View file

@ -0,0 +1 @@
;EGUV˙

1
gfx/tilesets/11.tilecoll Normal file
View file

@ -0,0 +1 @@
 !"*-0<><30>

1
gfx/tilesets/12.tilecoll Normal file
View file

@ -0,0 +1 @@
 8E<38>

1
gfx/tilesets/13.tilecoll Normal file
View file

@ -0,0 +1 @@
,S<>

1
gfx/tilesets/14.tilecoll Normal file
View file

@ -0,0 +1 @@
&47<34>

1
gfx/tilesets/15.tilecoll Normal file
View file

@ -0,0 +1 @@
&(),-./A˙

1
gfx/tilesets/16.tilecoll Normal file
View file

@ -0,0 +1 @@
 !"012BCHRUX^<5E>

1
gfx/tilesets/17.tilecoll Normal file
View file

@ -0,0 +1 @@
#,-;E<>