diff options
| -rwxr-xr-x | data/super_palettes.asm | 554 | ||||
| -rw-r--r-- | engine/bank3d/main.asm | 2 |
2 files changed, 402 insertions, 154 deletions
diff --git a/data/super_palettes.asm b/data/super_palettes.asm index 1ede10c0..dc7b4f74 100755 --- a/data/super_palettes.asm +++ b/data/super_palettes.asm @@ -1,153 +1,401 @@ -; palettes for overworlds, title screen, monsters -SuperPalettes: ; 729b9 (1c:69b9) - dr $729b9,$72af9 -Pointer_72af9: ; 72af9 (1c:6af9) - dr $72af9,$72c39 - ;RGB 31,29,31 ; PAL_ROUTE - ;RGB 21,28,11 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_PALLET - ;RGB 25,28,27 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_VIRIDIAN - ;RGB 17,26,3 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_PEWTER - ;RGB 23,25,16 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_CERULEAN - ;RGB 17,20,30 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_LAVENDER - ;RGB 27,20,27 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_VERMILION - ;RGB 30,18,0 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_CELADON - ;RGB 16,30,22 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_FUCHSIA - ;RGB 31,15,22 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_CINNABAR - ;RGB 26,10,6 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_INDIGO - ;RGB 22,14,24 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_SAFFRON - ;RGB 27,27,3 - ;RGB 20,26,31 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_TOWNMAP - ;RGB 20,26,31 - ;RGB 17,23,10 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_LOGO1 - ;RGB 30,30,17 - ;RGB 17,23,10 - ;RGB 21,0,4 - ;RGB 31,29,31 ; PAL_LOGO2 - ;RGB 30,30,17 - ;RGB 18,18,24 - ;RGB 7,7,16 - ;RGB 31,29,31 ; PAL_0F - ;RGB 24,20,30 - ;RGB 11,20,30 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_MEWMON - ;RGB 30,22,17 - ;RGB 16,14,19 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_BLUEMON - ;RGB 18,20,27 - ;RGB 11,15,23 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_REDMON - ;RGB 31,20,10 - ;RGB 26,10,6 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_CYANMON - ;RGB 21,25,29 - ;RGB 14,19,25 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_PURPLEMON - ;RGB 27,22,24 - ;RGB 21,15,23 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_BROWNMON - ;RGB 28,20,15 - ;RGB 21,14,9 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_GREENMON - ;RGB 20,26,16 - ;RGB 9,20,11 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_PINKMON - ;RGB 30,22,24 - ;RGB 28,15,21 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_YELLOWMON - ;RGB 31,28,14 - ;RGB 26,20,0 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_GREYMON - ;RGB 26,21,22 - ;RGB 15,15,18 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_SLOTS1 - ;RGB 26,21,22 - ;RGB 27,20,6 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_SLOTS2 - ;RGB 31,31,17 - ;RGB 25,17,21 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_SLOTS3 - ;RGB 22,31,16 - ;RGB 25,17,21 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_SLOTS4 - ;RGB 16,19,29 - ;RGB 25,17,21 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_BLACK - ;RGB 7,7,7 - ;RGB 2,3,3 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_GREENBAR - ;RGB 30,26,15 - ;RGB 9,20,11 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_YELLOWBAR - ;RGB 30,26,15 - ;RGB 26,20,0 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_REDBAR - ;RGB 30,26,15 - ;RGB 26,10,6 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_BADGE - ;RGB 30,22,17 - ;RGB 11,15,23 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_CAVE - ;RGB 21,14,9 - ;RGB 18,24,22 - ;RGB 3,2,2 - ;RGB 31,29,31 ; PAL_GAMEFREAK - ;RGB 31,28,14 - ;RGB 24,20,10 - ;RGB 3,2,2
\ No newline at end of file +SuperPalettes: + RGB 31, 31, 30 + RGB 23, 26, 19 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 28, 27, 31 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 26, 31, 21 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 23, 23, 22 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 22, 23, 31 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 27, 23, 29 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 25, 16 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 22, 31, 22 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 26, 26 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 15, 14 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 17, 17, 25 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 31, 19 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 20, 26, 31 + RGB 17, 23, 10 + RGB 3, 2, 2 + + RGB 31, 31, 30 + RGB 30, 30, 17 + RGB 21, 0, 4 + RGB 21, 0, 4 + + RGB 31, 31, 30 + RGB 30, 30, 17 + RGB 18, 18, 24 + RGB 7, 7, 16 + + RGB 31, 31, 30 + RGB 24, 20, 30 + RGB 11, 20, 30 + RGB 3, 2, 2 + + RGB 31, 31, 30 + RGB 31, 30, 22 + RGB 27, 16, 16 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 21, 22, 31 + RGB 9, 10, 20 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 24, 11 + RGB 26, 9, 6 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 26, 28, 31 + RGB 7, 24, 28 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 27, 22, 30 + RGB 22, 15, 23 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 26, 23, 18 + RGB 18, 14, 10 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 24, 28, 18 + RGB 13, 21, 15 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 24, 26 + RGB 31, 18, 21 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 31, 19 + RGB 28, 23, 9 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 25, 25, 18 + RGB 16, 16, 14 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 27, 22, 30 + RGB 26, 9, 6 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 23, 26 + RGB 29, 29, 8 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 23, 31, 20 + RGB 29, 29, 8 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 23, 29, 31 + RGB 29, 29, 8 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 6, 6, 6 + RGB 6, 6, 6 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 31, 19 + RGB 0, 21, 0 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 31, 19 + RGB 28, 23, 9 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 31, 19 + RGB 26, 9, 6 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 20, 15, 11 + RGB 22, 21, 20 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 20, 15, 11 + RGB 22, 21, 20 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 28, 24, 14 + RGB 20, 20, 11 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 31, 30, 22 + RGB 23, 27, 31 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 28, 23, 9 + RGB 18, 14, 10 + RGB 6, 6, 6 + + RGB 31, 31, 30 + RGB 16, 16, 16 + RGB 31, 25, 9 + RGB 6, 6, 6 + +Pointer_72af9: + RGB 31, 31, 31 + RGB 16, 31, 4 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 23, 17, 31 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 19, 31, 0 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 18, 18, 15 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 5, 8, 31 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 25, 4, 31 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 19, 0 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 5, 31, 5 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 15, 15 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 8, 8 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 11, 8, 31 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 0, 21, 31 + RGB 10, 28, 0 + RGB 1, 1, 1 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 31, 0, 0 + RGB 31, 0, 0 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 7, 7, 25 + RGB 0, 0, 17 + + RGB 31, 31, 31 + RGB 13, 1, 31 + RGB 0, 9, 31 + RGB 1, 1, 1 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 31, 1, 1 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 16, 18, 31 + RGB 0, 1, 25 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 17, 0 + RGB 31, 0, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 16, 26, 31 + RGB 0, 17, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 25, 15, 31 + RGB 19, 0, 22 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 29, 18, 10 + RGB 17, 9, 5 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 17, 31, 11 + RGB 1, 22, 6 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 15, 18 + RGB 31, 0, 6 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 28, 14, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 20, 23, 10 + RGB 11, 11, 5 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 25, 1, 31 + RGB 31, 0, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 4, 19 + RGB 31, 31, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 8, 31, 0 + RGB 31, 31, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 0, 31, 31 + RGB 31, 31, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 3, 3, 3 + RGB 3, 3, 3 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 0, 31, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 31, 18, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 31, 0, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 23, 8, 0 + RGB 17, 14, 11 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 23, 8, 0 + RGB 17, 14, 11 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 19, 0 + RGB 19, 19, 0 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 31, 0 + RGB 11, 23, 31 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 31, 18, 0 + RGB 19, 7, 1 + RGB 3, 3, 3 + + RGB 31, 31, 31 + RGB 9, 9, 9 + RGB 31, 21, 0 + RGB 3, 3, 3 diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm index 3855d096..131f4fca 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d/main.asm @@ -146,7 +146,7 @@ ModifyPikachuHappiness:: ; f430a (3d:430a) ; Increase db 5, 3, 2 ; Gained a level db 5, 3, 2 ; HP restore - db 1, 1, 0 ; Unknown (d = 3) + db 1, 1, 0 ; Used X item db 3, 2, 1 ; Challenged Gym Leader db 1, 1, 0 ; Teach TM/HM db 2, 1, 1 ; Walking around |