thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-05 19:10:07 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a few things I did wrong

Browse source 
hg-commit-id: 919adffe4381
This commit is contained in:
xeons 2012-03-30 21:55:29 -05:00
parent 17d6c0d0f7
commit 18f52b7cdc
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extras/gbz80disasm.py
View file

@ -604,8 +604,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
bank_id = 0 bank_id = 0
if original_offset > 0x8000: if original_offset > 0x8000:
bank_id = original_offset / 0x4000 bank_id = original_offset / 0x4000
#print "bank id is: " + str(bank_id) print "bank id is: " + str(bank_id)
print "Function{0:x}:".format(original_offset);
last_hl_address = None #for when we're scanning the main map script last_hl_address = None #for when we're scanning the main map script
last_a_address = None last_a_address = None

24
main.asm
View file

@ -10810,35 +10810,35 @@ CheckForceBikeOrSurf: ; C38B
ld hl, $D732 ld hl, $D732
bit 5, [hl] bit 5, [hl]
ret nz ret nz
ld hl, ForcedBikeSurfMaps ld hl, ForcedBikeOrSurfMaps
ld a, [W_YCOORD] ld a, [W_YCOORD]
ld b, a ld b, a
ld a, [W_XCOORD] ld a, [W_XCOORD]
ld c, a ld c, a
ld a, [W_CURMAP] ld a, [W_CURMAP]
ld d, a ld d, a
.loop\0 .loop\@
ld a, [hli] ld a, [hli]
cp $ff cp $ff
ret z ;if we reach FF then it's not part of the list ret z ;if we reach FF then it's not part of the list
cp d ;compare to current map cp d ;compare to current map
jr nz, .incorrectMap\0 jr nz, .incorrectMap\@
ld a, [hli] ld a, [hli]
cp b ;compare y-coord cp b ;compare y-coord
jr nz, .incorrectY\0 jr nz, .incorrectY\@
ld a, [hli] ld a, [hli]
cp c ;compare x-coord cp c ;compare x-coord
jr nz, .loop\0 ; incorrect x-coord, check next item jr nz, .loop\@ ; incorrect x-coord, check next item
ld a, [W_CURMAP] ld a, [W_CURMAP]
cp SEAFOAM_ISLANDS_4 cp SEAFOAM_ISLANDS_4
ld a, $2 ld a, $2
ld [$d666], a ld [$d666], a
jr z, .forceSurfing\0 jr z, .forceSurfing\@
ld a, [$d35e] ld a, [$d35e]
cp SEAFOAM_ISLANDS_5 cp SEAFOAM_ISLANDS_5
ld a, $2 ld a, $2
ld [$d668], a ld [$d668], a
jr z, .forceSurfing\0 jr z, .forceSurfing\@
;force bike riding ;force bike riding
ld hl, $d732 ld hl, $d732
set 5, [hl] set 5, [hl]
@ -10846,19 +10846,19 @@ CheckForceBikeOrSurf: ; C38B
ld [$d700], a ld [$d700], a
ld [$d11a], a ld [$d11a], a
jp ForceBikeOrSurf jp ForceBikeOrSurf
.incorrectMap\0 .incorrectMap\@
inc hl inc hl
.incorrectY\0 .incorrectY\@
inc hl inc hl
jr .loop\0 jr .loop\@
.forceSurfing\0 .forceSurfing\@
ld a, $2 ld a, $2
ld [$d700], a ld [$d700], a
ld [$d11a], a ld [$d11a], a
jp ForceBikeOrSurf jp ForceBikeOrSurf
; 0xc3e6 ; 0xc3e6
ForcedBikeSurfMaps: ;C3e6 ForcedBikeOrSurfMaps: ;C3e6
; map id, y, x ; map id, y, x
db ROUTE_16,$0A,$11 db ROUTE_16,$0A,$11
db ROUTE_16,$0B,$11 db ROUTE_16,$0B,$11