Revert "Merge branch 'master' into FollowingPokemon_Gen1-3"

This reverts commit 63b2bd9a44, reversing changes made to a716f522f3.
2022-07-06 09:02:50 -07:00
1 parent 143b2a51e2
commit 21ec0f0223
@@ -451,6 +451,13 @@ 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
+
+To build **pokeemerald.elf** with enhanced debug info:
+```bash
+make DINFO=1
+```
+
 ## devkitARM's C compiler

 This project supports the `arm-none-eabi-gcc` compiler included with devkitARM. If devkitARM (a.k.a. gba-dev) has already been installed as part of the platform-specific instructions, simply run:
@@ -527,7 +534,7 @@ devkitARM is now installed.

 devkitARM is now installed.

-### Installing devkitARM on Arch Linux
+## Installing devkitARM on Arch Linux
        
 1. Follow [devkitPro's instructions](https://devkitpro.org/wiki/devkitPro_pacman#Customising_Existing_Pacman_Install) to configure `pacman` to download devkitPro packages.
 2. Install `gba-dev`: run the following command as root.
@@ -545,7 +552,7 @@ devkitARM is now installed.

 devkitARM is now installed.

-### Other toolchains
+## Other toolchains

 To build using a toolchain other than devkitARM, override the `TOOLCHAIN` environment variable with the path to your toolchain, which must contain the subdirectory `bin`.
 ```bash
@@ -557,14 +564,6 @@ make TOOLCHAIN="/usr/local/arm-none-eabi"
 ```
 To compile the `modern` target with this toolchain, the subdirectories `lib`, `include`, and `arm-none-eabi` must also be present.

-### Building with debug info under a modern toolchain
-
-To build **pokeemerald.elf** with debug symbols under a modern toolchain:
-```bash
-make modern DINFO=1
-```
-Note that this is not necessary for a non-modern build since those are built with debug symbols by default.
-
 # Useful additional tools

 * [porymap](https://github.com/huderlem/porymap) for viewing and editing maps
@@ -107,7 +107,7 @@ LIBPATH := -L ../../tools/agbcc/lib
 LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
 else
 CC1              = $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
-override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
+override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -g
 ROM := $(MODERN_ROM_NAME)
 OBJ_DIR := $(MODERN_OBJ_DIR_NAME)
 LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"
@@ -1729,6 +1729,28 @@
 	.2byte \quantity
 	.endm

+	@ sets an NPC up to follow the player
+	.macro setfollower localId:req, flags:req
+	.byte 0xe3
+	.byte \localId
+	.2byte \flags
+	.endm
+	
+	@ remove the following NPC (assumes there will only ever be one)
+	.macro destroyfollower
+	.byte 0xe4
+	.endm
+	
+	@ makes the player and follower face one another
+	.macro facefollower
+	.byte 0xe5
+	.endm
+	
+	@ checks if you have a follower. returns the result to VAR_RESULT
+	.macro checkfollower
+	.byte 0xe6
+	.endm
+

@ Supplementary

@@ -100,9 +100,9 @@
 	special CallTrainerHillFunction
 	.endm

-	@ Set the challenge mode to HILL_MODE_* (Normal, Variety, Unique, or Expert)
-	.macro trainerhill_setmode mode:req
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_MODE
-	copyvar VAR_0x8005, \mode
+	@ Set the challenge mode to HILL_TAG_* (Normal, Variety, Unique, or Expert)
+	.macro trainerhill_settag tag:req
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
+	copyvar VAR_0x8005, \tag
 	special CallTrainerHillFunction
 	.endm
@@ -53,6 +53,7 @@
 #include "constants/union_room.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
+#include "constants/follow_me.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
@@ -72,6 +72,9 @@ gFieldEffectScriptPointers::
 	.4byte gFieldEffectScript_RayquazaSpotlight         @ FLDEFF_RAYQUAZA_SPOTLIGHT
 	.4byte gFieldEffectScript_DestroyDeoxysRock         @ FLDEFF_DESTROY_DEOXYS_ROCK
 	.4byte gFieldEffectScript_MoveDeoxysRock            @ FLDEFF_MOVE_DEOXYS_ROCK
+	.4byte gFieldEffectScript_TracksSlither             @ FLDEFF_TRACKS_SLITHER
+	.4byte gFieldEffectScript_TracksBug                 @ FLDEFF_TRACKS_BUG
+	.4byte gFieldEffectScript_TracksSpot                @ FLDEFF_TRACKS_SPOT

 gFieldEffectScript_ExclamationMarkIcon1::
 	field_eff_callnative FldEff_ExclamationMarkIcon
@@ -129,6 +132,18 @@ gFieldEffectScript_SandFootprints::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
 	field_eff_end
    
+gFieldEffectScript_TracksBug:: @ 82DBB42
+	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksBug
+	field_eff_end
+
+gFieldEffectScript_TracksSpot:: @ 82DBB42
+	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSpot
+	field_eff_end
+
+gFieldEffectScript_TracksSlither:: @ 82DBBFF
+	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSlither
+	field_eff_end
+
 gFieldEffectScript_JumpBigSplash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
 	field_eff_end
@@ -5,10 +5,6 @@
 .set LOCALID_PLAYER, 13
 .set LOCALID_OPPONENT, 15

-.set NO_DRAW,       0
-.set DRAW_TRAINER,  1
-.set DRAW_TUCKER,   2
-
 BattleFrontier_BattleDomeBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_OnFrame
@@ -16,6 +12,10 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_OnResume
 	.byte 0

+	.set NO_DRAW,       0
+	.set DRAW_TRAINER,  1
+	.set DRAW_TUCKER,   2
+
 BattleFrontier_BattleDomeBattleRoom_OnTransition:
 	dome_setopponentgfx
 	frontier_get FRONTIER_DATA_BATTLE_NUM
@@ -364,8 +364,7 @@ BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2:
@ Unused
 BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit:
 	.string "You appear to have reached the limit\n"
-	.string "for Battle Points…\p"
-	.string "Please exchange some Battle Points\n"
+	.string "for Battle Points…\pPlease exchange some Battle Points\n"
 	.string "for prizes, then return…$"

 BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting:
@@ -22,20 +22,18 @@ BattleFrontier_Lounge2_EventScript_AlreadyMetManiac::
 	end

 BattleFrontier_Lounge2_EventScript_GiveAdvice::
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_SINGLES, BattleFrontier_Lounge2_EventScript_BufferSingle
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_DOUBLES, BattleFrontier_Lounge2_EventScript_BufferDouble
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_MULTIS, BattleFrontier_Lounge2_EventScript_BufferMulti
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_LINK, BattleFrontier_Lounge2_EventScript_BufferMultiLink
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_DOME, BattleFrontier_Lounge2_EventScript_BufferBattleDome
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_FACTORY, BattleFrontier_Lounge2_EventScript_BufferBattleFactory
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PALACE, BattleFrontier_Lounge2_EventScript_BufferBattlePalace
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_ARENA, BattleFrontier_Lounge2_EventScript_BufferBattleArena
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PIKE, BattleFrontier_Lounge2_EventScript_BufferBattlePike
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PYRAMID, BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
-@ <= FRONTIER_MANIAC_TOWER_LINK is any Battle Tower mode
-	call_if_le VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_LINK, BattleFrontier_Lounge2_EventScript_BattleTowerNews
-@ >= FRONTIER_MANIAC_DOME is any facility other than Battle Tower
-	call_if_ge VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_DOME, BattleFrontier_Lounge2_EventScript_FacilityNews
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 0, BattleFrontier_Lounge2_EventScript_BufferSingle
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 1, BattleFrontier_Lounge2_EventScript_BufferDouble
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 2, BattleFrontier_Lounge2_EventScript_BufferMulti
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 3, BattleFrontier_Lounge2_EventScript_BufferMultiLink
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 4, BattleFrontier_Lounge2_EventScript_BufferBattleDome
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 5, BattleFrontier_Lounge2_EventScript_BufferBattleFactory
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 6, BattleFrontier_Lounge2_EventScript_BufferBattlePalace
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 7, BattleFrontier_Lounge2_EventScript_BufferBattleArena
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 8, BattleFrontier_Lounge2_EventScript_BufferBattlePike
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 9, BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
+	call_if_le VAR_FRONTIER_MANIAC_FACILITY, 3, BattleFrontier_Lounge2_EventScript_BattleTowerNews
+	call_if_ge VAR_FRONTIER_MANIAC_FACILITY, 4, BattleFrontier_Lounge2_EventScript_FacilityNews
 	special ShowFrontierManiacMessage
 	waitmessage
 	waitbuttonpress
@@ -91,6 +91,19 @@
      "trainer_sight_or_berry_tree_id": "0",
      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita",
      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "FLAG_UNUSED_0x020"
    }
  ],
  "warp_events": [
@@ -29,6 +29,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts::
 LittlerootTown_ProfessorBirchsLab_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
 	call ProfBirch_EventScript_UpdateLocation
+	setflag FLAG_UNUSED_0x020
 	goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout
 	goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout
 	goto_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter
@@ -157,7 +157,7 @@ TrainerHill_Entrance_EventScript_ChooseChallenge::
 	switch VAR_RESULT
 	case 4, TrainerHill_Entrance_EventScript_CancelEntry
 	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
-	trainerhill_setmode VAR_RESULT
+	trainerhill_settag VAR_RESULT
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
@@ -227,6 +227,10 @@ gScriptCmdTable::
 	.4byte ScrCmd_warpwhitefade             @ 0xe0
 	.4byte ScrCmd_buffercontestname         @ 0xe1
 	.4byte ScrCmd_bufferitemnameplural      @ 0xe2
+	.4byte ScrCmd_setfollower				@ 0xe3
+	.4byte ScrCmd_destroyfollower			@ 0xe4
+	.4byte ScrCmd_facefollower				@ 0xe5
+	.4byte ScrCmd_checkfollower				@ 0xe6

 gScriptCmdTableEnd::
 	.4byte ScrCmd_nop
@@ -287,3 +287,69 @@ EventScript_FailSweetScent::

 Text_FailSweetScent:
 	.string "Looks like there's nothing here…$"
+    
+FollowerPositionFixScript::
+	setvar 0x8000 0x0
+	callnative FollowerTrainerSightingPositionFix
+	compare VAR_RESULT 0xFFFF
+	goto_if_eq FollowerPositionFixScriptReturn
+	call WalkCall
+	setvar 0x8000 0x1
+	callnative FollowerTrainerSightingPositionFix
+FollowerPositionFixScriptReturn:
+	return
+    
+FollowerIntoPlayerScript::
+	setvar 0x8000 0x0
+	callnative FollowerIntoPlayer
+	compare VAR_RESULT 0xFFFF
+	goto_if_eq FollowerPositionFixScriptReturn
+	setvar 0x8005 0xFE  @ follower
+	call WalkCall
+	setvar 0x8000 0x1
+	callnative FollowerIntoPlayer
+	return
+    
+WalkCall:
+	compare VAR_RESULT 0x0
+	call_if_eq WalkDownCall
+	compare VAR_RESULT 0x1
+	call_if_eq WalkUpCall
+	compare VAR_RESULT 0x2
+	call_if_eq WalkLeftCall
+	compare VAR_RESULT 0x3
+	call_if_eq WalkRightCall
+	waitmovement 0x8005
+	return
+	
+WalkDownCall:
+	applymovement 0x8005 WalkDown
+	return
+
+WalkUpCall:
+	applymovement 0x8005 WalkUp
+	return
+
+WalkLeftCall:
+	applymovement 0x8005 WalkLeft
+	return
+
+WalkRightCall:
+	applymovement 0x8005 WalkRight
+	return
+    
+WalkDown:
+    walk_down
+    step_end 
+
+WalkUp:
+    walk_up
+    step_end
+
+WalkLeft:
+    walk_left
+    step_end
+
+WalkRight:
+    walk_right
+    step_end
@@ -12,7 +12,7 @@ MysteryGiftScript_AlteringCave_:
 	release
 	end

-sText_MysteryGiftAlteringCave:
+sText_MysteryGiftAlteringCave::
 	.string "Thank you for using the MYSTERY\n"
 	.string "GIFT System.\p"
 	.string "There appears to be a rumor about\n"
@@ -4,192 +4,145 @@ gText_HighlyAppealingMove::
 	.string "A highly appealing move.$"

 gText_UserMoreEasilyStartled::
-	.string "After this move, the user is\n"
-	.string "more easily startled.$"
+	.string "After this move, the user is\nmore easily startled.$"

 gText_GreatAppealButNoMoreToEnd::
-	.string "Makes a great appeal, but\n"
-	.string "allows no more to the end.$"
+	.string "Makes a great appeal, but\nallows no more to the end.$"

 gText_UsedRepeatedlyWithoutBoringJudge::
-	.string "Can be repeatedly used\n"
-	.string "without boring the JUDGE.$"
+	.string "Can be repeatedly used\nwithout boring the JUDGE.$"

 gText_AvoidStartledByOthersOnce::
-	.string "Can avoid being startled\n"
-	.string "by others once.$"
+	.string "Can avoid being startled\nby others once.$"

 gText_AvoidStartledByOthers::
-	.string "Can avoid being startled\n"
-	.string "by others.$"
+	.string "Can avoid being startled\nby others.$"

 gText_AvoidStartledByOthersLittle::
-	.string "Can avoid being startled\n"
-	.string "by others a little.$"
+	.string "Can avoid being startled\nby others a little.$"

 gText_UserLessLikelyStartled::
-	.string "After this move, the user is\n"
-	.string "less likely to be startled.$"
+	.string "After this move, the user is\nless likely to be startled.$"

 gText_SlightlyStartleFrontMon::
-	.string "Slightly startles the\n"
-	.string "POKéMON in front.$"
+	.string "Slightly startles the\nPOKéMON in front.$"

 gText_SlightlyStartleAppealed::
-	.string "Slightly startles those\n"
-	.string "that have made appeals.$"
+	.string "Slightly startles those\nthat have made appeals.$"

 gText_StartleAppealedBeforeUser::
-	.string "Startles the POKéMON that\n"
-	.string "appealed before the user.$"
+	.string "Startles the POKéMON that\nappealed before the user.$"

 gText_StartleAllAppealed::
-	.string "Startles all POKéMON that\n"
-	.string "have done their appeals.$"
+	.string "Startles all POKéMON that\nhave done their appeals.$"

 gText_BadlyStartleFrontMon::
-	.string "Badly startles the\n"
-	.string "POKéMON in front.$"
+	.string "Badly startles the\nPOKéMON in front.$"

 gText_BadlyStartleAppealed::
-	.string "Badly startles those that\n"
-	.string "have made appeals.$"
+	.string "Badly startles those that\nhave made appeals.$"

 gText_StartleAppealedBeforeUser2::
-	.string "Startles the POKéMON that\n"
-	.string "appealed before the user.$"
+	.string "Startles the POKéMON that\nappealed before the user.$"

 gText_StartleAllAppealed2::
-	.string "Startles all POKéMON that\n"
-	.string "have done their appeals.$"
+	.string "Startles all POKéMON that\nhave done their appeals.$"

 gText_ShiftJudgesAttentionFromOthers::
-	.string "Shifts the JUDGE's\n"
-	.string "attention from others.$"
+	.string "Shifts the JUDGE's\nattention from others.$"

 gText_StartleMonHasJudgesAttention::
-	.string "Startles the POKéMON that\n"
-	.string "has the JUDGE's attention.$"
+	.string "Startles the POKéMON that\nhas the JUDGE's attention.$"

 gText_JamOthersMissesTurn::
-	.string "Jams the others, and misses\n"
-	.string "one turn of appeals.$"
+	.string "Jams the others, and misses\none turn of appeals.$"

 gText_StartleMonsMadeSameTypeAppeal::
-	.string "Startles POKéMON that\n"
-	.string "made a same-type appeal.$"
+	.string "Startles POKéMON that\nmade a same-type appeal.$"

 gText_BadlyStartleCoolAppeals::
-	.string "Badly startles POKéMON\n"
-	.string "that made COOL appeals.$"
+	.string "Badly startles POKéMON\nthat made COOL appeals.$"

 gText_BadlyStartleBeautyAppeals::
-	.string "Badly startles POKéMON\n"
-	.string "that made BEAUTY appeals.$"
+	.string "Badly startles POKéMON\nthat made BEAUTY appeals.$"

 gText_BadlyStartleCuteAppeals::
-	.string "Badly startles POKéMON\n"
-	.string "that made CUTE appeals.$"
+	.string "Badly startles POKéMON\nthat made CUTE appeals.$"

 gText_BadlyStartleSmartAppeals::
-	.string "Badly startles POKéMON\n"
-	.string "that made SMART appeals.$"
+	.string "Badly startles POKéMON\nthat made SMART appeals.$"

 gText_BadlyStartleToughAppeals::
-	.string "Badly startles POKéMON\n"
-	.string "that made TOUGH appeals.$"
+	.string "Badly startles POKéMON\nthat made TOUGH appeals.$"

 gText_MakeMonAfterUserNervous::
-	.string "Makes one POKéMON after\n"
-	.string "the user nervous.$"
+	.string "Makes one POKéMON after\nthe user nervous.$"

 gText_MakeAllMonsAfterUserNervous::
-	.string "Makes all POKéMON after\n"
-	.string "the user nervous.$"
+	.string "Makes all POKéMON after\nthe user nervous.$"

 gText_WorsenConditionOfThoseMadeAppeals::
-	.string "Worsens the condition of\n"
-	.string "those that made appeals.$"
+	.string "Worsens the condition of\nthose that made appeals.$"

 gText_BadlyStartleMonsGoodCondition::
-	.string "Badly startles POKéMON in\n"
-	.string "good condition.$"
+	.string "Badly startles POKéMON in\ngood condition.$"

 gText_AppealGreatIfPerformedFirst::
-	.string "The appeal works great if\n"
-	.string "performed first.$"
+	.string "The appeal works great if\nperformed first.$"

 gText_AppealGreatIfPerformedLast::
-	.string "The appeal works great if\n"
-	.string "performed last.$"
+	.string "The appeal works great if\nperformed last.$"

 gText_AppealAsGoodAsThoseBeforeIt::
-	.string "Makes the appeal as good\n"
-	.string "as those before it.$"
+	.string "Makes the appeal as good\nas those before it.$"

 gText_AppealAsGoodAsOneBeforeIt::
-	.string "Makes the appeal as good\n"
-	.string "as the one before it.$"
+	.string "Makes the appeal as good\nas the one before it.$"

 gText_AppealBetterLaterItsPerformed::
-	.string "The appeal works better\n"
-	.string "the later it is performed.$"
+	.string "The appeal works better\nthe later it is performed.$"

 gText_AppealVariesDependingOnTiming::
-	.string "The appeal's quality varies\n"
-	.string "depending on its timing.$"
+	.string "The appeal's quality varies\ndepending on its timing.$"

 gText_WorksWellIfSameTypeAsBefore::
-	.string "Works well if it's the same\n"
-	.string "type as the one before.$"
+	.string "Works well if it's the same\ntype as the one before.$"

 gText_WorksWellIfDifferentTypeAsBefore::
-	.string "Works well if different in\n"
-	.string "type than the one before.$"
+	.string "Works well if different in\ntype than the one before.$"

 gText_AffectedByAppealInFront::
-	.string "Affected by how well the\n"
-	.string "appeal in front goes.$"
+	.string "Affected by how well the\nappeal in front goes.$"

 gText_UpsConditionHelpsPreventNervousness::
-	.string "Ups the user's condition.\n"
-	.string "Helps prevent nervousness.$"
+	.string "Ups the user's condition.\nHelps prevent nervousness.$"

 gText_AppealWorksWellIfConditionGood::
-	.string "The appeal works well if the\n"
-	.string "user's condition is good.$"
+	.string "The appeal works well if the\nuser's condition is good.$"

 gText_NextAppealMadeEarlier::
-	.string "The next appeal can be\n"
-	.string "made earlier next turn.$"
+	.string "The next appeal can be\nmade earlier next turn.$"

 gText_NextAppealMadeLater::
-	.string "The next appeal can be\n"
-	.string "made later next turn.$"
+	.string "The next appeal can be\nmade later next turn.$"

 gText_TurnOrderMoreEasilyScrambled::
-	.string "Makes the next turn's order\n"
-	.string "more easily scrambled.$"
+	.string "Makes the next turn's order\nmore easily scrambled.$"

 gText_ScrambleOrderOfNextAppeals::
-	.string "Scrambles the order of\n"
-	.string "appeals on the next turn.$"
+	.string "Scrambles the order of\nappeals on the next turn.$"

 gText_AppealExcitesAudienceInAnyContest::
-	.string "An appeal that excites the\n"
-	.string "audience in any CONTEST.$"
+	.string "An appeal that excites the\naudience in any CONTEST.$"

 gText_BadlyStartlesMonsGoodAppeals::
-	.string "Badly startles all POKéMON\n"
-	.string "that made good appeals.$"
+	.string "Badly startles all POKéMON\nthat made good appeals.$"

 gText_AppealBestMoreCrowdExcited::
-	.string "The appeal works best the\n"
-	.string "more the crowd is excited.$"
+	.string "The appeal works best the\nmore the crowd is excited.$"

 gText_TemporarilyStopCrowdExcited::
-	.string "Temporarily stops the\n"
-	.string "crowd from growing excited.$"
+	.string "Temporarily stops the\ncrowd from growing excited.$"

@ Unused move names

@@ -5,8 +5,7 @@ gText_PkmnTransferredSomeonesPC::
 	.string "BOX “{STR_VAR_1}.”$"

 gText_PkmnTransferredLanettesPC::
-	.string "{STR_VAR_2} was transferred to\n"
-	.string "LANETTE'S PC.\p"
+	.string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\p"
 	.string "It was placed in \n"
 	.string "BOX “{STR_VAR_1}.”$"

@@ -3,7 +3,7 @@ gBirchDexRatingText_AreYouCurious::
 	.string "Are you curious about how your\n"
 	.string "POKéDEX is coming along?$"

-gBirchDexRatingText_Cancel::
+gBirchDexRatingText_Cancel:
 	.string "Hm? Oh, you haven't caught enough\n"
 	.string "POKéMON to make it worthwhile.$"

@@ -1,6 +1,5 @@
 gText_WantToUseSurf::
-	.string "The water is dyed a deep blue…\n"
-	.string "Would you like to SURF?$"
+	.string "The water is dyed a deep blue…\nWould you like to SURF?$"

 gText_PlayerUsedSurf::
 	.string "{STR_VAR_1} used SURF!$"
@@ -166,7 +166,7 @@ BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle::
 	.string "I'll be looking forward to your\n"
 	.string "next battle!$"

-BravoTrainerBattleTower_Text_Intro::
+gTVBravoTrainerBattleTowerText00::
 	.string "Yeah!\n"
 	.string "It's BRAVO TRAINER time!\p"
 	.string "Today, we're going to profile {STR_VAR_1},\n"
@@ -174,12 +174,12 @@ BravoTrainerBattleTower_Text_Intro::
 	.string "For the challenge, {STR_VAR_1} entered\n"
 	.string "one wicked {STR_VAR_2}.$"

-BravoTrainerBattleTower_Text_NewRecord::
+gTVBravoTrainerBattleTowerText01::
 	.string "The pair set a new record of {STR_VAR_2} wins\n"
 	.string "in a row in {STR_VAR_1} competition!\l"
 	.string "Bravo, TRAINER!$"

-BravoTrainerBattleTower_Text_Lost::
+gTVBravoTrainerBattleTowerText02::
 	.string "The twosome finally succumbed to\n"
 	.string "{STR_VAR_1} in match number {STR_VAR_2}.\l"
 	.string "Nice try, TRAINER!\p"
@@ -188,7 +188,7 @@ BravoTrainerBattleTower_Text_Lost::
 	.string "We asked the TRAINER for impressions\n"
 	.string "on the match with {STR_VAR_1}.$"

-BravoTrainerBattleTower_Text_Won::
+gTVBravoTrainerBattleTowerText03::
 	.string "The twosome won it all by defeating\n"
 	.string "{STR_VAR_1}'s {STR_VAR_2} thoroughly.\l"
 	.string "Bravo, TRAINER!\p"
@@ -197,7 +197,7 @@ BravoTrainerBattleTower_Text_Won::
 	.string "We asked the TRAINER for impressions\n"
 	.string "on the moment of glory.$"

-BravoTrainerBattleTower_Text_LostFinal::
+gTVBravoTrainerBattleTowerText04::
 	.string "After a string of wins, the pair finally\n"
 	.string "succumbed to {STR_VAR_1}'s {STR_VAR_2},\l"
 	.string "their final hurdle.\p"
@@ -208,7 +208,7 @@ BravoTrainerBattleTower_Text_LostFinal::
 	.string "We asked the TRAINER for impressions\n"
 	.string "on battling the celebrity pair.$"

-BravoTrainerBattleTower_Text_Satisfied::
+gTVBravoTrainerBattleTowerText05::
 	.string "This is what the TRAINER had to say:\n"
 	.string "“I'm satisfied!”\p"
 	.string "Now isn't that a refreshing reply?\n"
@@ -218,7 +218,7 @@ BravoTrainerBattleTower_Text_Satisfied::
 	.string "I found out exactly how satisfied\n"
 	.string "when I heard the TRAINER say this:$"

-BravoTrainerBattleTower_Text_Unsatisfied::
+gTVBravoTrainerBattleTowerText06::
 	.string "This is what the TRAINER had to say:\n"
 	.string "“I'm not satisfied…”\p"
 	.string "Our TRAINER was obviously a little down\n"
@@ -228,22 +228,22 @@ BravoTrainerBattleTower_Text_Unsatisfied::
 	.string "Anyway, I found out how dissatisfied\n"
 	.string "our TRAINER was when I heard this:$"

-BravoTrainerBattleTower_Text_None1::
+gTVBravoTrainerBattleTowerText07::
 	.string "None$"

-BravoTrainerBattleTower_Text_None2::
+gTVBravoTrainerBattleTowerText08::
 	.string "None$"

-BravoTrainerBattleTower_Text_None3::
+gTVBravoTrainerBattleTowerText09::
 	.string "None$"

-BravoTrainerBattleTower_Text_None4::
+gTVBravoTrainerBattleTowerText10::
 	.string "None$"

-BravoTrainerBattleTower_Text_Response::
+gTVBravoTrainerBattleTowerText11::
 	.string "“{STR_VAR_1}.”$"

-BravoTrainerBattleTower_Text_ResponseSatisfied::
+gTVBravoTrainerBattleTowerText12::
 	.string "“{STR_VAR_1}.”\n"
 	.string "Now isn't that great?\p"
 	.string "It really expresses {STR_VAR_2}'s joy,\n"
@@ -252,7 +252,7 @@ BravoTrainerBattleTower_Text_ResponseSatisfied::
 	.string "end… It really was what you'd call\l"
 	.string "“{STR_VAR_1}”!$"

-BravoTrainerBattleTower_Text_ResponseUnsatisfied::
+gTVBravoTrainerBattleTowerText13::
 	.string "“{STR_VAR_1}.”\n"
 	.string "Now isn't that fitting?\p"
 	.string "That battle with {STR_VAR_3} at the\n"
@@ -261,7 +261,7 @@ BravoTrainerBattleTower_Text_ResponseUnsatisfied::
 	.string "{STR_VAR_2}'s disappointment comes across\n"
 	.string "loud and clear, I'd say!$"

-BravoTrainerBattleTower_Text_Outro::
+gTVBravoTrainerBattleTowerText14::
 	.string "Bravo, {STR_VAR_1}!\n"
 	.string "Bravo, {STR_VAR_2}!\p"
 	.string "I hope we can count on seeing\n"
@@ -0,0 +1,51 @@
+
+# Bugs and Glitches
+
+These are known bugs and glitches in the original Pokémon Emerald game: code that clearly does not work as intended, or that only works in limited circumstances but has the possibility to fail or crash. Defining the `BUGFIX` and `UBFIX` preprocessor variables will fix some of these automatically. `UBFIX` will already be defined for MODERN builds.
+
+Fixes are written in the `diff` format. If you've used Git before, this should look familiar:
+
+```diff
+ this is some code
+-delete red - lines
+add green + lines
+```
+
+## Contents
+
+- [Scrolling through items in the bag causes the image to flicker](#scrolling-through-items-in-the-bag-causes-the-image-to-flicker)
+
+
+## Scrolling through items in the bag causes the image to flicker
+
+**Fix:** Add the following function to [src/item_menu_icons.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu_icons.c):
+```diff
+void HideBagItemIconSprite(u8 id)
+{
+	u8 *spriteId = &gBagMenu->spriteId[10];
+	if (spriteId[id] != 0xFF)
+	{
+		gSprites[spriteId[id]].invisible = TRUE;
+	}
+}
+
+```
+
+and its corresponding declaration in [include/item_menu_icons.h](https://github.com/pret/pokeemerald/blob/master/include/item_menu_icons.h):
+
+```diff
+void HideBagItemIconSprite(u8 id);
+
+```
+
+Then edit `BagMenu_MoveCursorCallback` in [src/item_menu.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu.c):
+
+```diff
+	...
+{
+-	RemoveBagItemIconSprite(1 ^ gBagMenu->itemIconSlot);
+	HideBagItemIconSprite(gBagMenu->itemIconSlot ^ 1);
+	RemoveBagItemIconSprite(gBagMenu->itemIconSlot);
+	if (itemIndex != LIST_CANCEL)
+	...
+```
@@ -76,7 +76,7 @@ s32 ChangeBgY(u8 bg, s32 value, u8 op);
 s32 ChangeBgY_ScreenOff(u8 bg, s32 value, u8 op);
 s32 GetBgY(u8 bg);
 void SetBgAffine(u8 bg, s32 srcCenterX, s32 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle);
-u8 Unused_AdjustBgMosaic(u8 val, u8 mode);
+u8 Unused_AdjustBgMosaic(u8 a1, u8 a2);
 void SetBgTilemapBuffer(u8 bg, void *tilemap);
 void UnsetBgTilemapBuffer(u8 bg);
 void* GetBgTilemapBuffer(u8 bg);
@@ -96,7 +96,7 @@ static void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameC
 static u8 IndexOfSpriteTileTag(u16 tag);
 static void AllocSpriteTileRange(u16 tag, u16 start, u16 count);
 static void DoLoadSpritePalette(const u16 *src, u16 paletteOffset);
-static void UpdateSpriteMatrixAnchorPos(struct Sprite*, s32, s32);
+static void UpdateSpriteMatrixAnchorPos(struct Sprite* sprite, s32 a1, s32 a2);

 typedef void (*AnimFunc)(struct Sprite *);
 typedef void (*AnimCmdFunc)(struct Sprite *);
@@ -634,11 +634,14 @@ void DestroySprite(struct Sprite *sprite)
    }
 }

-void ResetOamRange(u8 start, u8 end)
+void ResetOamRange(u8 a, u8 b)
 {
    u8 i;
-    for (i = start; i < end; i++)
+
+    for (i = a; i < b; i++)
+    {
        gMain.oamBuffer[i] = *(struct OamData *)&gDummyOamData;
+    }
 }

 void LoadOam(void)
@@ -270,7 +270,7 @@ u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 sub
 u8 CreateInvisibleSprite(void (*callback)(struct Sprite *));
 u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
 void DestroySprite(struct Sprite *sprite);
-void ResetOamRange(u8 start, u8 end);
+void ResetOamRange(u8 a, u8 b);
 void LoadOam(void);
 void SetOamMatrix(u8 matrixNum, u16 a, u16 b, u16 c, u16 d);
 void CalcCenterToCornerVec(struct Sprite *sprite, u8 shape, u8 size, u8 affineMode);
@@ -326,14 +326,14 @@ void RunTextPrinters(void)
        {
            if (sTextPrinters[i].active)
            {
-                u16 renderCmd = RenderFont(&sTextPrinters[i]);
-                switch (renderCmd)
+                u16 temp = RenderFont(&sTextPrinters[i]);
+                switch (temp)
                {
                case RENDER_PRINT:
                    CopyWindowToVram(sTextPrinters[i].printerTemplate.windowId, COPYWIN_GFX);
                case RENDER_UPDATE:
-                    if (sTextPrinters[i].callback != NULL)
-                        sTextPrinters[i].callback(&sTextPrinters[i].printerTemplate, renderCmd);
+                    if (sTextPrinters[i].callback != 0)
+                        sTextPrinters[i].callback(&sTextPrinters[i].printerTemplate, temp);
                    break;
                case RENDER_FINISH:
                    sTextPrinters[i].active = FALSE;
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+129 129 145
+73 65 81
+209 209 217
+1 1 1
+65 97 129
+105 145 201
+169 57 57
+49 41 57
+177 177 193
+209 89 89
+233 233 249
+145 145 153
+105 97 113
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+169 145 97
+169 137 201
+97 81 65
+225 209 161
+185 201 225
+113 73 145
+1 1 1
+81 41 113
+233 233 249
+137 105 169
+137 113 81
+137 153 185
+201 177 129
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+153 129 25
+185 57 17
+113 129 153
+49 57 65
+1 1 1
+185 201 225
+241 89 81
+129 25 9
+81 97 113
+241 209 89
+105 89 9
+233 233 249
+201 161 33
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+113 153 113
+65 65 73
+201 201 217
+73 113 57
+161 161 177
+137 25 57
+129 169 121
+233 233 249
+193 113 105
+49 41 49
+105 105 113
+169 65 81
+217 217 233
+1 1 1
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+217 137 1
+97 33 169
+129 97 9
+1 1 1
+201 65 57
+49 41 33
+169 185 209
+113 17 25
+145 81 225
+233 233 249
+249 193 9
+73 73 73
+241 97 81
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+161 129 9
+17 65 97
+97 145 177
+193 65 105
+193 193 209
+49 49 49
+233 201 73
+57 105 145
+113 113 121
+1 1 1
+233 233 249
+161 41 81
+129 169 201
+81 81 81
+145 145 161
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+145 129 25
+49 177 193
+161 225 249
+57 57 41
+57 129 137
+177 177 209
+217 249 249
+49 105 153
+161 33 49
+201 185 73
+1 1 1
+121 201 249
+105 161 233
+49 65 89
+233 233 249
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+145 121 17
+65 137 161
+201 201 201
+121 121 121
+185 185 185
+41 65 105
+233 233 249
+193 161 73
+1 1 1
+121 193 249
+105 169 225
+153 153 153
+73 81 105
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+137 145 153
+233 233 249
+89 145 185
+49 65 81
+121 177 209
+89 97 113
+1 1 1
+153 161 177
+57 113 153
+185 185 201
+25 65 105
+0 0 0
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+89 145 9
+217 217 217
+169 153 89
+161 193 81
+65 81 1
+201 185 89
+177 81 121
+233 233 249
+233 217 89
+1 1 1
+97 81 33
+0 0 0
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+193 169 49
+97 97 105
+81 145 225
+41 41 49
+209 209 217
+185 49 73
+1 1 1
+217 89 97
+177 177 177
+249 217 105
+97 73 33
+49 97 153
+233 233 249
+65 65 73
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+89 129 169
+65 65 65
+185 185 201
+177 57 57
+113 161 209
+17 73 105
+153 217 241
+137 41 41
+1 1 1
+41 41 49
+97 97 105
+233 233 249
+153 201 233
+145 145 161
+65 97 121
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+97 161 65
+233 233 249
+17 65 41
+57 137 89
+241 193 57
+233 81 57
+113 33 9
+217 137 25
+1 1 1
+97 89 9
+193 41 25
+73 105 25
+153 193 113
+217 153 17
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+153 137 81
+145 137 233
+129 81 9
+241 201 81
+97 97 169
+49 57 89
+137 137 137
+233 233 249
+81 81 81
+185 185 185
+1 1 1
+73 41 9
+177 113 25
+201 169 81
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+225 169 17
+33 97 185
+1 1 1
+97 73 1
+169 25 25
+209 185 89
+241 225 153
+113 89 65
+177 129 81
+249 97 89
+241 233 225
+105 17 1
+233 49 41
+249 209 81
+185 169 161
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+129 145 169
+169 185 209
+65 73 97
+1 1 1
+225 81 97
+233 233 249
+105 17 65
+249 121 185
+249 169 201
+185 89 137
+201 209 233
+145 65 113
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+177 137 57
+49 81 33
+233 233 249
+129 193 89
+201 65 65
+97 33 33
+1 1 1
+73 113 49
+161 41 41
+129 105 57
+233 209 145
+105 169 65
+33 57 17
+209 185 113
+81 73 49
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+145 145 145
+50 65 145
+105 201 249
+97 97 97
+249 113 137
+193 40 65
+81 145 225
+185 193 225
+65 40 89
+161 105 225
+233 233 249
+113 81 201
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+225 137 81
+201 73 25
+249 249 249
+73 65 49
+73 145 161
+89 97 97
+161 49 25
+1 1 1
+161 153 121
+217 105 49
+89 33 33
+129 113 81
+193 185 153
+49 57 65
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+225 161 9
+17 97 185
+49 121 233
+145 49 9
+1 1 1
+105 81 1
+241 193 17
+233 233 249
+169 177 185
+49 57 65
+201 57 33
+249 81 41
+249 217 33
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+105 153 41
+169 233 65
+65 89 33
+249 121 113
+81 81 81
+161 49 73
+169 153 65
+249 233 97
+1 1 1
+129 97 41
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+73 137 81
+25 169 225
+121 185 73
+249 249 193
+1 89 137
+33 41 41
+145 153 153
+137 185 241
+193 225 113
+233 233 249
+1 1 1
+33 65 33
+81 177 209
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+65 129 129
+161 161 161
+97 49 1
+249 185 17
+41 73 89
+201 89 41
+1 1 1
+145 65 33
+217 217 249
+249 121 57
+193 17 33
+241 209 113
+217 169 49
+97 65 1
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+167 177 129
+249 137 57
+97 65 33
+233 233 249
+1 1 1
+185 89 33
+225 41 41
+217 169 49
+41 73 89
+241 209 113
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+217 169 49
+41 105 129
+177 185 249
+241 209 113
+201 17 41
+145 145 145
+185 65 57
+97 25 33
+233 233 249
+249 105 89
+1 1 1
+0 0 0
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+185 145 57
+161 169 193
+193 57 57
+1 1 1
+121 129 153
+209 209 233
+89 97 121
+113 33 33
+249 217 89
+137 105 33
+233 233 249
+209 161 81
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+225 161 17
+97 137 225
+41 57 113
+193 201 217
+81 65 9
+1 1 1
+113 169 241
+185 49 41
+249 209 97
+89 89 161
+129 105 25
+233 233 249
+193 185 217
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+105 129 169
+49 65 105
+1 1 1
+169 65 105
+137 161 209
+49 49 65
+73 97 137
+161 193 241
+233 121 161
+137 33 73
+201 89 129
+209 217 233
+97 105 129
+153 169 201
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+153 121 25
+137 137 153
+57 49 41
+137 121 89
+193 73 121
+217 185 89
+233 233 249
+89 81 65
+137 41 65
+185 185 193
+233 137 113
+1 1 1
+113 89 73
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+161 177 129
+249 129 169
+73 57 57
+1 1 1
+217 81 121
+121 97 73
+201 201 201
+225 145 153
+121 57 73
+249 193 193
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0