diff --git a/Core/symbols.asm b/Core/symbols.asm index 866d5cd..40ee22e 100644 --- a/Core/symbols.asm +++ b/Core/symbols.asm @@ -27,6 +27,12 @@ FishingOrPortalRod: skip 1 base off +; ========================================================= + +function RGBto555(R,G,B) = ((R/8)<<10)|((G/8)<<5)|(B/8) ; zarby +function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<0)) ; kan +function menu_offset(y,x) = (y*64)+(x*2) + ; ========================================================= ; SRAM in Use diff --git a/Oracle_main.asm b/Oracle_main.asm index ad81ef9..8be0603 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -54,7 +54,6 @@ namespace Oracle print "Applying patches to Oracle of Secrets" print "" - incsrc "Util/functions.asm" incsrc "Core/music_macros.asm" incsrc "Core/symbols.asm" diff --git a/Util/functions.asm b/Util/functions.asm deleted file mode 100644 index 04705cc..0000000 --- a/Util/functions.asm +++ /dev/null @@ -1,3 +0,0 @@ -function RGBto555(R,G,B) = ((R/8)<<10)|((G/8)<<5)|(B/8) ; zarby -function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<0)) ; kan -function menu_offset(y,x) = (y*64)+(x*2) \ No newline at end of file