scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update world map conditions

Browse Source
This commit is contained in:
scawful
2025-01-10 20:42:25 -05:00
parent de478a5e71
commit 59a063e5f4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Overworld/world_map.asm
View File

@@ -209,16 +209,14 @@ MapIconDraw:
LDA.l OOSPROG : CMP.b #$02 : BNE + LDA.l OOSPROG : CMP.b #$02 : BNE +
JSL DrawHallOfSecretsIcon JSL DrawHallOfSecretsIcon
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
JMP .main_quest
+ +
LDA.l OOSPROG : AND.b #$10 : BEQ .main_quest LDA.l OOSPROG : AND.b #$10 : BEQ .main_quest
; Pyramid of Power
JSL DrawPyramidIcon JSL DrawPyramidIcon
JSR HandleMapDrawIcon_noflash JSR HandleMapDrawIcon_noflash
.main_quest .main_quest
LDA.l MapIcon : CMP.b #$01 : BEQ .draw_crystal_1 LDA.l MapIcon : CMP.b #$01 : BEQ .draw_crystal_1
CMP.b #$02 : BEQ .draw_crystals CMP.b #$02 : BCS .draw_crystals
JSL DrawEonEscapeIcon JSL DrawEonEscapeIcon
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
JMP restore_coords_and_exit JMP restore_coords_and_exit

6
Sprites/NPCs/village_elder.asm
View File

@@ -3,11 +3,11 @@ Sprite_VillageElder_Main:
%PlayAnimation(2,3,16) %PlayAnimation(2,3,16)
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
REP #$30 REP #$30
LDA.l MAPICON : AND.w #$00FF LDA.l OOSPROG : AND.w #$00FF
SEP #$30 SEP #$30
CMP.b #$02 : BCS .already_met AND.b #$10 : BNE .already_met
%ShowSolicitedMessage($143) : BCC .no_message %ShowSolicitedMessage($143) : BCC .no_message
LDA.b #$02 : STA.l $7EF3C7 LDA.l OOSPROG : ORA.b #$10 : STA.l OOSPROG
.no_message .no_message
RTS RTS