Skip to content

Commit

Permalink
v1.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
city41 committed Jul 12, 2024
1 parent 3ba0bef commit 331b9a2
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
Binary file modified ipsPatches/a94/kof94_a94.055-c1.c1.ips
Binary file not shown.
Binary file modified ipsPatches/a94/kof94_a94.055-p1.p1.ips
Binary file not shown.
Binary file modified ipsPatches/a95/kof94_a95.055-c1.c1.ips
Binary file not shown.
Binary file modified ipsPatches/a95/kof94_a95.055-p1.p1.ips
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kof94te",
"version": "1.4.1",
"version": "1.4.2",
"repository": "[email protected]:city41/kof94te.git",
"author": "Matt Greer <[email protected]>",
"license": "GPL-3.0-only",
Expand Down
Binary file modified resources/title_badge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 9 additions & 7 deletions src/patches/setupCharacterColors.asm
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ fallingFighter:
continueScreenOrCutscene2:
bsr checkIfJustLostToRugal ; a special case, losing to Rugal
cmpi.b #1, D1 ; will set D1=1 if a human player just lost to Rugal
beq playerIsContinuing
beq playerIsContinuingOrFalling
cmpi.b #$ff, $DEFEATED_TEAMS
beq winScreen ; if all teams are defeated, and they haven't lost to Rugal, then this is cutscene2, it's the same logic as winScreen

;; not the cutscene, must be continuing
playerIsContinuing:
;; not the cutscene, must be continuing, or falling
playerIsContinuingOrFalling:
cmpi.b #$80, $108238 ; did p1 lose?
beq team1Character ; yup, p1 lost, team1Character can handle it from here
bra team2Character ; p2 lost, team2Character can handle it from here
Expand Down Expand Up @@ -177,6 +177,8 @@ add.w D1, D1
rts


;;;;;; SUBROUTINES ;;;;;;;;;;;;;;

;; figureOutCharPalette
;; ------------------
;; subroutine that handles any character once the team and chosen index is known
Expand Down Expand Up @@ -252,14 +254,14 @@ rts



;;;;;; SUBROUTINES ;;;;;;;;;;;;;;

;; checkIfJustLostToRugal
;; ----------------------
;; figures out if this is a single player game, and the human just lost to Rugal
;;
;; returns
;; D1=1 if the player just lost to Rugal
;; D1=0 if the player did not just lose to Rugal
;; D1.b=1 if the player just lost to Rugal
;; D1.b=0 if the player did not just lose to Rugal
checkIfJustLostToRugal:
cmpi.b #3, $PLAY_MODE ; is this versus mode?
; if this is versus mode, then for sure they did not lose to Rugal
Expand All @@ -268,7 +270,7 @@ cmpi.b #$ff, $DEFEATED_TEAMS
; if they haven't defeated all teams, then they haven't fought Rugal yet, so they can't have lost to him
bne checkIfJustLostToRugal_didNotLose

; ok all teams are defeated. See if p1 lost and p2 is Rugal
; ok all teams are defeated, and this isn't versus. See if human p1 lost and p2 is Rugal
btst #0, $PLAY_MODE ; is player one playing?
beq checkIfJustLostToRugal_player2IsHuman

Expand Down

0 comments on commit 331b9a2

Please sign in to comment.