more travel changes

4 files changed, 27 insertions, 27 deletions

diff --git a/engine/pinball_game/map_move.asm b/engine/pinball_game/map_move.asm
index ebd26e1..4c27b29 100755
--- a/engine/pinball_game/map_move.asm
+++ b/engine/pinball_game/map_move.asm
@@ -430,15 +430,15 @@ Func_314ae: ; 0x314ae
 	ld a, [wd54c]

 	jr z, .asm_314d0

 	cp $1

-	jp z, Func_31591

+	jp z, OpenRedMapMoveSlotFromLeft

 	cp $3

-	jp z, Func_31591

+	jp z, OpenRedMapMoveSlotFromLeft

 	cp $2

-	jp z, Func_315b3

+	jp z, OpenRedMapMoveSlotFromRight

 	cp $5

-	jp z, Func_315b3

+	jp z, OpenRedMapMoveSlotFromRight

 	cp $d

-	jp z, Func_315d5

+	jp z, ResolveSucsessfulRedMapMove

 .asm_314d0

 	cp $0

 	jr z, .asm_314d6

@@ -515,13 +515,13 @@ UpdateMapMove_RedField: ; 0x3151f handle map move timer and fail when it expires
 	call LoadScrollingText

 	ret

 

-Func_31591: ; 0x31591

+OpenRedMapMoveSlotFromLeft: ; 0x31591

 	ld a, [wMapMoveDirection]

 	and a

-	jr nz, .asm_315b1

+	jr nz, .NotApplicibleOrCompleted

 	ld a, [wIndicatorStates]

 	and a

-	jr z, .asm_315b1

+	jr z, .NotApplicibleOrCompleted

 	xor a

 	ld [wIndicatorStates], a

 	ld [wIndicatorStates + 2], a

@@ -530,17 +530,17 @@ Func_31591: ; 0x31591
 	ld a, $1

 	ld [wSlotIsOpen], a

 	ld [wd54d], a

-.asm_315b1

+.NotApplicibleOrCompleted

 	scf

 	ret

 

-Func_315b3: ; 0x315b3

+OpenRedMapMoveSlotFromRight: ; 0x315b3

 	ld a, [wMapMoveDirection]

 	and a

-	jr z, .asm_315d3

+	jr z, .NotApplicibleOrCompleted

 	ld a, [wIndicatorStates + 1]

 	and a

-	jr z, .asm_315d3

+	jr z, .NotApplicibleOrCompleted

 	xor a

 	ld [wIndicatorStates + 1], a

 	ld [wIndicatorStates + 3], a

@@ -549,11 +549,11 @@ Func_315b3: ; 0x315b3
 	ld a, $1

 	ld [wSlotIsOpen], a

 	ld [wd54d], a

-.asm_315d3

+.NotApplicibleOrCompleted

 	scf

 	ret

 

-Func_315d5: ; 0x315d5

+ResolveSucsessfulRedMapMove: ; 0x315d5

 	ld de, $0000

 	call PlaySong

 	rst AdvanceFrame

diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
index 6679037..df0118b 100644
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -224,31 +224,31 @@ ResolveWildMonCollision_RedField: ; 0x14795
 ResolveDiglettCollision: ; 0x147aa

 	ld a, [wWhichDiglett]

 	and a

-	jp z, .asm_14834

+	jp z, .asm_14834 ;if no diglett hit (runs every frame when above a certain line on bottom boards, jump

 	xor a

 	ld [wWhichDiglett], a

 	ld a, [wWhichDiglettId]

 	sub $1

 	sla a

-	ld c, a

+	ld c, a ;-1 then * 2

 	ld b, $0

-	ld hl, wLeftMapMoveCounter

+	ld hl, wLeftMapMoveCounter ;select approprioate map move counter

 	add hl, bc

 	ld a, [hl]

 	cp $3

-	jr z, .asm_14834

+	jr z, .asm_14834 ;if counter is set to 3, jump

 	inc a

-	ld [hld], a

-	ld [hl], $50

+	ld [hld], a ;oherwise, add 1 to the counter

+	ld [hl], $50 ;and set the animation of that diglett

 	ld hl, wLeftMapMoveCounterFramesUntilDecrease

 	add hl, bc

-	ld a, MAP_MOVE_FRAMES_COUNTER & $ff

+	ld a, MAP_MOVE_FRAMES_COUNTER & $ff ;load in time until digletts decay

 	ld [hli], a

 	ld a, MAP_MOVE_FRAMES_COUNTER >> 8

 	ld [hl], a

 	ld a, c

 	and a

-	jr z, .asm_14807

+	jr z, .asm_14807 ;if left diglett, jump

 	ld a, $6a

 	ld [wStageCollisionMap + $f0], a

 	ld a, $6b

diff --git a/main.asm b/main.asm
index 8bc7f82..d987950 100644
--- a/main.asm
+++ b/main.asm
@@ -102,7 +102,7 @@ INCLUDE "engine/pinball_game/end_of_ball_bonus.asm"
 
 SECTION "bank4", ROMX
 
-Func_10000: ; 0x10000
+Func_10000: ; 0x10000 set to 4 b
 	ld c, a
 	ld a, [wInSpecialMode] ;special mode in c
 	and a
diff --git a/wram.asm b/wram.asm
index 1f8ef3e..e5ab467 100644
--- a/wram.asm
+++ b/wram.asm
@@ -385,7 +385,7 @@ wPreviousTriggeredGameObject:: ; 0xd4ec
 ; an object two frames in a row. It has to "un-collide" before it can collide again.
 	ds $1
 
-wWhichDiglett:: ; 0xd4ed
+wWhichDiglett:: ; 0xd4ed 0 = none, left = 1 right = 2
 wWhichPsyduckPoliwag::
 	ds $1
 wWhichDiglettId:: ; 0xd4ee
@@ -395,7 +395,7 @@ wWhichPsyduckPoliwagId::
 wLeftDiglettAnimationController:: ; 0xd4ef $50 = in and pained look. 0 = normal state
 	ds $1
 
-wLeftMapMoveCounter:: ; 0xd4f0
+wLeftMapMoveCounter:: ; 0xd4f0 WARNING, diglet identifying code relies on this being 2 bytes before right map move counter
 	ds $1
 
 wRightDiglettAnimationController:: ; 0xd4f1 $50 = in and pained look. 0 = normal state
@@ -530,7 +530,7 @@ wCollidedAlleyTriggers:: ; 0xd521
 
 	ds $6 ; free space
 
-wIndicatorStates:: ; 0xd52f
+wIndicatorStates:: ; 0xd52f 0 = evo arrows, 1 = catch arrows, 2 = left small alley, 3 = bellsprout, 4 = slot. bit 7 controls if enabled and flashing, bit 1 and 2 control is solid (set = solid)
 	ds $13
 
 wLeftAlleyTrigger:: ; 0xd542
@@ -566,7 +566,7 @@ wInSpecialMode:: ; 0xd54b
 ; Set to 1 if currently in special game mode. See wSpecialMode.
 	ds $1
 
-wd54c:: ; 0xd54c 10000 sets it to c. red evo mode checks it for it's contents
+wd54c:: ; 0xd54c 10000 sets it to a input.  7 and 8 from the digletts
 	ds $1
 
 wd54d:: ; 0xd54d