alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Ganon invulverable with a mushroom in the room

Browse Source
This commit is contained in:
karafruit
2023-03-19 00:43:52 -05:00
parent 1efd8f0f3d
commit 8b1f6b9074
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/i18n_en.bin
View File

Binary file not shown.

7
dialog.asm
View File

@@ -227,7 +227,10 @@ DialogGanon1:
REP #$20 REP #$20
LDA.w #$018C LDA.w #$018C
BCC + BCC +
JSL CheckMushroom
LDA.w #$016D LDA.w #$016D
BCC +
LDA.w #$0197
+ STA.w TextID + STA.w TextID
SEP #$20 SEP #$20
JSL.l Sprite_ShowMessageMinimal_Alt JSL.l Sprite_ShowMessageMinimal_Alt
@@ -247,6 +250,10 @@ DialogGanon2:
REP #$20 REP #$20
BCS + BCS +
LDA.w #$018D : JMP .done LDA.w #$018D : JMP .done
+
JSL CheckMushroom
LDA.w #$0198 : JMP .done
BCC +
+ +
LDA.l GanonVulnerabilityItem : AND #$00FF : BNE .special_item LDA.l GanonVulnerabilityItem : AND #$00FF : BNE .special_item
LDA.l SpecialWeapons : AND.w #$00FF LDA.l SpecialWeapons : AND.w #$00FF

4
goalitem.asm
View File

@@ -1,7 +1,9 @@
GoalItemGanonCheck: GoalItemGanonCheck:
LDA.w SpriteTypeTable, X : CMP.b #$D6 : BNE .success ; skip if not ganon LDA.w SpriteTypeTable, X : CMP.b #$D6 : BNE .success ; skip if not ganon
JSL.l CheckGanonVulnerability JSL.l CheckGanonVulnerability
BCS .success BCC .fail
JSL.l CheckMushroom
BCC .success
.fail .fail
LDA.w SpriteActivity, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal LDA.w SpriteActivity, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal

9
trolls.asm
View File

@@ -176,3 +176,12 @@ SetLanmolaVelocity:
ASL ASL
STA.w $0D50, X STA.w $0D50, X
RTL RTL
CheckMushroom:
PHP
SEP #$20
LDA.l InventoryTracking
AND.b #$20
BEQ +
PLP : SEC : RTL
+ PLP : CLC : RTL