kanzure Merge

hg-commit-id: 21fa90b84836
This commit is contained in:
KuroiIeWa5Da 2012-01-19 15:43:01 -06:00
commit da7fd359eb
5 changed files with 696 additions and 269 deletions

View file

@ -1,5 +1,4 @@
#gawk sort order
#LC_CTYPE=C
export LC_CTYPE=C
.SUFFIXES: .asm .tx .o .gbc

View file

@ -1935,10 +1935,11 @@ SECTION "bank1",DATA,BANK[$1]
INCBIN "baserom.gbc",$4000,$112
MewPicFront:
MewPicFront: ; 0x4112
INCBIN "pic/bmon/mew.pic"
MewPicBack:
INCBIN "pic/monback/mewb.pic"
; 0x425b
INCBIN "baserom.gbc",$425b,$42a7 - $425b
@ -1954,6 +1955,7 @@ UnnamedText_42ac: ; 0x42ac
INCBIN "baserom.gbc",$42b1,$84
; 0x4335
IF _RED
ld de,$9600 ; where to put redgreenversion.2bpp in the VRAM
ld bc,$50 ; how big that file is
@ -2563,7 +2565,7 @@ Function62CE: ; 62CE, XXX called by 4B2 948 989 5BF9 5D15
INCBIN "baserom.gbc",$62FF,$6420-$62FF
FirstMapSpec:
db $26 ; RedHouse1F
db REDS_HOUSE_2F ; RedsHouse2F
; Original Format:
; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block]
; Macro Format:
@ -2646,9 +2648,10 @@ UnnamedText_699f: ; 0x699f
db $50
; 0x699f + 5 bytes
INCBIN "baserom.gbc",$69a4,$3
ld de,DefaultNamesRival
; 0x69a4
call Unnamed_6a12 ; 0x69a4 call 0x6a12
ld de, DefaultNamesRival
; 0x69aa
INCBIN "baserom.gbc",$69AA,$69B3 - $69AA
@ -2661,7 +2664,9 @@ UnnamedText_69e7: ; 0x69e7
db $50
; 0x69e7 + 5 bytes
INCBIN "baserom.gbc",$69ec,$bc
INCBIN "baserom.gbc",$69ec,$6a12 - $69ec
Unnamed_6a12: ; 0x6a12
INCBIN "baserom.gbc",$6a12,$6aa8 - $6a12
IF _RED
DefaultNamesPlayer:
@ -2789,7 +2794,8 @@ UnnamedText_705d: ; 0x705d
db $50
; 0x705d + 5 bytes
INCBIN "baserom.gbc",$7062,$7063 - $7062
; 0x7062
db $a
UnnamedText_7063: ; 0x7063
TX_FAR _UnnamedText_7063
@ -2806,7 +2812,7 @@ UnnamedText_706d: ; 0x706d
db $50
; 0x706d + 5 bytes
INCBIN "baserom.gbc",$7072,$7073 - $7072
db $a
UnnamedText_7073: ; 0x7073
TX_FAR _UnnamedText_7073
@ -2830,7 +2836,9 @@ UnnamedText_72bd: ; 0x72bd
db $50
; 0x72bd + 5 bytes
INCBIN "baserom.gbc",$72c2,$72c8 - $72c2
UnnamedText_72c2: ; 0x72c2
TX_FAR UnnamedText_a29cc
db $a, $50
UnnamedText_72c8: ; 0x72c8
TX_FAR _UnnamedText_72c8
@ -3739,307 +3747,307 @@ Show equ $15
MapHSXX:
db $FF,$FF,$FF
MapHS00:
db $00,$01,Hide
db PALLET_TOWN,$01,Hide
MapHS01:
db $01,$05,Show
db $01,$07,Hide
db VIRIDIAN_CITY,$05,Show
db VIRIDIAN_CITY,$07,Hide
MapHS02:
db $02,$03,Show
db $02,$05,Show
db PEWTER_CITY,$03,Show
db PEWTER_CITY,$05,Show
MapHS03:
db $03,$01,Hide
db $03,$02,Show
db $03,$06,Hide
db $03,$0A,Show
db $03,$0B,Show
db CERULEAN_CITY,$01,Hide
db CERULEAN_CITY,$02,Show
db CERULEAN_CITY,$06,Hide
db CERULEAN_CITY,$0A,Show
db CERULEAN_CITY,$0B,Show
MapHS0A:
db $0A,$01,Show
db $0A,$02,Show
db $0A,$03,Show
db $0A,$04,Show
db $0A,$05,Show
db $0A,$06,Show
db $0A,$07,Show
db $0A,$08,Hide
db $0A,$09,Hide
db $0A,$0A,Hide
db $0A,$0B,Hide
db $0A,$0C,Hide
db $0A,$0D,Hide
db $0A,$0E,Show
db $0A,$0F,Hide
db SAFFRON_CITY,$01,Show
db SAFFRON_CITY,$02,Show
db SAFFRON_CITY,$03,Show
db SAFFRON_CITY,$04,Show
db SAFFRON_CITY,$05,Show
db SAFFRON_CITY,$06,Show
db SAFFRON_CITY,$07,Show
db SAFFRON_CITY,$08,Hide
db SAFFRON_CITY,$09,Hide
db SAFFRON_CITY,$0A,Hide
db SAFFRON_CITY,$0B,Hide
db SAFFRON_CITY,$0C,Hide
db SAFFRON_CITY,$0D,Hide
db SAFFRON_CITY,$0E,Show
db SAFFRON_CITY,$0F,Hide
MapHS0D:
db $0D,$01,Show
db $0D,$02,Show
db ROUTE_2,$01,Show
db ROUTE_2,$02,Show
MapHS0F:
db $0F,$03,Show
db ROUTE_4,$03,Show
MapHS14:
db $14,$0A,Show
db ROUTE_9,$0A,Show
MapHS17:
db $17,$01,Show
db $17,$09,Show
db $17,$0A,Show
db ROUTE_12,$01,Show
db ROUTE_12,$09,Show
db ROUTE_12,$0A,Show
MapHS1A:
db $1A,$0B,Show
db ROUTE_15,$0B,Show
MapHS1B:
db $1B,$07,Show
db ROUTE_16,$07,Show
MapHS21:
db $21,$01,Hide
db $21,$02,Hide
db ROUTE_22,$01,Hide
db ROUTE_22,$02,Hide
MapHS23:
db $23,$01,Show
db $23,$08,Show
db ROUTE_24,$01,Show
db ROUTE_24,$08,Show
MapHS24:
db $24,$0A,Show
db ROUTE_25,$0A,Show
MapHS27:
db $27,$01,Show
db $27,$02,Hide
db $27,$03,Show
db BLUES_HOUSE,$01,Show
db BLUES_HOUSE,$02,Hide
db BLUES_HOUSE,$03,Show
MapHS28:
db $28,$01,Show
db $28,$02,Show
db $28,$03,Show
db $28,$04,Show
db $28,$05,Hide
db $28,$06,Show
db $28,$07,Show
db $28,$08,Hide
db OAKS_LAB,$01,Show
db OAKS_LAB,$02,Show
db OAKS_LAB,$03,Show
db OAKS_LAB,$04,Show
db OAKS_LAB,$05,Hide
db OAKS_LAB,$06,Show
db OAKS_LAB,$07,Show
db OAKS_LAB,$08,Hide
MapHS2D:
db $2D,$01,Show
db $2D,$0B,Show
db VIRIDIAN_GYM,$01,Show
db VIRIDIAN_GYM,$0B,Show
MapHS34:
db $34,$05,Show
db MUSEUM_1F,$05,Show
MapHSE4:
db $E4,$01,Show
db $E4,$02,Show
db $E4,$03,Show
db UNKNOWN_DUNGEON_1,$01,Show
db UNKNOWN_DUNGEON_1,$02,Show
db UNKNOWN_DUNGEON_1,$03,Show
MapHS8F:
db $8F,$01,Show
db POKEMONTOWER_2,$01,Show
MapHS90:
db $90,$04,Show
db POKEMONTOWER_3,$04,Show
MapHS91:
db $91,$04,Show
db $91,$05,Show
db $91,$06,Show
db POKEMONTOWER_4,$04,Show
db POKEMONTOWER_4,$05,Show
db POKEMONTOWER_4,$06,Show
MapHS92:
db $92,$06,Show
db POKEMONTOWER_5,$06,Show
MapHS93:
db $93,$04,Show
db $93,$05,Show
db POKEMONTOWER_6,$04,Show
db POKEMONTOWER_6,$05,Show
MapHS94:
db $94,$01,Show
db $94,$02,Show
db $94,$03,Show
db $94,$04,Show
db POKEMONTOWER_7,$01,Show
db POKEMONTOWER_7,$02,Show
db POKEMONTOWER_7,$03,Show
db POKEMONTOWER_7,$04,Show
MapHS95:
db $95,$05,Hide
db LAVENDER_HOUSE_1,$05,Hide
MapHS84:
db $84,$02,Show
db CELADON_MANSION_5,$02,Show
MapHS87:
db $87,$0B,Show
db GAME_CORNER,$0B,Show
MapHS9B:
db $9B,$02,Show
db FUCHSIA_HOUSE_2,$02,Show
MapHSA5:
db $A5,$02,Show
db $A5,$03,Show
db MANSION_1,$02,Show
db MANSION_1,$03,Show
MapHSB1:
db $B1,$06,Show
db $B1,$07,Show
db FIGHTINGDOJO,$06,Show
db FIGHTINGDOJO,$07,Show
MapHSB5:
db $B5,$01,Hide
db SILPH_CO_1F,$01,Hide
MapHS53:
db $53,$01,Show
db $53,$02,Show
db $53,$03,Show
db $53,$04,Show
db $53,$05,Show
db $53,$06,Show
db $53,$07,Show
db $53,$08,Show
db $53,$09,Show
db $53,$0A,Show
db $53,$0B,Show
db $53,$0C,Show
db $53,$0D,Show
db $53,$0E,Show
db POWER_PLANT,$01,Show
db POWER_PLANT,$02,Show
db POWER_PLANT,$03,Show
db POWER_PLANT,$04,Show
db POWER_PLANT,$05,Show
db POWER_PLANT,$06,Show
db POWER_PLANT,$07,Show
db POWER_PLANT,$08,Show
db POWER_PLANT,$09,Show
db POWER_PLANT,$0A,Show
db POWER_PLANT,$0B,Show
db POWER_PLANT,$0C,Show
db POWER_PLANT,$0D,Show
db POWER_PLANT,$0E,Show
MapHSC2:
db $C2,$06,Show
db $C2,$07,Show
db $C2,$08,Show
db $C2,$09,Show
db $C2,$0A,Show
db $C2,$0D,Show
db VICTORY_ROAD_2,$06,Show
db VICTORY_ROAD_2,$07,Show
db VICTORY_ROAD_2,$08,Show
db VICTORY_ROAD_2,$09,Show
db VICTORY_ROAD_2,$0A,Show
db VICTORY_ROAD_2,$0D,Show
MapHS58:
db $58,$01,Show
db $58,$02,Hide
db $58,$03,Hide
db BILLS_HOUSE,$01,Show
db BILLS_HOUSE,$02,Hide
db BILLS_HOUSE,$03,Hide
MapHS33:
db $33,$05,Show
db $33,$06,Show
db $33,$07,Show
db VIRIDIAN_FOREST,$05,Show
db VIRIDIAN_FOREST,$06,Show
db VIRIDIAN_FOREST,$07,Show
MapHS3B:
db $3B,$08,Show
db $3B,$09,Show
db $3B,$0A,Show
db $3B,$0B,Show
db $3B,$0C,Show
db $3B,$0D,Show
db MT_MOON_1,$08,Show
db MT_MOON_1,$09,Show
db MT_MOON_1,$0A,Show
db MT_MOON_1,$0B,Show
db MT_MOON_1,$0C,Show
db MT_MOON_1,$0D,Show
MapHS3D:
db $3D,$06,Show
db $3D,$07,Show
db $3D,$08,Show
db $3D,$09,Show
db MT_MOON_3,$06,Show
db MT_MOON_3,$07,Show
db MT_MOON_3,$08,Show
db MT_MOON_3,$09,Show
MapHS60:
db $60,$02,Hide
db SS_ANNE_2,$02,Hide
MapHS66:
db $66,$0A,Show
db SS_ANNE_8,$0A,Show
MapHS67:
db $67,$06,Show
db $67,$09,Show
db SS_ANNE_9,$06,Show
db SS_ANNE_9,$09,Show
MapHS68:
db $68,$09,Show
db $68,$0A,Show
db $68,$0B,Show
db SS_ANNE_10,$09,Show
db SS_ANNE_10,$0A,Show
db SS_ANNE_10,$0B,Show
MapHSC6:
db $C6,$05,Show
db $C6,$06,Show
db $C6,$0A,Show
db VICTORY_ROAD_3,$05,Show
db VICTORY_ROAD_3,$06,Show
db VICTORY_ROAD_3,$0A,Show
MapHSC7:
db $C7,$06,Show
db $C7,$07,Show
db ROCKET_HIDEOUT_1,$06,Show
db ROCKET_HIDEOUT_1,$07,Show
MapHSC8:
db $C8,$02,Show
db $C8,$03,Show
db $C8,$04,Show
db $C8,$05,Show
db ROCKET_HIDEOUT_2,$02,Show
db ROCKET_HIDEOUT_2,$03,Show
db ROCKET_HIDEOUT_2,$04,Show
db ROCKET_HIDEOUT_2,$05,Show
MapHSC9:
db $C9,$03,Show
db $C9,$04,Show
db ROCKET_HIDEOUT_3,$03,Show
db ROCKET_HIDEOUT_3,$04,Show
MapHSCA:
db $CA,$01,Show
db $CA,$05,Show
db $CA,$06,Show
db $CA,$07,Show
db $CA,$08,Hide
db $CA,$09,Hide
db ROCKET_HIDEOUT_4,$01,Show
db ROCKET_HIDEOUT_4,$05,Show
db ROCKET_HIDEOUT_4,$06,Show
db ROCKET_HIDEOUT_4,$07,Show
db ROCKET_HIDEOUT_4,$08,Hide
db ROCKET_HIDEOUT_4,$09,Hide
MapHSCF:
db $CF,$01,Show
db $CF,$02,Show
db $CF,$03,Show
db $CF,$04,Show
db $CF,$05,Show
db SILPH_CO_2F,$01,Show
db SILPH_CO_2F,$02,Show
db SILPH_CO_2F,$03,Show
db SILPH_CO_2F,$04,Show
db SILPH_CO_2F,$05,Show
MapHSD0:
db $D0,$02,Show
db $D0,$03,Show
db $D0,$04,Show
db SILPH_CO_3F,$02,Show
db SILPH_CO_3F,$03,Show
db SILPH_CO_3F,$04,Show
MapHSD1:
db $D1,$02,Show
db $D1,$03,Show
db $D1,$04,Show
db $D1,$05,Show
db $D1,$06,Show
db $D1,$07,Show
db SILPH_CO_4F,$02,Show
db SILPH_CO_4F,$03,Show
db SILPH_CO_4F,$04,Show
db SILPH_CO_4F,$05,Show
db SILPH_CO_4F,$06,Show
db SILPH_CO_4F,$07,Show
MapHSD2:
db $D2,$02,Show
db $D2,$03,Show
db $D2,$04,Show
db $D2,$05,Show
db $D2,$06,Show
db $D2,$07,Show
db $D2,$08,Show
db SILPH_CO_5F,$02,Show
db SILPH_CO_5F,$03,Show
db SILPH_CO_5F,$04,Show
db SILPH_CO_5F,$05,Show
db SILPH_CO_5F,$06,Show
db SILPH_CO_5F,$07,Show
db SILPH_CO_5F,$08,Show
MapHSD3:
db $D3,$06,Show
db $D3,$07,Show
db $D3,$08,Show
db $D3,$09,Show
db $D3,$0A,Show
db SILPH_CO_6F,$06,Show
db SILPH_CO_6F,$07,Show
db SILPH_CO_6F,$08,Show
db SILPH_CO_6F,$09,Show
db SILPH_CO_6F,$0A,Show
MapHSD4:
db $D4,$05,Show
db $D4,$06,Show
db $D4,$07,Show
db $D4,$08,Show
db $D4,$09,Show
db $D4,$0A,Show
db $D4,$0B,Show
db $D4,$0C,Show
db SILPH_CO_7F,$05,Show
db SILPH_CO_7F,$06,Show
db SILPH_CO_7F,$07,Show
db SILPH_CO_7F,$08,Show
db SILPH_CO_7F,$09,Show
db SILPH_CO_7F,$0A,Show
db SILPH_CO_7F,$0B,Show
db SILPH_CO_7F,$0C,Show
MapHSD5:
db $D5,$02,Show
db $D5,$03,Show
db $D5,$04,Show
db SILPH_CO_8F,$02,Show
db SILPH_CO_8F,$03,Show
db SILPH_CO_8F,$04,Show
MapHSE9:
db $E9,$02,Show
db $E9,$03,Show
db $E9,$04,Show
db SILPH_CO_9F,$02,Show
db SILPH_CO_9F,$03,Show
db SILPH_CO_9F,$04,Show
MapHSEA:
db $EA,$01,Show
db $EA,$02,Show
db $EA,$03,Show
db $EA,$04,Show
db $EA,$05,Show
db $EA,$06,Show
db SILPH_CO_10F,$01,Show
db SILPH_CO_10F,$02,Show
db SILPH_CO_10F,$03,Show
db SILPH_CO_10F,$04,Show
db SILPH_CO_10F,$05,Show
db SILPH_CO_10F,$06,Show
MapHSEB:
db $EB,$03,Show
db $EB,$04,Show
db $EB,$05,Show
db SILPH_CO_11F,$03,Show
db SILPH_CO_11F,$04,Show
db SILPH_CO_11F,$05,Show
MapHSF4:
db $F4,$02,Show
MapHSD6:
db $D6,$02,Show
db MANSION_2,$02,Show
MapHSD7:
db $D7,$03,Show
db $D7,$04,Show
db MANSION_3,$03,Show
db MANSION_3,$04,Show
MapHSD8:
db $D8,$03,Show
db $D8,$04,Show
db $D8,$05,Show
db $D8,$06,Show
db $D8,$08,Show
db MANSION_4,$03,Show
db MANSION_4,$04,Show
db MANSION_4,$05,Show
db MANSION_4,$06,Show
db MANSION_4,$08,Show
MapHSD9:
db $D9,$01,Show
db $D9,$02,Show
db $D9,$03,Show
db $D9,$04,Show
db SAFARI_ZONE_EAST,$01,Show
db SAFARI_ZONE_EAST,$02,Show
db SAFARI_ZONE_EAST,$03,Show
db SAFARI_ZONE_EAST,$04,Show
MapHSDA:
db $DA,$01,Show
db $DA,$02,Show
db SAFARI_ZONE_NORTH,$01,Show
db SAFARI_ZONE_NORTH,$02,Show
MapHSDB:
db $DB,$01,Show
db $DB,$02,Show
db $DB,$03,Show
db $DB,$04,Show
db SAFARI_ZONE_WEST,$01,Show
db SAFARI_ZONE_WEST,$02,Show
db SAFARI_ZONE_WEST,$03,Show
db SAFARI_ZONE_WEST,$04,Show
MapHSDC:
db $DC,$01,Show
db SAFARI_ZONE_CENTER,$01,Show
MapHSE2:
db $E2,$01,Show
db $E2,$02,Show
db $E2,$03,Show
db UNKNOWN_DUNGEON_2,$01,Show
db UNKNOWN_DUNGEON_2,$02,Show
db UNKNOWN_DUNGEON_2,$03,Show
MapHSE3:
db $E3,$01,Show
db $E3,$02,Show
db $E3,$03,Show
db UNKNOWN_DUNGEON_3,$01,Show
db UNKNOWN_DUNGEON_3,$02,Show
db UNKNOWN_DUNGEON_3,$03,Show
MapHS6C:
db $6C,$03,Show
db $6C,$04,Show
db VICTORY_ROAD_1,$03,Show
db VICTORY_ROAD_1,$04,Show
MapHS78:
db $78,$02,Hide
db CHAMPIONS_ROOM,$02,Hide
MapHSC0:
db $C0,$01,Show
db $C0,$02,Show
db SEAFOAM_ISLANDS_1,$01,Show
db SEAFOAM_ISLANDS_1,$02,Show
MapHS9F:
db $9F,$01,Hide
db $9F,$02,Hide
db SEAFOAM_ISLANDS_2,$01,Hide
db SEAFOAM_ISLANDS_2,$02,Hide
MapHSA0:
db $A0,$01,Hide
db $A0,$02,Hide
db SEAFOAM_ISLANDS_3,$01,Hide
db SEAFOAM_ISLANDS_3,$02,Hide
MapHSA1:
db $A1,$02,Show
db $A1,$03,Show
db $A1,$05,Hide
db $A1,$06,Hide
db SEAFOAM_ISLANDS_4,$02,Show
db SEAFOAM_ISLANDS_4,$03,Show
db SEAFOAM_ISLANDS_4,$05,Hide
db SEAFOAM_ISLANDS_4,$06,Hide
MapHSA2:
db $A2,$01,Hide
db $A2,$02,Hide
db $A2,$03,Show
db SEAFOAM_ISLANDS_5,$01,Hide
db SEAFOAM_ISLANDS_5,$02,Hide
db SEAFOAM_ISLANDS_5,$03,Show
db $FF
@ -14921,10 +14929,12 @@ Route8GateText3:
Route7GateText3:
Route6GateText3:
Route5GateText3: ; 0x1dfec
INCBIN "baserom.gbc",$1dfec,$5
INCBIN "baserom.gbc",$1dff1,$1dff6 - $1dff1
UnnamedText_1dfec: ; 0x1dfec
TX_FAR _UnnamedText_8aaa9 ; 0x8aaa9
db $11
TX_FAR _UnnamedText_1dff1 ; 0x8aaef
db $50
; 0x1dff6
UnnamedText_1dff6: ; 0x1dff6
TX_FAR _UnnamedText_1dff6
@ -29819,7 +29829,7 @@ PredefPointers: ; 7E79
dbw $1C,$4F60
dbw $09,$7D6B
dbw $05,$7C47; 4C player exclamation
dbw $01,$5AAF
dbw $01,$5AAF; return immediately
dbw $01,$64EB
dbw $0D,$7CA1
dbw $1C,$780F
@ -33176,14 +33186,21 @@ DayCareMBlocks: ; 16 0x5522f 522F
FuchsiaHouse3Blocks: ; 16
INCBIN "maps/fuchsiahouse3.blk"
INCBIN "baserom.gbc",$5524f,$554e3 - $5524f
INCBIN "baserom.gbc",$5524f,$554d8 - $5524f
UnnamedText_554d8: ; 0x554d8
TX_FAR _UnnamedText_554d8 ; 0x89bee
db $50
; 0x554dd
INCBIN "baserom.gbc",$554dd,$554e3 - $554dd
Route2Script: ; 0x554e3
jp $3c3c
; 0x554e6
Route2Texts:
dw Route2Text1, Route2Text2, Route2Text3, Route2Text4
dw Route2Text1, Route2Text2, Route2Text3, Route2Text4
Route2Text3: ; 0x554ee
TX_FAR _Route2Text3
@ -33463,12 +33480,12 @@ Route9Texts: ; 0x556d5
dw Route9Text1, Route9Text2, Route9Text3, Route9Text4, Route9Text5, Route9Text6, Route9Text7, Route9Text8, Route9Text9, Route9Text10, Route9Text11
Route12Text13: ; 0x556eb
INCBIN "baserom.gbc",$556eb,$556f0 - $556eb
TX_RAM $cf30
db $d7, $92
Route12Text14: ; 0x556f0
db $57
INCBIN "baserom.gbc",$556f0,$55758 - $556f0
INCBIN "baserom.gbc",$556f1,$55758 - $556f1
Route9Text1: ; 0x55758
db $8 ; asm
@ -38741,12 +38758,15 @@ PewterGymText4: ; 0x5c4a8
; 0x5c4a8 + 5 bytes
PewterGymText5: ; 0x5c4ad
INCBIN "baserom.gbc",$5c4ad,6
INCBIN "baserom.gbc",$5c4ad,5
INCBIN "baserom.gbc",$5c4b3,$5c4b7 - $5c4b3
UnnamedText_5c4b2:
TX_FAR _UnnamedText_5c4b2
db $50
PewterGymText6: ; 0x5c4b7
INCBIN "baserom.gbc",$5c4b7,5
TX_FAR _UnnamedText_5c4b7
db $50
INCBIN "baserom.gbc",$5c4bc,$5c4c1 - $5c4bc
@ -40094,7 +40114,12 @@ UnnamedText_5d162: ; 0x5d162
db $50
; 0x5d162 + 5 bytes
INCBIN "baserom.gbc",$5d167,$5d16e - $5d167
UnnamedText_5d167: ; 0x5d167
TX_FAR _UnnamedText_5d167 ; 0xa1c73
db $11 ; play same sound as red giving oak parcel
db $6 ; wait for keypress
db $50
; 0x5d16e
UnnamedText_5d16e: ; 0x5d16e
TX_FAR _UnnamedText_5d16e
@ -40107,13 +40132,13 @@ SaffronGymText10: ; 0x5d173
; 0x5d173 + 5 bytes
SaffronGymText11: ; 0x5d178
INCBIN "baserom.gbc",$5d178,5
INCBIN "baserom.gbc",$5d17d,$5d182 - $5d17d
TX_FAR ReceivedTM46Text
db $b
TX_FAR _UnnamedText_5d17d
db $50
SaffronGymText12: ; 0x5d182
TX_FAR _UnnamedText_5d182
TX_FAR _UnnamedText_5d182 ; pack full
db $50
; 0x5d182 + 5 bytes
@ -43976,7 +44001,7 @@ Tset17_Block:
SECTION "bank1A",DATA,BANK[$1A]
DecrementPP:
DecrementPP: ; 0x68000
; after using a move, decrement pp in battle and (if not transformed?) in party
ld a,[de]
cp a,STRUGGLE
@ -44005,12 +44030,16 @@ DecrementPP:
add hl,bc
dec [hl] ; Decrement PP
ret
; 0x6802f
Version_GFX:
IF _RED
INCBIN "gfx/red/redgreenversion.1bpp"
; 80 bytes
ENDC
IF _BLUE
INCBIN "gfx/blue/blueversion.1bpp"
; 64 bytes
ENDC
Tset05_GFX:
@ -44491,7 +44520,9 @@ UnnamedText_71d88: ; 0x71d88
db $50
; 0x71d88 + 5 bytes
INCBIN "baserom.gbc",$71d8d,$71d94 - $71d8d
UnnamedText_71d8d: ; 0x71d8d
TX_FAR _UnnamedText_71d8d ; 0xa80bc
db $11, $a, $50
UnnamedText_71d94: ; 0x71d94
TX_FAR _UnnamedText_71d94
@ -45329,7 +45360,7 @@ INCBIN "baserom.gbc",$748D6,$116
ViridianGymTexts: ; 0x749ec
dw ViridianGymText1, ViridianGymText2, ViridianGymText3, ViridianGymText4, ViridianGymText5, ViridianGymText6, ViridianGymText7, ViridianGymText8, ViridianGymText9, ViridianGymText10, ViridianGymText11, ViridianGymText12, ViridianGymText13, ViridianGymText14
INCBIN "baserom.gbc",$74a02 + 6,$67 - 6
INCBIN "baserom.gbc",$74a08,$61
ViridianGymText1: ; 0x74a69
db $08 ; asm
@ -46213,7 +46244,7 @@ SafariZoneEntranceScript0: ; 0x751e7
ret
; 0x75221
INCBIN "baserom.gbc",$75221,$75226 - $75221
db $2, $3, $2, $4, $ff
SafariZoneEntranceScript1: ; 0x75226
call $52b4
@ -48744,7 +48775,7 @@ INCBIN "baserom.gbc",$79E6A,$7AF74 - $79E6A
PointerTable6F74: ; 6F74
dw $7de7
dw $7068
dw UnnamedText_7068
dw $708d
dw $70ce
dw $70df
@ -48761,7 +48792,7 @@ PointerTable6F74: ; 6F74
dw $726a
dw $727b
dw $729c
dw $72bd
dw UnnamedText_72bd
dw $72ca
dw $72db
dw $72fc
@ -53069,6 +53100,7 @@ UnnamedText_89bd0: ; 0x89bd0
UnnamedText_89be1: ; 0x89be1
db $0, "a boosted", $55
db "@@"
_UnnamedText_554d8:
TX_NUM $cf4b, 2, 4
db $0, " EXP. Points!", $58
; 0x89be1 + 32 bytes = 0x89c01
@ -53676,7 +53708,7 @@ _UnnamedText_1dfe7: ; 0x8aa5c
db "the road's closed.", $57
; 0x8aa5c + 77 bytes
UnknownText_8aaa9: ; 0x8aaa9
_UnnamedText_8aaa9: ; 0x8aaa9
db $0, "Whoa, boy!", $4f
db "I'm parched!", $55
db "...", $55
@ -62140,7 +62172,7 @@ _UnnamedText_5d162: ; 0xa1bb4
db "you my powers!", $57
; 0xa1bb4 + 191 bytes
UnnamedText_a1c73: ; 0xa1c73
_UnnamedText_5d167: ; 0xa1c73
db $0, "I'm", $4f
db "shocked!", $55
db "But, a loss is a", $55
@ -62174,7 +62206,7 @@ _UnnamedText_5d173: ; 0xa1d16
db "this TM with you!", $57
; 0xa1d16 + 183 bytes
UnnamedText_a1dcd: ; 0xa1dcd
ReceivedTM46Text: ; 0xa1dcd
db $0, $52, " received", $4f
db "TM46!@@"
; 0xa1de0
@ -64082,7 +64114,7 @@ _UnnamedText_71d88: ; 0xa809a
db "cable like so!", $58
; 0xa809a + 34 bytes
UnnamedText_a80bc: ; 0xa80bc
_UnnamedText_71d8d: ; 0xa80bc
db $0, $52, " traded", $4f
db "@"

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,11 +158,269 @@ W_PLAYERNAME EQU $D158 ; 11 characters, including null
W_NUMINPARTY EQU $D163
W_NUMBAGITEMS EQU $D31D
W_BAGITEM01 EQU $D31E
;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
W_PARTYMON4 EQU $D167
W_PARTYMON5 EQU $D168
W_PARTYMON6 EQU $D169
W_PARTYMONEND EQU $D16A
W_PARTYMON1DATA EQU $D16B
W_PARTYMON1_NUM EQU $D16B
W_PARTYMON1_HP EQU $D16C
W_PARTYMON1_BOXLEVEL EQU $D16E
W_PARTYMON1_STATUS EQU $D16F
W_PARTYMON1_TYPE1 EQU $D170
W_PARTYMON1_TYPE2 EQU $D171
W_PARTYMON1_CRATE EQU $D172
W_PARTYMON1_MOVE1 EQU $D173
W_PARTYMON1_MOVE2 EQU $D174
W_PARTYMON1_MOVE3 EQU $D175
W_PARTYMON1_MOVE4 EQU $D176
W_PARTYMON1_OTID EQU $D177
W_PARTYMON1_EXP EQU $D179
W_PARTYMON1_EVHP EQU $D17C
W_PARTYMON1_EVATTACK EQU $D17E
W_PARTYMON1_EVDEFENSE EQU $D180
W_PARTYMON1_EVSPEED EQU $D182
W_PARTYMON1_EVSECIAL EQU $D184
W_PARTYMON1_IV EQU $D186
W_PARTYMON1_MOVE1PP EQU $D188
W_PARTYMON1_MOVE2PP EQU $D189
W_PARTYMON1_MOVE3PP EQU $D18A
W_PARTYMON1_MOVE4PP EQU $D18B
W_PARTYMON1_LEVEL EQU $D18C
W_PARTYMON1_MAXHP EQU $D18D
W_PARTYMON1_ATACK EQU $D18F
W_PARTYMON1_DEFENSE EQU $D191
W_PARTYMON1_SPEED EQU $D193
W_PARTYMON1_SPECIAL EQU $D195
W_PARTYMON2DATA EQU $D197
W_PARTYMON2_NUM EQU $D197
W_PARTYMON2_HP EQU $D198
W_PARTYMON2_BOXLEVEL EQU $D19A
W_PARTYMON2_STATUS EQU $D19B
W_PARTYMON2_TYPE1 EQU $D19C
W_PARTYMON2_TYPE2 EQU $D19D
W_PARTYMON2_CRATE EQU $D19E
W_PARTYMON2_MOVE1 EQU $D19F
W_PARTYMON2_MOVE2 EQU $D1A0
W_PARTYMON2_MOVE3 EQU $D1A1
W_PARTYMON2_MOVE4 EQU $D1A2
W_PARTYMON2_OTID EQU $D1A3
W_PARTYMON2_EXP EQU $D1A5
W_PARTYMON2_EVHP EQU $D1A8
W_PARTYMON2_EVATTACK EQU $D1AA
W_PARTYMON2_EVDEFENSE EQU $D1AC
W_PARTYMON2_EVSPEED EQU $D1AE
W_PARTYMON2_EVSECIAL EQU $D1B0
W_PARTYMON2_IV EQU $D1B2
W_PARTYMON2_MOVE1PP EQU $D1B4
W_PARTYMON2_MOVE2PP EQU $D1B5
W_PARTYMON2_MOVE3PP EQU $D1B6
W_PARTYMON2_MOVE4PP EQU $D1B7
W_PARTYMON2_LEVEL EQU $D1B8
W_PARTYMON2_MAXHP EQU $D1B9
W_PARTYMON2_ATACK EQU $D1BB
W_PARTYMON2_DEFENSE EQU $D1BD
W_PARTYMON2_SPEED EQU $D1BF
W_PARTYMON2_SPECIAL EQU $D1C1
W_PARTYMON3DATA EQU $D1C3
W_PARTYMON3_NUM EQU $D1C3
W_PARTYMON3_HP EQU $D1C4
W_PARTYMON3_BOXLEVEL EQU $D1C6
W_PARTYMON3_STATUS EQU $D1C7
W_PARTYMON3_TYPE1 EQU $D1C8
W_PARTYMON3_TYPE2 EQU $D1C9
W_PARTYMON3_CRATE EQU $D1CA
W_PARTYMON3_MOVE1 EQU $D1CB
W_PARTYMON3_MOVE2 EQU $D1CC
W_PARTYMON3_MOVE3 EQU $D1CD
W_PARTYMON3_MOVE4 EQU $D1CE
W_PARTYMON3_OTID EQU $D1CF
W_PARTYMON3_EXP EQU $D1D1
W_PARTYMON3_EVHP EQU $D1D4
W_PARTYMON3_EVATTACK EQU $D1D6
W_PARTYMON3_EVDEFENSE EQU $D1D8
W_PARTYMON3_EVSPEED EQU $D1DA
W_PARTYMON3_EVSECIAL EQU $D1DC
W_PARTYMON3_IV EQU $D1DE
W_PARTYMON3_MOVE1PP EQU $D1E0
W_PARTYMON3_MOVE2PP EQU $D1E1
W_PARTYMON3_MOVE3PP EQU $D1E2
W_PARTYMON3_MOVE4PP EQU $D1E3
W_PARTYMON3_LEVEL EQU $D1E4
W_PARTYMON3_MAXHP EQU $D1E5
W_PARTYMON3_ATACK EQU $D1E7
W_PARTYMON3_DEFENSE EQU $D1E9
W_PARTYMON3_SPEED EQU $D1EB
W_PARTYMON3_SPECIAL EQU $D1ED
W_PARTYMON4DATA EQU $D1EF
W_PARTYMON4_NUM EQU $D1EF
W_PARTYMON4_HP EQU $D1F0
W_PARTYMON4_BOXLEVEL EQU $D1F2
W_PARTYMON4_STATUS EQU $D1F3
W_PARTYMON4_TYPE1 EQU $D1F4
W_PARTYMON4_TYPE2 EQU $D1F5
W_PARTYMON4_CRATE EQU $D1F6
W_PARTYMON4_MOVE1 EQU $D1F7
W_PARTYMON4_MOVE2 EQU $D1F8
W_PARTYMON4_MOVE3 EQU $D1F9
W_PARTYMON4_MOVE4 EQU $D1FA
W_PARTYMON4_OTID EQU $D1FB
W_PARTYMON4_EXP EQU $D1FD
W_PARTYMON4_EVHP EQU $D200
W_PARTYMON4_EVATTACK EQU $D202
W_PARTYMON4_EVDEFENSE EQU $D204
W_PARTYMON4_EVSPEED EQU $D206
W_PARTYMON4_EVSECIAL EQU $D208
W_PARTYMON4_IV EQU $D20A
W_PARTYMON4_MOVE1PP EQU $D20C
W_PARTYMON4_MOVE2PP EQU $D20D
W_PARTYMON4_MOVE3PP EQU $D20E
W_PARTYMON4_MOVE4PP EQU $D20F
W_PARTYMON4_LEVEL EQU $D210
W_PARTYMON4_MAXHP EQU $D211
W_PARTYMON4_ATACK EQU $D213
W_PARTYMON4_DEFENSE EQU $D215
W_PARTYMON4_SPEED EQU $D217
W_PARTYMON4_SPECIAL EQU $D219
W_PARTYMON5DATA EQU $D21B
W_PARTYMON5_NUM EQU $D21B
W_PARTYMON5_HP EQU $D21C
W_PARTYMON5_BOXLEVEL EQU $D21E
W_PARTYMON5_STATUS EQU $D21F
W_PARTYMON5_TYPE1 EQU $D220
W_PARTYMON5_TYPE2 EQU $D221
W_PARTYMON5_CRATE EQU $D222
W_PARTYMON5_MOVE1 EQU $D223
W_PARTYMON5_MOVE2 EQU $D224
W_PARTYMON5_MOVE3 EQU $D225
W_PARTYMON5_MOVE4 EQU $D226
W_PARTYMON5_OTID EQU $D227
W_PARTYMON5_EXP EQU $D229
W_PARTYMON5_EVHP EQU $D22C
W_PARTYMON5_EVATTACK EQU $D22E
W_PARTYMON5_EVDEFENSE EQU $D230
W_PARTYMON5_EVSPEED EQU $D232
W_PARTYMON5_EVSECIAL EQU $D234
W_PARTYMON5_IV EQU $D236
W_PARTYMON5_MOVE1PP EQU $D238
W_PARTYMON5_MOVE2PP EQU $D239
W_PARTYMON5_MOVE3PP EQU $D23A
W_PARTYMON5_MOVE4PP EQU $D23B
W_PARTYMON5_LEVEL EQU $D23C
W_PARTYMON5_MAXHP EQU $D23D
W_PARTYMON5_ATACK EQU $D23F
W_PARTYMON5_DEFENSE EQU $D241
W_PARTYMON5_SPEED EQU $D243
W_PARTYMON5_SPECIAL EQU $D245
W_PARTYMON6DATA EQU $D247
W_PARTYMON6_NUM EQU $D247
W_PARTYMON6_HP EQU $D248
W_PARTYMON6_BOXLEVEL EQU $D24A
W_PARTYMON6_STATUS EQU $D24B
W_PARTYMON6_TYPE1 EQU $D24C
W_PARTYMON6_TYPE2 EQU $D24D
W_PARTYMON6_CRATE EQU $D24E
W_PARTYMON6_MOVE1 EQU $D24F
W_PARTYMON6_MOVE2 EQU $D250
W_PARTYMON6_MOVE3 EQU $D251
W_PARTYMON6_MOVE4 EQU $D252
W_PARTYMON6_OTID EQU $D253
W_PARTYMON6_EXP EQU $D255
W_PARTYMON6_EVHP EQU $D258
W_PARTYMON6_EVATTACK EQU $D25A
W_PARTYMON6_EVDEFENSE EQU $D25C
W_PARTYMON6_EVSPEED EQU $D25E
W_PARTYMON6_EVSECIAL EQU $D260
W_PARTYMON6_IV EQU $D262
W_PARTYMON6_MOVE1PP EQU $D264
W_PARTYMON6_MOVE2PP EQU $D265
W_PARTYMON6_MOVE3PP EQU $D266
W_PARTYMON6_MOVE4PP EQU $D267
W_PARTYMON6_LEVEL EQU $D268
W_PARTYMON6_MAXHP EQU $D269
W_PARTYMON6_ATACK EQU $D26B
W_PARTYMON6_DEFENSE EQU $D26D
W_PARTYMON6_SPEED EQU $D26F
W_PARTYMON6_SPECIAL EQU $D271
W_PARTYMON1OT EQU $D273
W_PARTYMON2OT EQU $D27E
W_PARTYMON3OT EQU $D289
W_PARTYMON4OT EQU $D294
W_PARTYMON5OT EQU $D29F
W_PARTYMON6OT EQU $D2AA
W_PARTYMON1NAME EQU $D2B5
W_PARTYMON2NAME EQU $D2C0
W_PARTYMON3NAME EQU $D2CB
W_PARTYMON4NAME EQU $D2D6
W_PARTYMON5NAME EQU $D2E1
W_PARTYMON6NAME EQU $D2EC
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
@ -203,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())