summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-02-17 20:00:40 +0100
committerxCrystal <rgr.crystal@gmail.com>2018-02-17 20:00:40 +0100
commitf5999929fcc9c522c01af57d816f5beb7def37e9 (patch)
treecc5f9d24ebea86e1cdda512572bb9f8e42d34fb1 /src
parent1e411d212d8bb47ee134afc872be9a9303c52820 (diff)
debug_ret EQUS rst 38
Diffstat (limited to 'src')
-rw-r--r--src/engine/bank4.asm6
-rw-r--r--src/engine/bank7.asm2
-rw-r--r--src/engine/booster_packs.asm4
-rw-r--r--src/engine/home.asm6
-rw-r--r--src/macros/code.asm4
5 files changed, 13 insertions, 9 deletions
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index 9d2e86a..440b216 100644
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -262,7 +262,7 @@ Func_10a70: ; 10a70 (4:4a70)
inc hl
dec c
jr nz, .asm_10a87
- rst $38
+ debug_ret
jr .asm_10a97
.asm_10a93
@@ -1205,7 +1205,7 @@ Func_1299f: ; 1299f (4:699f)
ld [wWhichSprite], a
cp $10
jr nz, .asm_129bb
- rst $38
+ debug_ret
scf
jr .asm_129d6
.asm_129cf
@@ -1467,7 +1467,7 @@ Func_12c05: ; 12c05 (4:6c05)
or a
jr .asm_12c4b
.asm_12c48
- rst $38
+ debug_ret
xor a
scf
.asm_12c4b
diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm
index 9d2d603..a049d7c 100644
--- a/src/engine/bank7.asm
+++ b/src/engine/bank7.asm
@@ -354,7 +354,7 @@ Func_1c83d: ; 1c83d (7:483d)
inc hl
dec c
jr nz, .asm_1c845
- rst $38
+ debug_ret
jr .asm_1c855
.asm_1c853
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index e955ed0..09c7dbb 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -45,7 +45,7 @@ GenerateBoosterNonEnergies: ; 1e1df (7:61df)
or a
ret
.no_valid_cards
- rst $38
+ debug_ret
scf
ret
@@ -264,7 +264,7 @@ FindBoosterCard: ; 1e31d (7:631d)
or a
ret
.no_valid_card_found
- rst $38
+ debug_ret
scf
ret
diff --git a/src/engine/home.asm b/src/engine/home.asm
index c1c4e07..19fc49d 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -2612,7 +2612,7 @@ CopyDeckData: ; 1072 (0:1072)
ld a, [hl]
or a
ret nz
- rst $38
+ debug_ret
scf
ret
; 0x10aa
@@ -7547,7 +7547,7 @@ Func_39ad: ; 39ad (0:39ad)
push bc
cp $8
jr c, .asm_39b4
- rst $38
+ debug_ret
xor a
.asm_39b4
add a
@@ -8047,7 +8047,7 @@ GetSpriteBufferProperty: ; 3dbf (0:3dbf)
ld a, [wWhichSprite]
cp SPRITE_ANIM_BUFFER_CAPACITY
jr c, .got_sprite
- rst $38
+ debug_ret
ld a, SPRITE_ANIM_BUFFER_CAPACITY - 1 ; default to last sprite
.got_sprite
push bc
diff --git a/src/macros/code.asm b/src/macros/code.asm
index 47b698f..24c3bf1 100644
--- a/src/macros/code.asm
+++ b/src/macros/code.asm
@@ -42,6 +42,10 @@ farcallx: MACRO
dw \2
ENDM
+; the rst $38 handler is a single ret
+; probably used for testing purposes during development
+debug_ret EQUS "rst $38"
+
emptybank: MACRO
rept $4000
db $ff