alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update events.asm

Browse Source 
just JMLs here
This commit is contained in:
spannerisms
2021-03-24 08:20:08 -04:00
parent f4a336db9e
commit 33dbe3003c
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
events.asm
View File

@@ -11,8 +11,7 @@ OnPrepFileSelect:
RTL RTL
+ +
JSL.l LoadAlphabetTilemap JSL.l LoadAlphabetTilemap
JSL.l LoadFullItemTiles JML.l LoadFullItemTiles
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnDrawHud: OnDrawHud:
JSL.l DrawChallengeTimer ; this has to come before NewDrawHud because the timer overwrites the compass counter JSL.l DrawChallengeTimer ; this has to come before NewDrawHud because the timer overwrites the compass counter
@@ -77,15 +76,14 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnAga2Defeated: OnAga2Defeated:
JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first
JSL.l IncrementAgahnim2Sword JML.l IncrementAgahnim2Sword
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!RNG_ITEM_LOCK_IN = "$7F5090" !RNG_ITEM_LOCK_IN = "$7F5090"
OnFileLoad: OnFileLoad:
REP #$10 ; set 16 bit index registers REP #$10 ; set 16 bit index registers
JSL.l EnableForceBlank ; what we wrote over JSL.l EnableForceBlank ; what we wrote over
LDA.b #$07 : STA $210c ; Restore screen 3 to normal tile area LDA.b #$07 : STA $210C ; Restore screen 3 to normal tile area
LDA !FRESH_FILE_MARKER : BNE + LDA !FRESH_FILE_MARKER : BNE +
JSL.l OnNewFile JSL.l OnNewFile
@@ -161,8 +159,8 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnLinkDamaged: OnLinkDamaged:
JSL.l FlipperKill JSL.l FlipperKill
JSL.l OHKOTimer JML.l OHKOTimer
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnEnterWater: OnEnterWater:
JSL.l RegisterWaterEntryScreen JSL.l RegisterWaterEntryScreen
@@ -177,8 +175,8 @@ OnLinkDamagedFromPit:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnLinkDamagedFromPitOutdoors: OnLinkDamagedFromPitOutdoors:
JSL.l OHKOTimer ; make sure this is last JML.l OHKOTimer ; make sure this is last
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!RNG_ITEM_LOCK_IN = "$7F5090" !RNG_ITEM_LOCK_IN = "$7F5090"
OnOWTransition: OnOWTransition:
@@ -201,16 +199,16 @@ OnLoadDuckMap:
RTL RTL
+ +
LDA.b #$00 : STA !DARK_DUCK_TEMP LDA.b #$00 : STA !DARK_DUCK_TEMP
JSL OverworldMap_DarkWorldTilemap JML OverworldMap_DarkWorldTilemap
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
PreItemGet: PreItemGet:
LDA.b #$01 : STA !ITEM_BUSY ; mark item as busy LDA.b #$01 : STA !ITEM_BUSY ; mark item as busy
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
PostItemGet: PostItemGet:
JSL.l MaybeWriteSRAMTrace JML.l MaybeWriteSRAMTrace
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
PostItemAnimation: PostItemAnimation:
LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished