Fix incorrect GitHub merge
This commit is contained in:
@@ -1,11 +1,12 @@
|
|||||||
pushpc
|
pushpc
|
||||||
|
|
||||||
org $8691B6
|
org $8691B6
|
||||||
|
SpritePrep_Eyegore_bounce:
|
||||||
JSL SpritePrep_EyegoreNew
|
JSL SpritePrep_EyegoreNew
|
||||||
|
|
||||||
org $868839 ; 0xEF
|
org $868839 ; 0xEF
|
||||||
dw SpritePrep_EyegoreNew
|
dw SpritePrep_Eyegore_bounce
|
||||||
dw SpritePrep_EyegoreNew
|
dw SpritePrep_Eyegore_bounce
|
||||||
|
|
||||||
;org $869468 ; These need to go else where
|
;org $869468 ; These need to go else where
|
||||||
;dw #$BFF7 ; SpriteModule_Active_Bank1E_bounce
|
;dw #$BFF7 ; SpriteModule_Active_Bank1E_bounce
|
||||||
|
|||||||
Reference in New Issue
Block a user