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/menu.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/menu.asm')
| -rwxr-xr-x | engine/menu.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/menu.asm b/engine/menu.asm index 074b2a28c..870ca89bf 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -414,7 +414,7 @@ _2DMenuInterpretJoypad: ; 24270 and a ret -.set_bit_7: ; 24299 +.set_bit_7 ; 24299 ld hl, w2DMenuFlags2 set 7, [hl] scf @@ -515,7 +515,7 @@ _2DMenuInterpretJoypad: ; 24270 ret ; 24318 -.a_b_start_select: ; 24318 +.a_b_start_select ; 24318 xor a ret ; 2431a @@ -654,7 +654,7 @@ _PushWindow:: ; 24374 ret ; 243cd -.copy: ; 243cd +.copy ; 243cd call GetMenuBoxDims inc b inc c @@ -681,7 +681,7 @@ _PushWindow:: ; 24374 ret ; 243e7 -.ret: ; 243e7 +.ret ; 243e7 ret ; 243e8 @@ -763,7 +763,7 @@ Error_Cant_ExitMenu: ; 2445d ld hl, .Text_NoWindowsAvailableForPopping call PrintText call WaitBGMap -.InfiniteLoop +.InfiniteLoop: jr .InfiniteLoop ; 24468 |