diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /engine/events.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/events.asm')
| -rw-r--r-- | engine/events.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/events.asm b/engine/events.asm index 9b701be8a..3bcac8925 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -456,7 +456,7 @@ DoMapTrigger: ; 968ec rept 4 add hl, de endr - + call GetMapScriptHeaderBank call GetFarHalfword call GetMapScriptHeaderBank @@ -541,11 +541,11 @@ OWPlayerInput: ; 96974 call CheckMenuOW jr c, .Action -.NoAction +.NoAction: xor a ret -.Action +.Action: push af callba Function80422 pop af @@ -581,7 +581,7 @@ TryObjectEvent: ; 969b5 xor a ret -.IsObject +.IsObject: call PlayTalkObject ld a, [hObjectStructIndexBuffer] call GetObjectStruct @@ -687,7 +687,7 @@ TryReadSign: ; 96a38 xor a ret -.IsSign +.IsSign: ld a, [EngineBuffer3] ld hl, .signs rst JumpTable @@ -887,11 +887,11 @@ CheckMenuOW: ; 96b30 scf ret -.NoMenu +.NoMenu: xor a ret -.Select +.Select: call PlayTalkObject ld a, BANK(SelectMenuScript) ld hl, SelectMenuScript @@ -918,11 +918,11 @@ SelectMenuCallback: ; 96b66 end ; 96b72 -.Script ; 96b72 +.Script: ; 96b72 ptjump wQueuedScriptBank ; 96b75 -.Asm ; 96b75 +.Asm: ; 96b75 ptcallasm wQueuedScriptBank end ; 96b79 @@ -994,7 +994,7 @@ CountStep: ; 96b79 ret ; 96bd3 -.unreferenced: ; 96bd3 +.unreferenced ; 96bd3 ld a, 7 scf ret |