diff options
| author | dannye <33dannye@gmail.com> | 2023-11-21 21:54:53 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-21 21:54:53 -0600 |
| commit | 0ebc2025bc34123193bdf4057cbe18222cde802a (patch) | |
| tree | 8bf23069539bdd9b4f2d48ff86a8828388983569 /data | |
| parent | Don't list unidentified labels in webhook right now (diff) | |
| download | pokeyellow-0ebc2025bc34123193bdf4057cbe18222cde802a.tar.gz pokeyellow-0ebc2025bc34123193bdf4057cbe18222cde802a.tar.xz pokeyellow-0ebc2025bc34123193bdf4057cbe18222cde802a.zip | |
Rename pikachu palette packets
Diffstat (limited to 'data')
| -rw-r--r-- | data/sgb/sgb_packets.asm | 26 | ||||
| -rw-r--r-- | data/sgb/sgb_palettes.asm | 12 | ||||
| -rw-r--r-- | data/text/text_2.asm | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm index ce10172b..f42475ca 100644 --- a/data/sgb/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm @@ -136,19 +136,19 @@ UnknownPacket_72751: ds 8 -PalPacket_Empty: PAL_SET 0, 0, 0, 0 -PalPacket_PartyMenu: PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR -PalPacket_Black: PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK -PalPacket_TownMap: PAL_SET PAL_TOWNMAP, 0, 0, 0 -PalPacket_Pokedex: PAL_SET PAL_BROWNMON, 0, 0, 0 -PalPacket_Slots: PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4 -PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON -PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON -PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0 -PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 -PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON -UnknownPalPacket_72811: PAL_SET PAL_25, PAL_25, PAL_25, PAL_25 -UnknownPalPacket_72821: PAL_SET PAL_25, PAL_27, PAL_25, PAL_25 +PalPacket_Empty: PAL_SET 0, 0, 0, 0 +PalPacket_PartyMenu: PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR +PalPacket_Black: PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK +PalPacket_TownMap: PAL_SET PAL_TOWNMAP, 0, 0, 0 +PalPacket_Pokedex: PAL_SET PAL_BROWNMON, 0, 0, 0 +PalPacket_Slots: PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4 +PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON +PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON +PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0 +PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 +PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON +PalPacket_PikachusBeach: PAL_SET PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH +PalPacket_PikachusBeachTitle: PAL_SET PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH_TITLE, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH PalTrnPacket: PAL_TRN MltReq1Packet: MLT_REQ 1 diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index ba753f6a..2e0b74bf 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -38,9 +38,9 @@ SuperPalettes: RGB 31,31,30, 20,15,11, 22,21,20, 06,06,06 ; PAL_BADGE RGB 31,31,30, 20,15,11, 22,21,20, 06,06,06 ; PAL_CAVE RGB 31,31,30, 28,24,14, 20,20,11, 06,06,06 ; PAL_GAMEFREAK - RGB 31,31,30, 31,30,22, 23,27,31, 06,06,06 ; PAL_25 - RGB 31,31,30, 28,23,09, 18,14,10, 06,06,06 ; PAL_26 - RGB 31,31,30, 16,16,16, 31,25,09, 06,06,06 ; PAL_27 + RGB 31,31,30, 31,30,22, 23,27,31, 06,06,06 ; PAL_PIKACHUS_BEACH + RGB 31,31,30, 28,23,09, 18,14,10, 06,06,06 ; PAL_PIKACHU_PORTRAIT + RGB 31,31,30, 16,16,16, 31,25,09, 06,06,06 ; PAL_PIKACHUS_BEACH_TITLE assert_table_length NUM_SGB_PALS GBCBasePalettes: @@ -83,7 +83,7 @@ GBCBasePalettes: RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_BADGE RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK - RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_25 - RGB 31,31,31, 31,18,00, 19,07,01, 03,03,03 ; PAL_26 - RGB 31,31,31, 09,09,09, 31,21,00, 03,03,03 ; PAL_27 + RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_PIKACHUS_BEACH + RGB 31,31,31, 31,18,00, 19,07,01, 03,03,03 ; PAL_PIKACHU_PORTRAIT + RGB 31,31,31, 09,09,09, 31,21,00, 03,03,03 ; PAL_PIKACHUS_BEACH_TITLE assert_table_length NUM_SGB_PALS diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 2e033caf..df8a26b3 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -1026,7 +1026,7 @@ _NoMovesLeftText:: _MultiHitText:: text "Hit the enemy" line "@" - text_decimal wPlayerNumHits,1,1 + text_decimal wPlayerNumHits, 1, 1 text " times!" prompt |