Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql

INSTALL.md

@@ -9,7 +9,7 @@ If you run into trouble, ask for help on Discord or IRC (see [README.md](README.
 
 ## Windows
 Windows has instructions for building with three possible terminals, providing 3 different options in case the user stumbles upon unexpected errors.
-- [Windows 10 (WSL1)](#windows-10-wsl1) (**Fastest, highly recommended**, Windows 10 only)
+- [Windows 10/11 (WSL1)](#windows-1011-wsl1) (**Fastest, highly recommended**, Windows 10 and 11 only)
 - [Windows (msys2)](#windows-msys2) (Second fastest)
 - [Windows (Cygwin)](#windows-cygwin) (Slowest)
 
@@ -26,7 +26,7 @@ All of the Windows instructions assume that the default drive is C:\\. If this d
 
 **A note of caution**: As Windows 7 is officially unsupported by Microsoft and Windows 8 has very little usage, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10 instructions.
 
-## Windows 10 (WSL1)
+## Windows 10/11 (WSL1)
 WSL1 is the preferred terminal to build **pokefirered**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL).
 - If WSL (Debian or Ubuntu) is **not installed**, then go to [Installing WSL1](#Installing-WSL1).
 - Otherwise, if WSL is installed, but it **hasn't previously been set up for another decompilation project**, then go to [Setting up WSL1](#Setting-up-WSL1).
@@ -404,21 +404,16 @@ If you aren't in the pokefirered directory already, then **change directory** to
 ```bash
 cd pokefirered
 ```
-To build **pokefirered.gba** for the first time and confirm it matches the official ROM image (Note: to speed up builds, see [Parallel builds](#parallel-builds)):
+To build **pokefirered.gba** (Note: to speed up builds, see [Parallel builds](#parallel-builds)):
 ```bash
-make compare
+make
 ```
-If an OK is returned, then the installation went smoothly.
+If it has built successfully you will have the output file **pokefirered.gba** in your project folder.
 <details>
 <summary>Note for Windows...</summary>
 > If you switched terminals since the last build (e.g. from msys2 to WSL1), you must run `make clean-tools` once before any subsequent `make` commands.
 </details>
 
-To build **pokefirered.gba** with your changes:
-```bash
-make
-```
-
 ## Build pokeleafgreen and REV1
 Pokemon FireRed and LeafGreen were both released together. As such, this project is capable of building both ROMs. To do so, simply run
 ```bash
@@ -449,11 +444,20 @@ Replace `<output of nproc>` with the number that the `nproc` command returned.
 
 `nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)).
 
-## Debug info
+## Compare ROM to the original
 
-To build **pokefirered.elf** with enhanced debug info:
+For contributing, or if you'd simply like to verify that your ROM is identical to the original game, run:
 ```bash
-make DINFO=1
+make compare  # or compare_leafgreen, compare_firered_rev1, compare_leafgreen_rev1
+```
+If it matches, you will see the following at the end of the output:
+```bash
+pokefirered.gba: OK
+```
+If there are any changes from the original game, you will instead see:
+```bash
+pokefirered.gba: FAILED
+shasum: WARNING: 1 computed checksum did NOT match
 ```
 
 ## devkitARM's C compiler
@@ -548,4 +552,4 @@ To compile the `modern` target with this toolchain, the subdirectories `lib`, `i
 
 * [porymap](https://github.com/huderlem/porymap) for viewing and editing maps
 * [poryscript](https://github.com/huderlem/poryscript) for scripting ([VS Code extension](https://marketplace.visualstudio.com/items?itemName=karathan.poryscript))
-* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps
+* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps

constants/m4a_constants.inc

@@ -1,12 +1,43 @@
 	.equiv ID_NUMBER, 0x68736d53
 
 	.equiv PCM_DMA_BUF_SIZE, 1584
+	.equiv MAX_DIRECTSOUND_CHANNELS, 12
+
+	.equiv C_V, 0x40
 
 	.equiv TONEDATA_TYPE_CGB, 0x07
 	.equiv TONEDATA_TYPE_FIX, 0x08
+	.equiv TONEDATA_TYPE_REV, 0x10
+	.equiv TONEDATA_TYPE_CMP, 0x20
 	.equiv TONEDATA_TYPE_SPL, 0x40 @ key split
 	.equiv TONEDATA_TYPE_RHY, 0x80 @ rhythm
 
+	.equiv TONEDATA_P_S_PAN,  0xc0
+
+	.equiv SOUND_CHANNEL_SF_START,       0x80
+	.equiv SOUND_CHANNEL_SF_STOP,        0x40
+	.equiv SOUND_CHANNEL_SF_SPECIAL,     0x20
+	.equiv SOUND_CHANNEL_SF_LOOP,        0x10
+	.equiv SOUND_CHANNEL_SF_IEC,         0x04
+	.equiv SOUND_CHANNEL_SF_ENV,         0x03
+	.equiv SOUND_CHANNEL_SF_ENV_ATTACK,  0x03
+	.equiv SOUND_CHANNEL_SF_ENV_DECAY,   0x02
+	.equiv SOUND_CHANNEL_SF_ENV_SUSTAIN, 0x01
+	.equiv SOUND_CHANNEL_SF_ENV_RELEASE, 0x00
+	.equiv SOUND_CHANNEL_SF_ON, (SOUND_CHANNEL_SF_START | SOUND_CHANNEL_SF_STOP | SOUND_CHANNEL_SF_IEC | SOUND_CHANNEL_SF_ENV)
+
+	.equiv CGB_CHANNEL_MO_PIT, 0x02
+	.equiv CGB_CHANNEL_MO_VOL, 0x01
+
+	.equiv WAVE_DATA_FLAG_LOOP, 0xC0
+
+	.equiv MPT_FLG_VOLSET, 0x01
+	.equiv MPT_FLG_VOLCHG, 0x03
+	.equiv MPT_FLG_PITSET, 0x04
+	.equiv MPT_FLG_PITCHG, 0x0C
+	.equiv MPT_FLG_START,  0x40
+	.equiv MPT_FLG_EXIST,  0x80
+
 	.macro struct_begin
 	.struct 0
 	.endm
@@ -16,6 +47,28 @@
 	.struct \name + \size
 	.endm
 
+	struct_begin
+	struct_field o_WaveData_type, 2
+	struct_field o_WaveData_d1, 1
+	struct_field o_WaveData_flags, 1
+	struct_field o_WaveData_freq, 4
+	struct_field o_WaveData_loopStart, 4
+	struct_field o_WaveData_size, 4
+	struct_field o_WaveData_data, 0
+	struct_field WaveData_size, 0
+
+	struct_begin
+	struct_field o_ToneData_type, 1
+	struct_field o_ToneData_key, 1
+	struct_field o_ToneData_length, 1
+	struct_field o_ToneData_pan_sweep, 1
+	struct_field o_ToneData_wav, 4
+	struct_field o_ToneData_attack, 1
+	struct_field o_ToneData_decay, 1
+	struct_field o_ToneData_sustain, 1
+	struct_field o_ToneData_release, 1
+	struct_field ToneData_size, 0
+
 	struct_begin
 	struct_field o_SoundInfo_ident, 4
 	struct_field o_SoundInfo_pcmDmaCounter, 1
@@ -32,8 +85,8 @@
 	struct_field o_SoundInfo_pcmFreq, 4
 	struct_field o_SoundInfo_divFreq, 4
 	struct_field o_SoundInfo_cgbChans, 4
-	struct_field o_SoundInfo_func, 4
-	struct_field o_SoundInfo_intp, 4
+	struct_field o_SoundInfo_MPlayMainHead, 4
+	struct_field o_SoundInfo_musicPlayerHead, 4
 	struct_field o_SoundInfo_CgbSound, 4
 	struct_field o_SoundInfo_CgbOscOff, 4
 	struct_field o_SoundInfo_MidiKeyToCgbFreq, 4
@@ -41,12 +94,12 @@
 	struct_field o_SoundInfo_plynote, 4
 	struct_field o_SoundInfo_ExtVolPit, 4
 	struct_field o_SoundInfo_gap2, 16
-	struct_field o_SoundInfo_chans, 768
+	struct_field o_SoundInfo_chans, MAX_DIRECTSOUND_CHANNELS * 64
 	struct_field o_SoundInfo_pcmBuffer, PCM_DMA_BUF_SIZE * 2
 	struct_field SoundInfo_size, 0
 
 	struct_begin
-	struct_field o_SoundChannel_status, 1
+	struct_field o_SoundChannel_statusFlags, 1
 	struct_field o_SoundChannel_type, 1
 	struct_field o_SoundChannel_rightVolume, 1
 	struct_field o_SoundChannel_leftVolume, 1
@@ -54,29 +107,29 @@
 	struct_field o_SoundChannel_decay, 1
 	struct_field o_SoundChannel_sustain, 1
 	struct_field o_SoundChannel_release, 1
-	struct_field o_SoundChannel_ky, 1
-	struct_field o_SoundChannel_ev, 1
-	struct_field o_SoundChannel_er, 1
-	struct_field o_SoundChannel_el, 1
-	struct_field o_SoundChannel_iev, 1
-	struct_field o_SoundChannel_iel, 1
-	struct_field o_SoundChannel_d1, 1
-	struct_field o_SoundChannel_d2, 1
-	struct_field o_SoundChannel_gt, 1
-	struct_field o_SoundChannel_mk, 1
-	struct_field o_SoundChannel_ve, 1
-	struct_field o_SoundChannel_pr, 1
-	struct_field o_SoundChannel_rp, 1
-	struct_field o_SoundChannel_d3, 3
-	struct_field o_SoundChannel_ct, 4
+	struct_field o_SoundChannel_key, 1
+	struct_field o_SoundChannel_envelopeVolume, 1
+	struct_field o_SoundChannel_envelopeVolumeRight, 1
+	struct_field o_SoundChannel_envelopeVolumeLeft, 1
+	struct_field o_SoundChannel_pseudoEchoVolume, 1
+	struct_field o_SoundChannel_pseudoEchoLength, 1
+	struct_field o_SoundChannel_dummy1, 1
+	struct_field o_SoundChannel_dummy2, 1
+	struct_field o_SoundChannel_gateTime, 1
+	struct_field o_SoundChannel_midiKey, 1
+	struct_field o_SoundChannel_velocity, 1
+	struct_field o_SoundChannel_priority, 1
+	struct_field o_SoundChannel_rhythmPan, 1
+	struct_field o_SoundChannel_dummy3, 3
+	struct_field o_SoundChannel_count, 4
 	struct_field o_SoundChannel_fw, 4
-	struct_field o_SoundChannel_freq, 4
+	struct_field o_SoundChannel_frequency, 4
 	struct_field o_SoundChannel_wav, 4
-	struct_field o_SoundChannel_cp, 4
+	struct_field o_SoundChannel_currentPointer, 4
 	struct_field o_SoundChannel_track, 4
-	struct_field o_SoundChannel_pp, 4
-	struct_field o_SoundChannel_np, 4
-	struct_field o_SoundChannel_d4, 4
+	struct_field o_SoundChannel_prevChannelPointer, 4
+	struct_field o_SoundChannel_nextChannelPointer, 4
+	struct_field o_SoundChannel_dummy4, 4
 	struct_field o_SoundChannel_xpi, 2
 	struct_field o_SoundChannel_xpc, 2
 	struct_field SoundChannel_size, 0
@@ -112,8 +165,8 @@
 	struct_field o_MusicPlayerTrack_lfoDelay, 1
 	struct_field o_MusicPlayerTrack_lfoDelayC, 1
 	struct_field o_MusicPlayerTrack_priority, 1
-	struct_field o_MusicPlayerTrack_echoVolume, 1
-	struct_field o_MusicPlayerTrack_echoLength, 1
+	struct_field o_MusicPlayerTrack_pseudoEchoVolume, 1
+	struct_field o_MusicPlayerTrack_pseudoEchoLength, 1
 	struct_field o_MusicPlayerTrack_chan, 4
 	struct_field o_MusicPlayerTrack_ToneData_type, 1
 	struct_field o_MusicPlayerTrack_ToneData_key, 1
@@ -159,41 +212,41 @@
 	struct_field MusicPlayerInfo_size, 0
 
 	struct_begin
-	struct_field o_CgbChannel_sf, 1
-	struct_field o_CgbChannel_ty, 1
+	struct_field o_CgbChannel_statusFlags, 1
+	struct_field o_CgbChannel_type, 1
 	struct_field o_CgbChannel_rightVolume, 1
 	struct_field o_CgbChannel_leftVolume, 1
-	struct_field o_CgbChannel_at, 1
-	struct_field o_CgbChannel_de, 1
-	struct_field o_CgbChannel_su, 1
-	struct_field o_CgbChannel_re, 1
-	struct_field o_CgbChannel_ky, 1
-	struct_field o_CgbChannel_ev, 1
-	struct_field o_CgbChannel_eg, 1
-	struct_field o_CgbChannel_ec, 1
-	struct_field o_CgbChannel_echoVolume, 1
-	struct_field o_CgbChannel_echoLength, 1
-	struct_field o_CgbChannel_d1, 1
-	struct_field o_CgbChannel_d2, 1
-	struct_field o_CgbChannel_gt, 1
-	struct_field o_CgbChannel_mk, 1
-	struct_field o_CgbChannel_ve, 1
-	struct_field o_CgbChannel_pr, 1
-	struct_field o_CgbChannel_rp, 1
-	struct_field o_CgbChannel_d3, 3
-	struct_field o_CgbChannel_d5, 1
-	struct_field o_CgbChannel_sg, 1
+	struct_field o_CgbChannel_attack, 1
+	struct_field o_CgbChannel_decay, 1
+	struct_field o_CgbChannel_sustain, 1
+	struct_field o_CgbChannel_release, 1
+	struct_field o_CgbChannel_key, 1
+	struct_field o_CgbChannel_envelopeVolume, 1
+	struct_field o_CgbChannel_envelopeGoal, 1
+	struct_field o_CgbChannel_envelopeCounter, 1
+	struct_field o_CgbChannel_pseudoEchoVolume, 1
+	struct_field o_CgbChannel_pseudoEchoLength, 1
+	struct_field o_CgbChannel_dummy1, 1
+	struct_field o_CgbChannel_dummy2, 1
+	struct_field o_CgbChannel_gateTime, 1
+	struct_field o_CgbChannel_midiKey, 1
+	struct_field o_CgbChannel_velocity, 1
+	struct_field o_CgbChannel_priority, 1
+	struct_field o_CgbChannel_rhythmPan, 1
+	struct_field o_CgbChannel_dummy3, 3
+	struct_field o_CgbChannel_dummy5, 1
+	struct_field o_CgbChannel_sustainGoal, 1
 	struct_field o_CgbChannel_n4, 1
 	struct_field o_CgbChannel_pan, 1
 	struct_field o_CgbChannel_panMask, 1
-	struct_field o_CgbChannel_mo, 1
-	struct_field o_CgbChannel_le, 1
-	struct_field o_CgbChannel_sw, 1
-	struct_field o_CgbChannel_fr, 4
-	struct_field o_CgbChannel_wp, 4
-	struct_field o_CgbChannel_cp, 4
-	struct_field o_CgbChannel_tp, 4
-	struct_field o_CgbChannel_pp, 4
-	struct_field o_CgbChannel_np, 4
-	struct_field o_CgbChannel_d4, 8
+	struct_field o_CgbChannel_modify, 1
+	struct_field o_CgbChannel_length, 1
+	struct_field o_CgbChannel_sweep, 1
+	struct_field o_CgbChannel_frequency, 4
+	struct_field o_CgbChannel_wavePointer, 4
+	struct_field o_CgbChannel_currentPointer, 4
+	struct_field o_CgbChannel_track, 4
+	struct_field o_CgbChannel_prevChannelPointer, 4
+	struct_field o_CgbChannel_nextChannelPointer, 4
+	struct_field o_CgbChannel_dummy4, 8
 	struct_field CgbChannel_size, 0

data/text/new_game_intro.inc

@@ -124,41 +124,41 @@ gNameChoice_Momo::
 gNameChoice_Suzi::
     .string "SUZI$"
 
-gNewGame_HelpDocs1::
+gControlsGuide_Text_Intro::
     .string "The various buttons will be explained in\n"
     .string "the order of their importance.$"
 
-gNewGame_HelpDocs2::
+gControlsGuide_Text_DPad::
     .string "Moves the main character.\n"
     .string "Also used to choose various data\n"
     .string "headings.$"
 
-gNewGame_HelpDocs3::
+gControlsGuide_Text_AButton::
     .string "Used to confirm a choice, check\n"
     .string "things, chat, and scroll text.$"
 
-gNewGame_HelpDocs4::
+gControlsGuide_Text_BButton::
     .string "Used to exit, cancel a choice,\n"
     .string "and cancel a mode.$"
 
-gNewGame_HelpDocs5::
+gControlsGuide_Text_StartButton::
     .string "Press this button to open the\n"
     .string "MENU.$"
 
-gNewGame_HelpDocs6::
+gControlsGuide_Text_SelectButton::
     .string "Used to shift items and to use\n"
     .string "a registered item.$"
 
-gNewGame_HelpDocs7::
+gControlsGuide_Text_LRButtons::
     .string "If you need help playing the\n"
     .string "game, or on how to do things,\n"
     .string "press the L or R Button.$"
 
-gOakText_AskPlayerGender::
+gOakSpeech_Text_AskPlayerGender::
     .string "Now tell me. Are you a boy?\n"
     .string "Or are you a girl?$"
 
-gNewGameAdventureIntro1::
+gPikachuIntro_Text_Page1::
     .string "In the world which you are about to\n"
     .string "enter, you will embark on a grand\n"
     .string "adventure with you as the hero.\n"
@@ -168,7 +168,7 @@ gNewGameAdventureIntro1::
     .string "or caves. Gather information and\n"
     .string "hints from every source.$"
 
-gNewGameAdventureIntro2::
+gPikachuIntro_Text_Page2::
     .string "New paths will open to you by helping\n"
     .string "people in need, overcoming challenges,\n"
     .string "and solving mysteries.\n"
@@ -177,7 +177,7 @@ gNewGameAdventureIntro2::
     .string "others and attacked by wild creatures.\n"
     .string "Be brave and keep pushing on.$"
 
-gNewGameAdventureIntro3::
+gPikachuIntro_Text_Page3::
     .string "Through your adventure, we hope\n"
     .string "that you will interact with all sorts\n"
     .string "of people and achieve personal growth.\n"
@@ -186,49 +186,58 @@ gNewGameAdventureIntro3::
     .string "Press the A Button, and let your\n"
     .string "adventure begin!$"
 
-gOakText_WelcomeToTheWorld::
+gOakSpeech_Text_WelcomeToTheWorld::
     .string "Hello, there!\n"
-    .string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n"
+    .string "Glad to meet you!\p"
+    .string "Welcome to the world of POKéMON!\p"
+    .string "My name is OAK.\p"
+    .string "People affectionately refer to me\n"
     .string "as the POKéMON PROFESSOR.\p$"
 
-gOakText_WorldInhabited1::
+gOakSpeech_Text_ThisWorld::
     .string "This world…$"
 
-gOakText_WorldInhabited2::
+gOakSpeech_Text_IsInhabitedFarAndWide::
     .string "…is inhabited far and wide by\n"
     .string "creatures called POKéMON.\p$"
 
-gOakText_PetsBattlingStudy::
+gOakSpeech_Text_IStudyPokemon::
     .string "For some people, POKéMON are pets.\n"
-    .string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$"
+    .string "Others use them for battling.\p"
+    .string "As for myself…\p"
+    .string "I study POKéMON as a profession.\p$"
 
-gOakText_TellMeALittleAboutYourself::
+gOakSpeech_Text_TellMeALittleAboutYourself::
     .string "But first, tell me a little about\n"
     .string "yourself.\p$"
 
-gOakText_AskPlayerName::
+gOakSpeech_Text_YourNameWhatIsIt::
     .string "Let's begin with your name.\n"
     .string "What is it?\p$"
 
-gOakText_FinalizePlayerName::
+gOakSpeech_Text_SoYourNameIsPlayer::
     .string "Right…\n"
     .string "So your name is {PLAYER}.$"
 
-gOakText_IntroduceRival::
-    .string "This is my grandson.\pHe's been your rival since you both\n"
-    .string "were babies.\p…Erm, what was his name now?$"
+gOakSpeech_Text_WhatWasHisName::
+    .string "This is my grandson.\p"
+    .string "He's been your rival since you both\n"
+    .string "were babies.\p"
+    .string "…Erm, what was his name now?$"
 
-gOakText_AskRivalName::
+gOakSpeech_Text_YourRivalsNameWhatWasIt::
     .string "Your rival's name, what was it now?$"
 
-gOakText_ConfirmRivalName::
+gOakSpeech_Text_ConfirmRivalName::
     .string "…Er, was it {RIVAL}?$"
 
-gOakText_RememberRivalName::
+gOakSpeech_Text_RememberRivalsName::
     .string "That's right! I remember now!\n"
     .string "His name is {RIVAL}!\p$"
 
-gOakText_LegendAboutToUnfold::
-    .string "{PLAYER}!\pYour very own POKéMON legend is\n"
-    .string "about to unfold!\pA world of dreams and adventures\n"
+gOakSpeech_Text_LetsGo::
+    .string "{PLAYER}!\p"
+    .string "Your very own POKéMON legend is\n"
+    .string "about to unfold!\p"
+    .string "A world of dreams and adventures\n"
     .string "with POKéMON awaits! Let's go!$"

graphics/berry_crush/berry_crush.pal

@@ -1,99 +0,0 @@
-JASC-PAL
-0100
-96
-98 172 180
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-156 213 189
-123 180 156
-222 156 255
-172 123 222
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-156 148 172
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-255 238 0
-230 189 0
-180 180 180
-139 139 139
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-156 148 172
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-197 213 246
-255 255 255
-238 238 246
-205 205 213
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-255 180 255
-164 172 172
-98 106 115
-123 131 139
-139 148 156
-148 222 164
-156 189 222
-197 213 246
-180 164 115
-205 189 148
-213 205 172
-230 222 189
-246 238 205
-139 123 74
-74 131 189
-65 74 90
-0 0 0
-148 222 164
-164 230 172
-180 238 189
-197 246 205
-213 255 222
-238 255 238
-255 255 255
-65 180 238
-255 255 255
-0 197 57
-255 255 255
-246 213 0
-255 0 255
-246 238 205
-139 123 74
-255 164 106
-164 172 172
-98 106 115
-123 131 139
-139 148 156
-115 156 189
-156 189 222
-197 213 246
-180 164 115
-205 189 148
-213 205 172
-230 222 189
-246 238 205
-139 123 74
-74 131 189
-65 74 90

graphics/berry_pouch/background.pal

@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 65 90
-255 0 255
-41 57 82
-65 180 164
-255 0 255
-255 0 255
-106 205 197
-164 205 238
-189 238 255
-255 255 205
-180 189 180
-148 148 148
-238 230 172
-106 106 106
-106 156 238
-0 90 131
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-189 213 213
-238 255 255
-222 246 255
-255 255 255
-164 222 255
-16 172 222
-0 82 115
-0 115 139
-0 123 197
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-189 213 213
-238 255 255
-222 246 255
-255 255 255
-164 222 255
-24 82 180
-0 90 131
-24 82 180
-24 82 180

graphics/diploma/diploma.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-123 205 172
-255 0 255
-222 230 139
-205 246 156
-230 222 164
-197 238 172
-205 230 213
-213 246 172
-205 230 164
-238 255 156
-197 238 172
-222 230 238
-222 238 238
-213 246 172
-246 238 172
-238 238 139
-123 205 172
-255 0 255
-255 0 255
-246 246 205
-230 230 148
-230 230 148
-230 230 148
-238 238 164
-222 222 148
-255 238 180
-238 230 164
-238 222 180
-246 246 164
-246 230 131
-246 230 172
-222 238 222

graphics/fame_checker/bg.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-246 222 82
-255 255 156
-246 222 82
-255 238 98
-255 255 213
-255 172 106
-222 148 74
-255 246 222
-156 148 164
-238 230 180
-255 255 213
-123 123 123
-213 213 213
-255 255 255
-106 106 106
-24 98 197
-246 222 82
-172 164 90
-148 156 230
-98 106 180
-123 131 205
-255 255 255
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-115 0 0
-0 255 0
-205 213 213
-238 238 246
-106 106 106

graphics/interface/hold_icons.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-57 205 106
-255 255 255
-213 213 255
-148 148 180
-255 246 156
-222 222 115
-246 82 41
-164 90 82
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-98 98 98

graphics/map_preview/altering_cave/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-65 74 90
-139 205 123
-90 164 98
-213 205 172
-189 172 139
-156 205 164
-230 230 205
-148 213 106
-189 222 197
-148 131 90
-238 230 189
-213 246 255
-164 205 255
-205 230 255
-238 246 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/berry_forest/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 90
-238 238 246
-197 197 98
-180 180 90
-106 115 24
-156 156 49
-197 164 90
-164 131 74
-131 106 65
-213 213 156
-222 238 172
-156 189 115
-131 156 82
-131 123 57
-246 246 246
-189 213 139
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/cerulean_cave/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-49 57 106
-222 205 246
-189 164 205
-156 123 164
-238 230 255
-82 106 123
-123 156 172
-222 230 238
-189 197 205
-164 172 180
-139 172 148
-180 205 189
-115 123 131
-213 238 222
-49 57 74
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/digletts_cave/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-49 57 74
-197 197 205
-189 180 172
-148 148 115
-222 238 246
-90 98 90
-106 148 106
-222 222 180
-189 189 148
-164 164 123
-156 197 123
-115 164 82
-106 106 98
-197 222 156
-74 74 65
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/dotted_hole/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-65 74 90
-238 246 246
-74 156 106
-115 197 115
-156 230 148
-180 189 197
-213 222 230
-230 238 246
-115 123 90
-156 164 123
-197 205 156
-213 222 189
-222 230 197
-213 238 255
-255 255 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/icefall_cave/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-65 74 106
-238 246 246
-82 139 115
-131 180 131
-172 213 164
-205 205 189
-222 222 205
-238 238 222
-115 115 115
-156 156 139
-180 180 156
-197 197 189
-213 213 205
-213 238 255
-255 255 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/lost_cave/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-65 74 90
-98 106 123
-123 131 148
-189 189 164
-164 156 131
-238 238 222
-213 213 197
-213 238 238
-189 213 213
-131 123 98
-213 213 180
-197 222 222
-172 189 230
-189 205 222
-230 230 213
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/monean_chamber/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-74 82 98
-205 213 139
-156 164 82
-123 131 82
-213 189 164
-222 230 164
-115 189 106
-172 213 131
-172 148 123
-213 238 238
-230 205 180
-131 106 98
-180 189 123
-197 230 255
-230 246 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/mt_ember/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-65 74 90
-238 246 246
-222 246 255
-230 230 255
-156 230 148
-205 189 213
-222 205 230
-238 222 246
-131 106 106
-172 148 148
-197 172 172
-222 197 197
-238 213 213
-213 238 255
-255 255 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/mt_moon/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-74 82 98
-230 238 255
-65 131 90
-115 180 115
-156 213 148
-205 205 230
-230 222 255
-222 222 180
-115 106 90
-148 139 98
-172 164 115
-205 197 164
-205 197 164
-205 230 255
-238 230 213
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/pokemon_mansion/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-106 115 131
-213 164 180
-180 131 148
-238 189 205
-230 238 213
-115 82 131
-172 180 172
-131 139 139
-205 213 205
-238 213 238
-238 238 205
-230 222 189
-246 238 164
-222 213 139
-246 246 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/pokemon_tower/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-222 213 246
-213 230 213
-172 180 205
-205 197 156
-180 205 180
-148 164 148
-238 246 238
-238 230 189
-230 238 255
-148 156 180
-255 246 205
-172 164 123
-115 123 148
-197 205 230
-238 246 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/power_plant/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-74 82 98
-255 246 205
-189 180 189
-189 189 222
-230 222 123
-222 205 205
-246 230 230
-139 156 189
-222 238 255
-106 123 156
-213 189 164
-164 156 164
-238 246 255
-255 238 238
-255 255 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/rock_tunnel/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-65 74 90
-238 246 246
-74 156 106
-115 197 115
-156 230 148
-205 205 189
-222 222 205
-238 238 222
-123 123 90
-164 164 123
-197 197 148
-213 213 180
-230 230 197
-213 238 255
-255 255 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/rocket_hideout/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-98 106 123
-156 180 156
-222 213 172
-238 238 246
-246 238 197
-189 156 131
-222 189 164
-213 213 222
-222 238 222
-139 156 139
-197 222 197
-197 230 180
-131 139 156
-238 205 180
-255 255 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/rocket_warehouse/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-98 106 123
-139 180 172
-222 213 172
-238 238 246
-246 238 197
-189 156 131
-222 189 164
-213 213 222
-222 238 222
-139 156 139
-197 222 197
-197 230 180
-131 139 156
-238 205 180
-255 255 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/safari_zone/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-0 0 0
-222 230 213
-222 213 148
-197 230 148
-213 238 164
-123 164 90
-230 246 246
-222 238 246
-213 222 255
-180 222 98
-205 180 115
-205 213 197
-180 156 106
-164 197 90
-222 238 197
-222 246 213
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-189 222 98
-172 205 90
-115 172 65
-222 213 148
-139 197 98
-205 180 115
-205 230 246
-180 156 106
-222 238 246
-189 213 255
-197 230 148

graphics/map_preview/seafoam_islands/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-65 74 90
-156 222 123
-106 180 98
-197 205 172
-172 172 139
-172 222 164
-222 230 205
-164 230 106
-205 238 197
-131 131 90
-238 230 189
-213 246 255
-164 205 255
-205 230 255
-238 246 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/silph_co/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-238 246 246
-213 238 246
-164 205 197
-131 197 123
-197 230 230
-139 180 172
-180 180 205
-131 131 164
-205 205 230
-172 222 172
-197 213 246
-90 164 90
-123 172 164
-205 238 246
-246 246 255
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/map_preview/victory_road/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 0
-74 82 98
-222 238 246
-98 139 106
-131 172 98
-164 205 123
-180 189 197
-205 213 222
-222 230 238
-139 131 74
-172 172 98
-197 197 123
-213 205 148
-222 213 156
-213 230 246
-246 246 246
-0 0 0
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-131 172 98
-164 205 123
-139 131 74
-172 172 98
-197 197 123
-213 205 148
-222 213 156
-148 189 131
-205 213 222
-222 238 246
-98 139 106

graphics/map_preview/viridian_forest/pal.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-255 255 90
-222 246 246
-156 230 148
-115 197 115
-41 106 106
-90 172 123
-197 189 106
-148 139 90
-106 98 74
-205 246 197
-180 213 230
-123 189 205
-90 156 164
-65 131 139
-246 246 255
-32 41 41
-255 255 90
-246 246 255
-74 98 123
-213 213 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/oak_speech/help_docs_palette.pal

@@ -1,67 +0,0 @@
-JASC-PAL
-0100
-64
-16 115 230
-65 139 131
-82 148 139
-106 164 156
-131 180 172
-156 197 189
-180 213 205
-205 230 222
-230 246 238
-255 0 255
-255 0 255
-0 90 16
-255 0 0
-49 82 205
-255 255 255
-32 32 32
-16 115 230
-255 255 164
-255 255 106
-222 222 90
-189 189 74
-156 156 57
-156 156 57
-123 123 49
-90 90 32
-57 57 16
-255 0 0
-255 0 0
-255 0 0
-255 0 0
-255 0 0
-0 0 0
-238 230 172
-115 180 197
-156 213 238
-205 238 246
-246 255 255
-230 246 246
-106 106 106
-74 82 106
-82 98 180
-230 246 246
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 74 139
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-255 0 255
-123 123 123
-172 172 156
-197 197 197
-222 222 222
-238 238 238
-255 255 255