RockTunnel1 texts and update gbz80disasm to not handle $8

hg-commit-id: 86d0d495afbc
This commit is contained in:
Bryan Bishop 2012-01-10 17:35:03 -06:00
parent 22e331c330
commit f90b3fece1
2 changed files with 40 additions and 25 deletions

View file

@ -261,7 +261,7 @@ temp_opt_table = [
[ "LD DE, ?", 0x11, 2 ],
[ "LD HL, ?", 0x21, 2 ],
[ "LD SP, ?", 0x31, 2 ],
[ "LD [?], SP", 0x8, 2 ],
# [ "LD [?], SP", 0x8, 2 ],
[ "LD [?], A", 0xea, 2 ],
[ "NOP", 0x0, 0 ],
[ "OR A", 0xb7, 0 ],
@ -735,10 +735,12 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
keep_reading = False
is_data = False #cleanup
break
if is_data and keep_reading:
output += spacing + "db $" + hex(ord(rom[offset+1]))[2:] #+ " ; " + hex(offset)
else:
# if is_data and keep_reading:
output += spacing + "db $" + hex(ord(rom[offset]))[2:] #+ " ; " + hex(offset)
output += "\n"
offset += 1
current_byte_number += 1
#else the while loop would have spit out the opcode
#these two are done prior

View file

@ -15902,29 +15902,42 @@ RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
dw $45f6 ; objects
INCBIN "baserom.gbc",$444dc,$4455a - $444dc
RockTunnel1Text1: ; 0x4455a
db $08 ; asm
db $8
ld hl, $4505
jr .asm_bcf23 ; 0x4455e
ld [$1121], sp
ld b, l
jr .asm_bcf23 ; 0x44564
ld [$1d21], sp
ld b, l
jr .asm_bcf23 ; 0x4456a
ld [$2921], sp
ld b, l
jr .asm_bcf23 ; 0x44570
ld [$3521], sp
ld b, l
jr .asm_bcf23 ; 0x44576
ld [$4121], sp
ld b, l
jr .asm_bcf23 ; 0x4457c
ld [$4d21], sp
ld b, l
.asm_bcf23 ; 0x44582
call LoadTrainerHeader
jr asm_0c916 ; 0x4455e $22
RockTunnel1Text2:
db $8
ld hl, $4511
jr asm_0c916 ; 0x44564 $1c
RockTunnel1Text3:
db $8
ld hl, $451d
jr asm_0c916 ; 0x4456a $16
RockTunnel1Text4:
db $8
ld hl, $4529
jr asm_0c916 ; 0x44570 $10
RockTunnel1Text5:
db $8
ld hl, $4535
jr asm_0c916 ; 0x44576 $a
RockTunnel1Text6:
db $8
ld hl, $4541
jr asm_0c916 ; 0x4457c $4
RockTunnel1Text7:
db $8
ld hl, $454d
asm_0c916: ; 0x44582
call $31cc
jp $24d7
INCBIN "baserom.gbc",$44588,$69