diff options
| -rw-r--r-- | engine/pinball_game/catchem_mode.asm | 22 | ||||
| -rw-r--r-- | engine/pinball_game/catchem_mode/catchem_mode_red_field.asm | 10 | ||||
| -rw-r--r-- | wram.asm | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm index 33c9616..29eb5a0 100644 --- a/engine/pinball_game/catchem_mode.asm +++ b/engine/pinball_game/catchem_mode.asm @@ -179,7 +179,7 @@ CallTable_10178: ; 0x10178 dw Func_109fc ; STAGE_BLUE_FIELD_TOP
dw Func_109fc ; STAGE_BLUE_FIELD_BOTTOM
-Func_10184: ; 0x10184 called by what looks like the "hit voltorb and shellder" handllers, as well as some evo mode stuff
+Func_10184: ; 0x10184 called by what looks like the "hit voltorb and shellder" handllers and after all tiles are flipped, as well as some evo mode stuff
ld a, [wCurrentStage]
bit 0, a
ret z ;skip if stage has no flippers
@@ -190,9 +190,9 @@ Func_10184: ; 0x10184 called by what looks like the "hit voltorb and shellder" h rl b
add c
ld c, a
- jr nc, .asm_10199
+ jr nc, .NoOverflow
inc b
-.asm_10199 ;double current catch em mon
+.NoOverflow ;double current catch em mon
ld hl, MonBillboardPicPointers
add hl, bc
ld a, [hli]
@@ -212,25 +212,25 @@ Func_10184: ; 0x10184 called by what looks like the "hit voltorb and shellder" h ld de, wc000
ld hl, wd586 ;what tiles are flipped?
ld c, $0
-.asm_101bb
+.Loop24Times
ld a, [hli]
cp [hl]
ld [hli], a ;load first byte into next and test it gainst the second byte, if it's the same skip
- jr z, .asm_101d2
+ jr z, .NextLoop
ld b, a ;else store in b
call nz, Func_101d9
ld a, [hGameBoyColorFlag]
and a
- jr z, .asm_101d2 ;skip if DMG
+ jr z, .NextLoop ;skip if DMG
ld a, [wCurrentStage]
bit 0, a
ld a, b
call nz, Func_10230 ;if lower stage, run ???
-.asm_101d2
+.NextLoop
inc c
ld a, c
cp $18 ;run 24 times
- jr nz, .asm_101bb
+ jr nz, .Loop24Times
ret
Func_101d9: ; 0x101d9
@@ -245,7 +245,7 @@ Func_101d9: ; 0x101d9 ld [de], a ;1 into de+1
inc de
ld b, $0
- ld hl, Data_102a4 ;add c to ???
+ ld hl, Data_102a4 ;retrieve ???? c
add hl, bc
ld c, [hl]
sla c
@@ -257,7 +257,7 @@ Func_101d9: ; 0x101d9 sla c
rl b ;multiply ??? by 16
ld hl, vTilesSH tile $10 ;wut
- add hl, bc ;add ???*16 to wut
+ add hl, bc ;add ???*16 to wut (8 2 bit pixels?)
ld a, l
ld [de], a
inc de
@@ -290,7 +290,7 @@ Func_101d9: ; 0x101d9 pop bc
push de
xor a
- ld de, Func_11d2 ;queue graphics load from the adjusted pointer bank 0 using this funch
+ ld de, Func_11d2 ;queue graphics load from the adjusted pointer bank 0 using this func
call QueueGraphicsToLoadWithFunc
pop de
pop hl
diff --git a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm index f6ffbfc..5be7e20 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm @@ -27,18 +27,18 @@ PointerTable_20021: ; 0x20021 Func_20041: ; 0x20041
ld a, [NumberOfCatchModeTilesFlipped]
- cp $18 ;if not 24, ret
- jr nz, .asm_2005d
+ cp $18 ;if not 24 and not on lower stage, ret
+ jr nz, .NotDone
ld a, [wCurrentStage]
bit 0, a
- jr z, .asm_2005d
+ jr z, .NotDone
ld hl, wd54d
- inc [hl]
+ inc [hl] ;else progress catch em mode
ld a, $14
ld [wd54e], a
ld a, $5
ld [wd54f], a
-.asm_2005d
+.NotDone
scf
ret
@@ -577,13 +577,13 @@ wInSpecialMode:: ; 0xd54b wSpecialModeCollisionID:: ; 0xd54c 10000 sets it to a input, records what the ball has collided with see constants/special_collision_constants.asm for more info ds $1 -wd54d:: ; 0xd54d catch mode progress? used for all 3 special modes. incremented when mon in catch mode is hit 3 times +wd54d:: ; 0xd54d catch mode current step? used for all 3 special modes. ds $1 -wd54e:: ; 0xd54e +wd54e:: ; 0xd54e set to 20 by catch mode when all tiles are flipped and on lower stage ds $1 -wd54f:: ; 0xd54f +wd54f:: ; 0xd54f set to 5 by catch mode when all tiles are flipped and on lower stage ds $1 wSpecialMode:: ; 0xd550 @@ -700,7 +700,7 @@ wTimerDigits:: ; 0xd582 ; fourth byte = unused, but still written to ds $4 -wd586:: ; 0xd586 something to do with catch mode billboard flipping +wd586:: ; 0xd586 something to do with catch mode billboard flipping. array of flags that set wether each tile is gray? ds $30 NumberOfCatchModeTilesFlipped:: ; 0xd5b6 a 24 wide block starts here and is filled before catch mode. first step of catch mode only passes if it is 24. top byte records the number of tiles flipped |