API tools faq
paste
Advertisement
PikalaxALT

none.patch

PikalaxALT
Nov 2nd, 2015
252
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 647.32 KB | None | 0 0
raw download clone embed print report
  1. From ed29db5841849345c5971a9b08681dfb6560c07d Mon Sep 17 00:00:00 2001
  2. From: PikalaxALT <PikalaxALT@gmail.com>
  3. Date: Thu, 29 Oct 2015 23:32:11 -0400
  4. Subject: [PATCH 12/21] No more -bash000; engine/movement.asm, SPRITEMOVEFN
  5.  
  6. ---
  7. audio/cries.asm                                |  22 +-
  8.  audio/engine.asm                               |   2 +-
  9.  audio/music/battletowertheme.asm               |   2 +-
  10.  audio/music/lookkimonogirl.asm                 |   2 +-
  11.  audio/music/titlescreen.asm                    |   4 +-
  12.  audio/sfx.asm                                  | 114 ++---
  13.  audio/sfx_crystal.asm                          |   2 +-
  14.  audio/trainer_encounters.asm                   |   2 +-
  15.  battle/anim_objects.asm                        |   2 +-
  16.  battle/core.asm                                |  16 +-
  17.  battle/effect_command_pointers.asm             |   2 +-
  18.  constants.asm                                  |   1 -
  19.  constants/map_constants.asm                    |   4 +-
  20.  constants/misc_constants.asm                   |   1 -
  21.  constants/sprite_constants.asm                 |   3 +
  22.  engine/events.asm                              |   2 +-
  23.  engine/events_2.asm                            |  10 +-
  24.  engine/map_objects.asm                         |  90 ++--
  25.  engine/movement.asm                            | 600 ++++++++++++-------------
  26.  engine/scripting.asm                           |  18 +-
  27.  event/battle_tower.asm                         |   2 +-
  28.  event/mom.asm                                  |   4 +-
  29.  gfx/pics/animation.asm                         |   2 +-
  30.  home/joypad.asm                                |  36 +-
  31.  home/map.asm                                   |  54 +--
  32.  home/map_objects.asm                           |  18 +-
  33.  home/menu.asm                                  |   2 +-
  34.  hram.asm                                       |   4 +-
  35.  lib/mobile/main.asm                            |  22 +-
  36.  main.asm                                       | 368 +++++++--------
  37.  maps/AzaleaGym.asm                             |  76 ++--
  38.  maps/AzaleaMart.asm                            |   6 +-
  39.  maps/AzaleaPokeCenter1F.asm                    |  10 +-
  40.  maps/AzaleaTown.asm                            |  30 +-
  41.  maps/BattleTower1F.asm                         |  14 +-
  42.  maps/BattleTowerBattleRoom.asm                 |   8 +-
  43.  maps/BattleTowerElevator.asm                   |   6 +-
  44.  maps/BattleTowerHallway.asm                    |   6 +-
  45.  maps/BattleTowerOutside.asm                    |   8 +-
  46.  maps/BillsHouse.asm                            |   2 +-
  47.  maps/BlackthornCity.asm                        |  18 +-
  48.  maps/BlackthornDodrioTradeHouse.asm            |   2 +-
  49.  maps/BlackthornDragonSpeechHouse.asm           |   4 +-
  50.  maps/BlackthornGym1F.asm                       |  18 +-
  51.  maps/BlackthornGym2F.asm                       |  20 +-
  52.  maps/BlackthornMart.asm                        |   6 +-
  53.  maps/BlackthornPokeCenter1F.asm                |   8 +-
  54.  maps/BluesHouse.asm                            |   2 +-
  55.  maps/BrunosRoom.asm                            |   8 +-
  56.  maps/BurnedTower1F.asm                         |  16 +-
  57.  maps/BurnedTowerB1F.asm                        |  22 +-
  58.  maps/CeladonCafe.asm                           |  10 +-
  59.  maps/CeladonCity.asm                           |  18 +-
  60.  maps/CeladonDeptStore1F.asm                    |   6 +-
  61.  maps/CeladonDeptStore2F.asm                    |   8 +-
  62.  maps/CeladonDeptStore3F.asm                    |  10 +-
  63.  maps/CeladonDeptStore4F.asm                    |   6 +-
  64.  maps/CeladonDeptStore5F.asm                    |  10 +-
  65.  maps/CeladonDeptStore6F.asm                    |   4 +-
  66.  maps/CeladonGameCorner.asm                     |  18 +-
  67.  maps/CeladonGameCornerPrizeRoom.asm            |   4 +-
  68.  maps/CeladonGym.asm                            |  24 +-
  69.  maps/CeladonMansion1F.asm                      |   8 +-
  70.  maps/CeladonMansion3F.asm                      |   8 +-
  71.  maps/CeladonMansionRoof.asm                    |   2 +-
  72.  maps/CeladonMansionRoofHouse.asm               |   2 +-
  73.  maps/CeladonPokeCenter1F.asm                   |  10 +-
  74.  maps/CeruleanCity.asm                          |  12 +-
  75.  maps/CeruleanGym.asm                           |  24 +-
  76.  maps/CeruleanGymBadgeSpeechHouse.asm           |   2 +-
  77.  maps/CeruleanMart.asm                          |   6 +-
  78.  maps/CeruleanPokeCenter1F.asm                  |   6 +-
  79.  maps/CeruleanPoliceStation.asm                 |   6 +-
  80.  maps/CeruleanTradeSpeechHouse.asm              |   8 +-
  81.  maps/CharcoalKiln.asm                          |   6 +-
  82.  maps/CherrygroveCity.asm                       |  14 +-
  83.  maps/CherrygroveEvolutionSpeechHouse.asm       |   4 +-
  84.  maps/CherrygroveGymSpeechHouse.asm             |   4 +-
  85.  maps/CherrygroveMart.asm                       |   8 +-
  86.  maps/CherrygrovePokeCenter1F.asm               |   8 +-
  87.  maps/CianwoodCity.asm                          |  30 +-
  88.  maps/CianwoodCityPhotoStudio.asm               |   2 +-
  89.  maps/CianwoodGym.asm                           |  28 +-
  90.  maps/CianwoodLugiaSpeechHouse.asm              |   6 +-
  91.  maps/CianwoodPharmacy.asm                      |   4 +-
  92.  maps/CianwoodPokeCenter1F.asm                  |   8 +-
  93.  maps/CinnabarIsland.asm                        |   2 +-
  94.  maps/CinnabarPokeCenter1F.asm                  |   6 +-
  95.  maps/Colosseum.asm                             |  10 +-
  96.  maps/CopycatsHouse1F.asm                       |   6 +-
  97.  maps/CopycatsHouse2F.asm                       |  12 +-
  98.  maps/DanceTheatre.asm                          |  28 +-
  99.  maps/DarkCaveBlackthornEntrance.asm            |   6 +-
  100.  maps/DarkCaveVioletEntrance.asm                |  16 +-
  101.  maps/DayCare.asm                               |   4 +-
  102.  maps/DiglettsCave.asm                          |   2 +-
  103.  maps/DragonShrine.asm                          |  12 +-
  104.  maps/DragonsDenB1F.asm                         |  30 +-
  105.  maps/EarlsPokemonAcademy.asm                   |  14 +-
  106.  maps/EcruteakCity.asm                          |  14 +-
  107.  maps/EcruteakGym.asm                           |  28 +-
  108.  maps/EcruteakHouse.asm                         |  12 +-
  109.  maps/EcruteakItemfinderHouse.asm               |   4 +-
  110.  maps/EcruteakLugiaSpeechHouse.asm              |   4 +-
  111.  maps/EcruteakMart.asm                          |   6 +-
  112.  maps/EcruteakPokeCenter1F.asm                  |  14 +-
  113.  maps/ElmsHouse.asm                             |   4 +-
  114.  maps/ElmsLab.asm                               |  24 +-
  115.  maps/FastShip1F.asm                            |  14 +-
  116.  maps/FastShipB1F.asm                           |  48 +-
  117.  maps/FastShipCabins_NNW_NNE_NE.asm             |  28 +-
  118.  maps/FastShipCabins_SE_SSE_CaptainsCabin.asm   |  36 +-
  119.  maps/FastShipCabins_SW_SSW_NW.asm              |  16 +-
  120.  maps/FightingDojo.asm                          |   4 +-
  121.  maps/FuchsiaBillSpeechHouse.asm                |   4 +-
  122.  maps/FuchsiaCity.asm                           |   8 +-
  123.  maps/FuchsiaGym.asm                            |  22 +-
  124.  maps/FuchsiaMart.asm                           |   6 +-
  125.  maps/FuchsiaPokeCenter1F.asm                   |  10 +-
  126.  maps/GoldenrodBikeShop.asm                     |   2 +-
  127.  maps/GoldenrodBillsHouse.asm                   |   6 +-
  128.  maps/GoldenrodCity.asm                         |  30 +-
  129.  maps/GoldenrodDeptStore1F.asm                  |   8 +-
  130.  maps/GoldenrodDeptStore2F.asm                  |  10 +-
  131.  maps/GoldenrodDeptStore3F.asm                  |   6 +-
  132.  maps/GoldenrodDeptStore4F.asm                  |   8 +-
  133.  maps/GoldenrodDeptStore5F.asm                  |  12 +-
  134.  maps/GoldenrodDeptStore6F.asm                  |   4 +-
  135.  maps/GoldenrodDeptStoreB1F.asm                 |  16 +-
  136.  maps/GoldenrodDeptStoreRoof.asm                |  18 +-
  137.  maps/GoldenrodFlowerShop.asm                   |   4 +-
  138.  maps/GoldenrodGameCorner.asm                   |  24 +-
  139.  maps/GoldenrodGym.asm                          |  26 +-
  140.  maps/GoldenrodHappinessRater.asm               |   6 +-
  141.  maps/GoldenrodMagnetTrainStation.asm           |   6 +-
  142.  maps/GoldenrodNameRatersHouse.asm              |   2 +-
  143.  maps/GoldenrodPPSpeechHouse.asm                |   4 +-
  144.  maps/GoldenrodPokeCenter1F.asm                 |  10 +-
  145.  maps/GoldenrodPokeComCenter2FMobile.asm        |   6 +-
  146.  maps/GuideGentsHouse.asm                       |   2 +-
  147.  maps/HallOfFame.asm                            |   6 +-
  148.  maps/IcePath1F.asm                             |   6 +-
  149.  maps/IcePathB1F.asm                            |  10 +-
  150.  maps/IcePathB2FBlackthornSide.asm              |   2 +-
  151.  maps/IcePathB2FMahoganySide.asm                |  12 +-
  152.  maps/IcePathB3F.asm                            |   4 +-
  153.  maps/IlexForest.asm                            |  24 +-
  154.  maps/IlexForestAzaleaGate.asm                  |   4 +-
  155.  maps/IndigoPlateauPokeCenter1F.asm             |  14 +-
  156.  maps/KarensRoom.asm                            |   8 +-
  157.  maps/KogasRoom.asm                             |   8 +-
  158.  maps/KrissHouse1F.asm                          |  14 +-
  159.  maps/KrissHouse2F.asm                          |   8 +-
  160.  maps/KrissNeighborsHouse.asm                   |   4 +-
  161.  maps/KurtsHouse.asm                            |  10 +-
  162.  maps/LakeofRage.asm                            |  36 +-
  163.  maps/LakeofRageHiddenPowerHouse.asm            |   2 +-
  164.  maps/LakeofRageMagikarpHouse.asm               |   2 +-
  165.  maps/LancesRoom.asm                            |  12 +-
  166.  maps/LavRadioTower1F.asm                       |  10 +-
  167.  maps/LavenderMart.asm                          |   6 +-
  168.  maps/LavenderNameRater.asm                     |   4 +-
  169.  maps/LavenderPokeCenter1F.asm                  |   8 +-
  170.  maps/LavenderTown.asm                          |   8 +-
  171.  maps/LavenderTownSpeechHouse.asm               |   2 +-
  172.  maps/MahoganyGym.asm                           |  26 +-
  173.  maps/MahoganyMart1F.asm                        |  14 +-
  174.  maps/MahoganyPokeCenter1F.asm                  |   8 +-
  175.  maps/MahoganyRedGyaradosSpeechHouse.asm        |   4 +-
  176.  maps/MahoganyTown.asm                          |  12 +-
  177.  maps/ManiasHouse.asm                           |  92 ++--
  178.  maps/MobileBattleRoom.asm                      |   4 +-
  179.  maps/MobileTradeRoomMobile.asm                 |   4 +-
  180.  maps/MountMoon.asm                             |   6 +-
  181.  maps/MountMoonGiftShop.asm                     |   8 +-
  182.  maps/MountMoonSquare.asm                       |   8 +-
  183.  maps/MountMortar1FInside.asm                   |  24 +-
  184.  maps/MountMortar1FOutside.asm                  |   4 +-
  185.  maps/MountMortar2FInside.asm                   |  16 +-
  186.  maps/MountMortarB1F.asm                        |  16 +-
  187.  maps/MoveDeletersHouse.asm                     |   2 +-
  188.  maps/MrFujisHouse.asm                          |  10 +-
  189.  maps/MrPokemonsHouse.asm                       |   8 +-
  190.  maps/MrPsychicsHouse.asm                       |   2 +-
  191.  maps/NationalPark.asm                          |  38 +-
  192.  maps/NationalParkBugContest.asm                |  24 +-
  193.  maps/NewBarkTown.asm                           |  10 +-
  194.  maps/OaksLab.asm                               |   8 +-
  195.  maps/OlivineCafe.asm                           |   6 +-
  196.  maps/OlivineCity.asm                           |  12 +-
  197.  maps/OlivineGoodRodHouse.asm                   |   2 +-
  198.  maps/OlivineGym.asm                            |   6 +-
  199.  maps/OlivineHouseBeta.asm                      |   4 +-
  200.  maps/OlivineLighthouse1F.asm                   |   4 +-
  201.  maps/OlivineLighthouse2F.asm                   |  10 +-
  202.  maps/OlivineLighthouse3F.asm                   |  14 +-
  203.  maps/OlivineLighthouse4F.asm                   |   8 +-
  204.  maps/OlivineLighthouse5F.asm                   |  14 +-
  205.  maps/OlivineLighthouse6F.asm                   |   6 +-
  206.  maps/OlivineMart.asm                           |   6 +-
  207.  maps/OlivinePokeCenter1F.asm                   |   8 +-
  208.  maps/OlivinePort.asm                           |  18 +-
  209.  maps/OlivinePortPassage.asm                    |   2 +-
  210.  maps/OlivinePunishmentSpeechHouse.asm          |   4 +-
  211.  maps/OlivineVoltorbHouse.asm                   |   2 +-
  212.  maps/PalletTown.asm                            |   4 +-
  213.  maps/PewterCity.asm                            |  10 +-
  214.  maps/PewterGym.asm                             |  10 +-
  215.  maps/PewterMart.asm                            |   6 +-
  216.  maps/PewterNidoranSpeechHouse.asm              |   4 +-
  217.  maps/PewterPokeCenter1F.asm                    |  10 +-
  218.  maps/PewterSnoozeSpeechHouse.asm               |   2 +-
  219.  maps/PokeCenter2F.asm                          |  20 +-
  220.  maps/PokeSeersHouse.asm                        |   2 +-
  221.  maps/PokemonFanClub.asm                        |  12 +-
  222.  maps/PowerPlant.asm                            |  18 +-
  223.  maps/RadioTower1F.asm                          |  14 +-
  224.  maps/RadioTower2F.asm                          |  30 +-
  225.  maps/RadioTower3F.asm                          |  22 +-
  226.  maps/RadioTower4F.asm                          |  22 +-
  227.  maps/RadioTower5F.asm                          |  22 +-
  228.  maps/RedsHouse1F.asm                           |   4 +-
  229.  maps/RockTunnel1F.asm                          |   4 +-
  230.  maps/RockTunnelB1F.asm                         |   6 +-
  231.  maps/Route1.asm                                |  10 +-
  232.  maps/Route10PokeCenter1F.asm                   |   8 +-
  233.  maps/Route10South.asm                          |   8 +-
  234.  maps/Route11.asm                               |  18 +-
  235.  maps/Route12.asm                               |  20 +-
  236.  maps/Route12SuperRodHouse.asm                  |   2 +-
  237.  maps/Route13.asm                               |  20 +-
  238.  maps/Route14.asm                               |  14 +-
  239.  maps/Route15.asm                               |  26 +-
  240.  maps/Route15FuchsiaGate.asm                    |   2 +-
  241.  maps/Route16FuchsiaSpeechHouse.asm             |   2 +-
  242.  maps/Route16Gate.asm                           |   4 +-
  243.  maps/Route17.asm                               |  16 +-
  244.  maps/Route1718Gate.asm                         |   4 +-
  245.  maps/Route18.asm                               |   8 +-
  246.  maps/Route19.asm                               |  20 +-
  247.  maps/Route19FuchsiaGate.asm                    |   2 +-
  248.  maps/Route2.asm                                |  22 +-
  249.  maps/Route20.asm                               |  12 +-
  250.  maps/Route21.asm                               |  12 +-
  251.  maps/Route24.asm                               |   2 +-
  252.  maps/Route25.asm                               |  42 +-
  253.  maps/Route26.asm                               |  32 +-
  254.  maps/Route26DayofWeekSiblingsHouse.asm         |   2 +-
  255.  maps/Route26HealSpeechHouse.asm                |   2 +-
  256.  maps/Route27.asm                               |  38 +-
  257.  maps/Route27SandstormHouse.asm                 |   2 +-
  258.  maps/Route28FamousSpeechHouse.asm              |   6 +-
  259.  maps/Route29.asm                               |  20 +-
  260.  maps/Route2946Gate.asm                         |   4 +-
  261.  maps/Route2Gate.asm                            |   2 +-
  262.  maps/Route2NuggetSpeechHouse.asm               |   2 +-
  263.  maps/Route3.asm                                |  16 +-
  264.  maps/Route30.asm                               |  30 +-
  265.  maps/Route30BerrySpeechHouse.asm               |   2 +-
  266.  maps/Route31.asm                               |  18 +-
  267.  maps/Route31VioletGate.asm                     |   4 +-
  268.  maps/Route32.asm                               |  54 +--
  269.  maps/Route32PokeCenter1F.asm                   |   6 +-
  270.  maps/Route32RuinsofAlphGate.asm                |   6 +-
  271.  maps/Route33.asm                               |  10 +-
  272.  maps/Route34.asm                               |  48 +-
  273.  maps/Route34IlexForestGate.asm                 |   8 +-
  274.  maps/Route35.asm                               |  42 +-
  275.  maps/Route35Goldenrodgate.asm                  |   6 +-
  276.  maps/Route35NationalParkgate.asm               |  12 +-
  277.  maps/Route36.asm                               |  28 +-
  278.  maps/Route36NationalParkgate.asm               |  30 +-
  279.  maps/Route36RuinsofAlphgate.asm                |   4 +-
  280.  maps/Route37.asm                               |  20 +-
  281.  maps/Route38.asm                               |  30 +-
  282.  maps/Route38EcruteakGate.asm                   |   2 +-
  283.  maps/Route39.asm                               |  30 +-
  284.  maps/Route39Barn.asm                           |   6 +-
  285.  maps/Route39Farmhouse.asm                      |   4 +-
  286.  maps/Route4.asm                                |  14 +-
  287.  maps/Route40.asm                               |  32 +-
  288.  maps/Route40BattleTowerGate.asm                |   4 +-
  289.  maps/Route41.asm                               |  40 +-
  290.  maps/Route42.asm                               |  30 +-
  291.  maps/Route42EcruteakGate.asm                   |   2 +-
  292.  maps/Route43.asm                               |  32 +-
  293.  maps/Route43Gate.asm                           |  10 +-
  294.  maps/Route43MahoganyGate.asm                   |   2 +-
  295.  maps/Route44.asm                               |  40 +-
  296.  maps/Route45.asm                               |  44 +-
  297.  maps/Route46.asm                               |  20 +-
  298.  maps/Route5.asm                                |   2 +-
  299.  maps/Route5CleanseTagSpeechHouse.asm           |   4 +-
  300.  maps/Route5SaffronCityGate.asm                 |   2 +-
  301.  maps/Route5UndergroundEntrance.asm             |   2 +-
  302.  maps/Route6.asm                                |  10 +-
  303.  maps/Route6SaffronGate.asm                     |   4 +-
  304.  maps/Route7SaffronGate.asm                     |   2 +-
  305.  maps/Route8.asm                                |  22 +-
  306.  maps/Route8SaffronGate.asm                     |   2 +-
  307.  maps/Route9.asm                                |  24 +-
  308.  maps/RuinsofAlphAerodactylChamber.asm          |   4 +-
  309.  maps/RuinsofAlphAerodactylItemRoom.asm         |   8 +-
  310.  maps/RuinsofAlphHoOhChamber.asm                |   4 +-
  311.  maps/RuinsofAlphHoOhItemRoom.asm               |   8 +-
  312.  maps/RuinsofAlphInnerChamber.asm               |  10 +-
  313.  maps/RuinsofAlphKabutoChamber.asm              |   8 +-
  314.  maps/RuinsofAlphKabutoItemRoom.asm             |   8 +-
  315.  maps/RuinsofAlphOmanyteChamber.asm             |   4 +-
  316.  maps/RuinsofAlphOmanyteItemRoom.asm            |   8 +-
  317.  maps/RuinsofAlphOutside.asm                    |  18 +-
  318.  maps/RuinsofAlphResearchCenter.asm             |  10 +-
  319.  maps/SafariZoneWardensHome.asm                 |   2 +-
  320.  maps/SaffronCity.asm                           |  16 +-
  321.  maps/SaffronGym.asm                            |  22 +-
  322.  maps/SaffronMart.asm                           |   6 +-
  323.  maps/SaffronPokeCenter1F.asm                   |   8 +-
  324.  maps/SaffronTrainStation.asm                   |  10 +-
  325.  maps/SeafoamGym.asm                            |   8 +-
  326.  maps/SilphCo1F.asm                             |   4 +-
  327.  maps/SilverCaveItemRooms.asm                   |   4 +-
  328.  maps/SilverCavePokeCenter1F.asm                |   4 +-
  329.  maps/SilverCaveRoom1.asm                       |   8 +-
  330.  maps/SilverCaveRoom2.asm                       |   6 +-
  331.  maps/SilverCaveRoom3.asm                       |   2 +-
  332.  maps/SlowpokeWellB1F.asm                       |  26 +-
  333.  maps/SlowpokeWellB2F.asm                       |   4 +-
  334.  maps/SoulHouse.asm                             |   8 +-
  335.  maps/SproutTower1F.asm                         |  14 +-
  336.  maps/SproutTower2F.asm                         |  10 +-
  337.  maps/SproutTower3F.asm                         |  26 +-
  338.  maps/TeamRocketBaseB1F.asm                     |  22 +-
  339.  maps/TeamRocketBaseB2F.asm                     |  44 +-
  340.  maps/TeamRocketBaseB3F.asm                     |  46 +-
  341.  maps/TimeCapsule.asm                           |   8 +-
  342.  maps/TinTower1F.asm                            |  24 +-
  343.  maps/TinTower3F.asm                            |   2 +-
  344.  maps/TinTower4F.asm                            |   6 +-
  345.  maps/TinTower5F.asm                            |   2 +-
  346.  maps/TinTower6F.asm                            |   2 +-
  347.  maps/TinTower7F.asm                            |   2 +-
  348.  maps/TinTower8F.asm                            |   6 +-
  349.  maps/TinTower9F.asm                            |   2 +-
  350.  maps/TinTowerRoof.asm                          |   2 +-
  351.  maps/TohjoFalls.asm                            |   2 +-
  352.  maps/TradeCenter.asm                           |   8 +-
  353.  maps/TrainerHouse1F.asm                        |  10 +-
  354.  maps/TrainerHouseB1F.asm                       |  10 +-
  355.  maps/UndergroundPathSwitchRoomEntrances.asm    |  38 +-
  356.  maps/UndergroundWarehouse.asm                  |  20 +-
  357.  maps/UnionCave1F.asm                           |  28 +-
  358.  maps/UnionCaveB1F.asm                          |  22 +-
  359.  maps/UnionCaveB2F.asm                          |  18 +-
  360.  maps/VermilionCity.asm                         |  12 +-
  361.  maps/VermilionGym.asm                          |  18 +-
  362.  maps/VermilionHouseDiglettsCaveSpeechHouse.asm |   2 +-
  363.  maps/VermilionHouseFishingSpeechHouse.asm      |   2 +-
  364.  maps/VermilionMagnetTrainSpeechHouse.asm       |   4 +-
  365.  maps/VermilionMart.asm                         |   6 +-
  366.  maps/VermilionPokeCenter1F.asm                 |   8 +-
  367.  maps/VermilionPort.asm                         |  10 +-
  368.  maps/VermilionPortPassage.asm                  |   2 +-
  369.  maps/VictoryRoad.asm                           |  16 +-
  370.  maps/VictoryRoadGate.asm                       |  10 +-
  371.  maps/VioletCity.asm                            |  16 +-
  372.  maps/VioletGym.asm                             |  14 +-
  373.  maps/VioletMart.asm                            |   6 +-
  374.  maps/VioletNicknameSpeechHouse.asm             |   6 +-
  375.  maps/VioletOnixTradeHouse.asm                  |   4 +-
  376.  maps/VioletPokeCenter1F.asm                    |  10 +-
  377.  maps/ViridianCity.asm                          |   8 +-
  378.  maps/ViridianGym.asm                           |   6 +-
  379.  maps/ViridianMart.asm                          |   6 +-
  380.  maps/ViridianNicknameSpeechHouse.asm           |   8 +-
  381.  maps/ViridianPokeCenter1F.asm                  |   8 +-
  382.  maps/WarehouseEntrance.asm                     |  28 +-
  383.  maps/WhirlIslandB1F.asm                        |  12 +-
  384.  maps/WhirlIslandB2F.asm                        |   6 +-
  385.  maps/WhirlIslandLugiaChamber.asm               |   2 +-
  386.  maps/WhirlIslandNE.asm                         |   2 +-
  387.  maps/WhirlIslandSW.asm                         |   2 +-
  388.  maps/WillsRoom.asm                             |   8 +-
  389.  maps/WiseTriosRoom.asm                         |  22 +-
  390.  misc/mobile_22_2.asm                           |   2 +-
  391.  misc/mobile_40.asm                             |  16 +-
  392.  misc/mobile_45.asm                             |   6 +-
  393.  wram.asm                                       |   8 +-
  394.  387 files changed, 2831 insertions(+), 2830 deletions(-)
  395.  
  396. diff --git a/audio/cries.asm b/audio/cries.asm
  397. index 85abcc6..6f15d02 100644
  398. --- a/audio/cries.asm
  399. +++ b/audio/cries.asm
  400. @@ -370,7 +370,7 @@ Cry_2C_branch_f3022: ; f3022
  401.     unknownmusic0xde $52
  402.     sound $4, $f1, $0796
  403.     sound $4, $f1, $072d
  404.     sound $7, $0, $0000
  405.     sound $10, $f1, $07a7
  406.     endchannel
  407.  ; f3035
  408. @@ -381,7 +381,7 @@ Cry_2C_Ch6: ; f3038
  409.  Cry_2C_branch_f3038: ; f3038
  410.     callchannel Cry_2C_branch_f3022
  411.     loopchannel 2, Cry_2C_branch_f3038
  412.     sound $e, $0, $0000
  413.     sound $8, $f2, $07c2
  414.     endchannel
  415.  ; f3048
  416. @@ -398,7 +398,7 @@ Cry_27_Ch5: ; f3048
  417.  Cry_27_Ch6: ; f305b
  418.     unknownmusic0xde $2a
  419.     sound $3, $2c, $07c7
  420.     sound $1, $0, $0000
  421.     sound $5, $59, $07be
  422.     sound $6, $b4, $07bd
  423.     endchannel
  424. @@ -621,7 +621,7 @@ Cry_36_Ch6: ; f3200
  425.  Cry_36_branch_f3202: ; f3202
  426.     sound $3, $f8, $0791
  427.     sound $3, $d8, $078d
  428.     sound $2, $0, $0000
  429.     sound $1, $78, $06c1
  430.     sound $1, $f8, $0741
  431.     sound $4, $e1, $0751
  432. @@ -646,7 +646,7 @@ Cry_43_Ch5: ; f322e
  433.     sound $8, $ab, $0734
  434.     sound $4, $d6, $0716
  435.     sound $8, $d1, $0712
  436.     sound $8, $0, $0000
  437.     endchannel
  438.  ; f3249
  439.  
  440. @@ -658,7 +658,7 @@ Cry_43_Ch6: ; f3249
  441.     sound $8, $cb, $0754
  442.     sound $4, $f6, $0736
  443.     sound $8, $f1, $0732
  444.     sound $8, $0, $0000
  445.     endchannel
  446.  ; f3264
  447.  
  448. @@ -1213,7 +1213,7 @@ Cry_09_Ch5: ; f361f
  449.  
  450.  Cry_09_Ch6: ; f363c
  451.     unknownmusic0xde $5
  452.     sound $2, $8, $0000
  453.     sound $f, $a7, $06a1
  454.     sound $6, $86, $06a2
  455.     sound $a, $74, $06a1
  456. @@ -1312,7 +1312,7 @@ Cry_11_Ch5: ; f3703
  457.  
  458.  Cry_11_Ch6: ; f3722
  459.     unknownmusic0xde $a
  460.     sound $4, $8, $0000
  461.     sound $6, $a7, $0741
  462.     sound $8, $86, $0743
  463.     sound $4, $76, $0741
  464. @@ -1587,7 +1587,7 @@ Cry_0B_Ch5: ; f394b
  465.  
  466.  Cry_0B_Ch6: ; f3976
  467.     unknownmusic0xde $44
  468.     sound $c, $8, $0000
  469.     sound $4, $f1, $0701
  470.     sound $4, $e1, $0782
  471.     sound $4, $d1, $0741
  472. @@ -1670,7 +1670,7 @@ Cry_0D_branch_f3a1a: ; f3a1a
  473.  
  474.  Cry_0D_Ch6: ; f3a39
  475.     unknownmusic0xde $40
  476.     sound $4, $8, $0000
  477.     sound $5, $f2, $0651
  478.     sound $9, $d1, $0661
  479.     sound $5, $e2, $0614
  480. @@ -1738,7 +1738,7 @@ Cry_0A_Ch5: ; f3aba
  481.  
  482.  Cry_0A_Ch6: ; f3ad9
  483.     unknownmusic0xde $5
  484.     sound $3, $8, $0000
  485.     sound $8, $a7, $06a1
  486.     sound $6, $86, $06a3
  487.     sound $3, $74, $06a1
  488. diff --git a/audio/engine.asm b/audio/engine.asm
  489. index b86d919..a995dd2 100644
  490. --- a/audio/engine.asm
  491. +++ b/audio/engine.asm
  492. @@ -2773,7 +2773,7 @@ LoadMusicByte:: ; e8d76
  493.  ; e8d80
  494.  
  495.  FrequencyTable: ; e8d80
  496.     dw $0000 ; filler
  497.     dw $f82c
  498.     dw $f89d
  499.     dw $f907
  500. diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm
  501. index a7001d9..4f9c320 100644
  502. --- a/audio/music/battletowertheme.asm
  503. +++ b/audio/music/battletowertheme.asm
  504. @@ -242,7 +242,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970
  505.     note __, 1
  506.     note F_, 4
  507.     note __, 4
  508.     tone $0000
  509.     intensity $b7
  510.     note G_, 2
  511.     octave 4
  512. diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm
  513. index bbad6dc..a595b8c 100644
  514. --- a/audio/music/lookkimonogirl.asm
  515. +++ b/audio/music/lookkimonogirl.asm
  516. @@ -14,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2
  517.     notetype $6, $87
  518.     tone $0001
  519.     callchannel Music_LookKimonoGirl_branch_f7aa8
  520.     tone $0000
  521.  Music_LookKimonoGirl_branch_f79d7: ; f79d7
  522.     notetype $c, $b2
  523.     callchannel Music_LookKimonoGirl_branch_f7a13
  524. diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
  525. index d46102b..b70823b 100644
  526. --- a/audio/music/titlescreen.asm
  527. +++ b/audio/music/titlescreen.asm
  528. @@ -490,7 +490,7 @@ Music_TitleScreen_Ch2: ; eb984
  529.     octave 4
  530.     note A_, 4
  531.     stereopanning $ff
  532.     tone $0000
  533.     notetype $c, $b0
  534.     octave 3
  535.     note B_, 6
  536. @@ -775,7 +775,7 @@ Music_TitleScreen_Ch3: ; ebb01
  537.     note __, 1
  538.     stereopanning $ff
  539.     notetype $c, $16
  540.     tone $0000
  541.     octave 4
  542.     note A_, 2
  543.     octave 5
  544. diff --git a/audio/sfx.asm b/audio/sfx.asm
  545. index b063378..820f5ce 100644
  546. --- a/audio/sfx.asm
  547. +++ b/audio/sfx.asm
  548. @@ -151,7 +151,7 @@ Sfx_Save_Ch5: ; f09b6
  549.  
  550.  Sfx_Save_Ch6: ; f09d5
  551.     dutycycle $2
  552.     sound $2, $8, $0000
  553.     sound $2, $a1, $0701
  554.     sound $1, $91, $0601
  555.     sound $1, $91, $0681
  556. @@ -2291,7 +2291,7 @@ Sfx_Sketch_Ch5: ; f12f9
  557.  Sfx_Sketch_branch_f12fd: ; f12fd
  558.     sound $2, $f1, $06e0
  559.     sound $d, $af, $05b0
  560.     sound $4, $0, $0000
  561.     sound $9, $f4, $0718
  562.     loopchannel 3, Sfx_Sketch_branch_f12fd
  563.     soundinput $8
  564. @@ -2490,15 +2490,15 @@ Sfx_Nightmare_Ch5: ; f1420
  565.     soundinput $34
  566.  Sfx_Nightmare_branch_f1424: ; f1424
  567.     sound $3, $ba, $0631
  568.     sound $2, $0, $0000
  569.     sound $3, $f8, $0621
  570.     sound $2, $0, $0000
  571.     sound $3, $f8, $0611
  572.     sound $2, $0, $0000
  573.     sound $3, $e8, $0601
  574.     sound $2, $0, $0000
  575.     sound $3, $e8, $05f1
  576.     sound $2, $0, $0000
  577.     loopchannel 2, Sfx_Nightmare_branch_f1424
  578.     soundinput $8
  579.     endchannel
  580. @@ -2540,11 +2540,11 @@ Sfx_SweetKiss2_Ch5: ; f1482
  581.     dutycycle $0
  582.     soundinput $97
  583.     sound $2, $f4, $0772
  584.     sound $4, $0, $0000
  585.     sound $2, $c4, $0772
  586.     sound $4, $0, $0000
  587.     sound $2, $b4, $0772
  588.     sound $4, $0, $0000
  589.     sound $2, $a1, $0772
  590.     soundinput $8
  591.     endchannel
  592. @@ -2591,7 +2591,7 @@ Sfx_SludgeBomb_Ch5: ; f14d6
  593.     dutycycle $2
  594.     soundinput $c5
  595.     sound $3, $f8, $0581
  596.     sound $1, $0, $0000
  597.     soundinput $cb
  598.     sound $10, $f2, $05d1
  599.     soundinput $8
  600. @@ -2613,9 +2613,9 @@ Sfx_Foresight_Ch5: ; f14f8
  601.     sound $3, $f4, $07b5
  602.     sound $3, $f5, $07c8
  603.     sound $8, $f4, $07da
  604.     sound $2, $0, $0000
  605.     sound $8, $c1, $07da
  606.     sound $2, $0, $0000
  607.     sound $8, $91, $07da
  608.     endchannel
  609.  ; f1515
  610. @@ -2811,7 +2811,7 @@ Sfx_Return_branch_f163c: ; f163c
  611.     sound $8, $f1, $0759
  612.     soundinput $57
  613.     sound $8, $f1, $0759
  614.     sound $10, $0, $0000
  615.     loopchannel 2, Sfx_Return_branch_f163c
  616.     soundinput $8
  617.     endchannel
  618. @@ -2849,7 +2849,7 @@ Sfx_MilkDrink_branch_f1684: ; f1684
  619.     sound $d, $f7, $0290
  620.     soundinput $9e
  621.     sound $4, $c9, $05e1
  622.     sound $2, $0, $0000
  623.     loopchannel 6, Sfx_MilkDrink_branch_f1684
  624.     soundinput $8
  625.     endchannel
  626. @@ -2864,7 +2864,7 @@ Sfx_Present_Ch5: ; f16a2
  627.     soundinput $d6
  628.  Sfx_Present_branch_f16a6: ; f16a6
  629.     sound $2, $f1, $0740
  630.     sound $1, $0, $0000
  631.     loopchannel 3, Sfx_Present_branch_f16a6
  632.     sound $10, $f1, $0780
  633.     soundinput $8
  634. @@ -2882,9 +2882,9 @@ Sfx_MorningSun_branch_f16be: ; f16be
  635.     sound $2, $f1, $07e0
  636.     sound $5, $f2, $07e7
  637.     loopchannel 3, Sfx_MorningSun_branch_f16be
  638.     sound $1, $0, $0000
  639.     sound $8, $c2, $07e7
  640.     sound $1, $0, $0000
  641.     sound $8, $82, $07e7
  642.     endchannel
  643.  ; f16df
  644. @@ -2913,10 +2913,10 @@ Sfx_Encore: ; f16fd
  645.  Sfx_Encore_Ch5: ; f1703
  646.     dutycycle $2
  647.     soundinput $ce
  648.     sound $10, $0, $0000
  649.  Sfx_Encore_branch_f170b: ; f170b
  650.     sound $2, $f8, $0774
  651.     sound $24, $0, $0000
  652.     loopchannel 2, Sfx_Encore_branch_f170b
  653.     soundinput $8
  654.     endchannel
  655. @@ -2966,9 +2966,9 @@ Sfx_BatonPass_Ch5: ; f1752
  656.     soundinput $f7
  657.     sound $20, $f2, $0680
  658.     sound $1, $f1, $0760
  659.     sound $20, $0, $0000
  660.     sound $1, $f1, $0760
  661.     sound $1a, $0, $0000
  662.     sound $1, $f1, $0760
  663.     soundinput $8
  664.     endchannel
  665. @@ -3836,27 +3836,27 @@ Sfx_BallBounce: ; f1b63
  666.  Sfx_BallBounce_Ch5: ; f1b69
  667.     dutycycle $2
  668.     sound $8, $e1, $0740
  669.     sound $17, $0, $0000
  670.     sound $8, $b1, $0740
  671.     sound $17, $0, $0000
  672.     sound $8, $81, $0740
  673.     sound $17, $0, $0000
  674.     sound $8, $51, $0740
  675.     sound $17, $0, $0000
  676.     endchannel
  677.  ; f1b8c
  678.  
  679.  Sfx_BallBounce_Ch6: ; f1b8c
  680.     dutycycle $2
  681.     sound $2, $8, $0000
  682.     sound $8, $b1, $0741
  683.     sound $17, $0, $0000
  684.     sound $8, $81, $0741
  685.     sound $17, $0, $0000
  686.     sound $8, $51, $0741
  687.     sound $17, $0, $0000
  688.     sound $8, $21, $0741
  689.     sound $17, $0, $0000
  690.     endchannel
  691.  ; f1bb3
  692.  
  693. @@ -3916,7 +3916,7 @@ Sfx_GiveTrademon: ; f1c10
  694.  ; f1c13
  695.  
  696.  Sfx_GiveTrademon_Ch5: ; f1c13
  697.     sound $20, $0, $0000
  698.     dutycycle $1
  699.     soundinput $a7
  700.     sound $1b, $f4, $0750
  701. @@ -3936,7 +3936,7 @@ Sfx_GetTrademon: ; f1c3e
  702.  ; f1c41
  703.  
  704.  Sfx_GetTrademon_Ch5: ; f1c41
  705.     sound $20, $0, $0000
  706.     dutycycle $2
  707.     soundinput $bf
  708.     sound $1b, $14, $07bc
  709. @@ -3959,7 +3959,7 @@ Sfx_TrainArrived: ; f1c6c
  710.  
  711.  Sfx_TrainArrived_Ch6: ; f1c75
  712.     tone $0008
  713.     sound $8, $0, $0000
  714.  Sfx_TrainArrived_Ch5: ; f1c7c
  715.     dutycycle $2
  716.     sound $4, $5f, $0691
  717. @@ -4060,7 +4060,7 @@ Sfx_SwitchPokemon_Ch5: ; f1d0f
  718.  
  719.  Sfx_SwitchPokemon_Ch6: ; f1d16
  720.     dutycycle $2
  721.     sound $2, $8, $0000
  722.     sound $8, $b1, $0741
  723.     endchannel
  724.  ; f1d21
  725. @@ -4093,7 +4093,7 @@ Sfx_Tally_Ch5: ; f1d43
  726.  
  727.  Sfx_Tally_Ch6: ; f1d4a
  728.     dutycycle $2
  729.     sound $1, $8, $0000
  730.     sound $4, $a1, $0761
  731.     endchannel
  732.  ; f1d55
  733. @@ -4107,7 +4107,7 @@ Sfx_Transaction_Ch5: ; f1d55
  734.  
  735.  Sfx_Transaction_Ch6: ; f1d60
  736.     dutycycle $2
  737.     sound $1, $8, $0000
  738.     sound $4, $91, $06c1
  739.     sound $18, $a2, $07a1
  740.     endchannel
  741. @@ -4183,7 +4183,7 @@ Sfx_GotSafariBalls_Ch5: ; f1dd4
  742.  Sfx_BootPc_Ch5: ; f1de3
  743.     dutycycle $2
  744.     sound $f, $f2, $07c0
  745.     sound $f, $0, $0000
  746.     sound $3, $a1, $0780
  747.     sound $3, $a1, $0700
  748.     sound $3, $a1, $0740
  749. @@ -4200,16 +4200,16 @@ Sfx_ShutDownPc_Ch5: ; f1e0e
  750.     sound $4, $f0, $0600
  751.     sound $4, $f0, $0400
  752.     sound $4, $f0, $0200
  753.     sound $1, $0, $0000
  754.     endchannel
  755.  ; f1e21
  756.  
  757.  Sfx_ChoosePcOption_Ch5: ; f1e21
  758.     dutycycle $2
  759.     sound $6, $f0, $0700
  760.     sound $4, $0, $0000
  761.     sound $6, $f0, $0700
  762.     sound $1, $0, $0000
  763.     endchannel
  764.  ; f1e34
  765.  
  766. @@ -4227,11 +4227,11 @@ Sfx_EscapeRope_Ch5: ; f1e34
  767.  
  768.  Sfx_PushButton_Ch5: ; f1e4f
  769.     dutycycle $2
  770.     sound $4, $0, $0000
  771.     sound $2, $f1, $0680
  772.     sound $1, $0, $0000
  773.     sound $4, $f1, $0780
  774.     sound $4, $0, $0000
  775.     endchannel
  776.  ; f1e66
  777.  
  778. @@ -4242,7 +4242,7 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
  779.     soundinput $22
  780.     sound $2, $f1, $0500
  781.     soundinput $8
  782.     sound $1, $0, $0000
  783.     endchannel
  784.  ; f1e7b
  785.  
  786. @@ -4319,18 +4319,18 @@ Sfx_Wrong_Ch5: ; f1f05
  787.     soundinput $5a
  788.     sound $4, $f0, $0500
  789.     soundinput $8
  790.     sound $4, $0, $0000
  791.     sound $f, $f0, $0500
  792.     sound $1, $0, $0000
  793.     endchannel
  794.  ; f1f1c
  795.  
  796.  Sfx_Wrong_Ch6: ; f1f1c
  797.     dutycycle $3
  798.     sound $4, $f0, $0401
  799.     sound $4, $0, $0000
  800.     sound $f, $f0, $0401
  801.     sound $1, $0, $0000
  802.     endchannel
  803.  ; f1f2f
  804.  
  805. @@ -4357,7 +4357,7 @@ Sfx_Strength_Ch8: ; f1f3a
  806.  Sfx_Boat_Ch5: ; f1f53
  807.     dutycycle $2
  808.     sound $f, $f0, $0500
  809.     sound $4, $0, $0000
  810.     sound $f, $f0, $0500
  811.     sound $f, $f0, $0500
  812.     sound $f, $f0, $0500
  813. @@ -4369,7 +4369,7 @@ Sfx_Boat_Ch5: ; f1f53
  814.  Sfx_Boat_Ch6: ; f1f72
  815.     dutycycle $3
  816.     sound $f, $f0, $0482
  817.     sound $4, $0, $0000
  818.     sound $f, $f0, $0482
  819.     sound $f, $f0, $0482
  820.     sound $f, $f0, $0482
  821. @@ -4423,7 +4423,7 @@ Sfx_Shine_Ch5: ; f1fd9
  822.     sound $0, $d2, $0780
  823.     sound $0, $d2, $07c0
  824.     sound $a, $e1, $07e0
  825.     sound $1, $0, $0000
  826.     endchannel
  827.  ; f1ff4
  828.  
  829. @@ -4493,7 +4493,7 @@ Sfx_Call_Ch5: ; f2052
  830.     sound $4, $f7, $07a0
  831.     sound $4, $f7, $07a0
  832.     soundinput $8
  833.     sound $4, $0, $0000
  834.     endchannel
  835.  ; f206f
  836.  
  837. @@ -5483,13 +5483,13 @@ Sfx_HangUp_Ch5: ; f26f1
  838.     dutycycle $2
  839.     sound $4, $b8, $077b
  840.     sound $2, $21, $077b
  841.     sound $10, $0, $0000
  842.  Sfx_HangUp_branch_f26ff: ; f26ff
  843.  Sfx_NoSignal_Ch5: ; f26ff
  844.  Sfx_NoSignal_branch_f26ff: ; f26ff
  845.     dutycycle $2
  846.     sound $14, $e8, $070b
  847.     sound $1c, $0, $0000
  848.     loopchannel 3, Sfx_HangUp_branch_f26ff
  849.     endchannel
  850.  ; f270e
  851. @@ -5526,8 +5526,8 @@ Sfx_Elevator_branch_f2726: ; f2726
  852.  
  853.  Sfx_Elevator_Ch6: ; f274b
  854.  Sfx_Elevator_Ch7: ; f274b
  855.     sound $60, $0, $0000
  856.     sound $53, $0, $0000
  857.     endchannel
  858.  ; f2754
  859.  
  860. diff --git a/audio/sfx_crystal.asm b/audio/sfx_crystal.asm
  861. index 08806a7..7970322 100644
  862. --- a/audio/sfx_crystal.asm
  863. +++ b/audio/sfx_crystal.asm
  864. @@ -84,7 +84,7 @@ Sfx_IntroPichu_Ch5: ; 1798ad
  865.     dutycycle $3
  866.     soundinput $4d
  867.     sound $1, $88, $0770
  868.     sound $3, $0, $0000
  869.     soundinput $17
  870.     sound $2, $88, $0776
  871.     endchannel
  872. diff --git a/audio/trainer_encounters.asm b/audio/trainer_encounters.asm
  873. index de748d2..622ba4a 100644
  874. --- a/audio/trainer_encounters.asm
  875. +++ b/audio/trainer_encounters.asm
  876. @@ -7,7 +7,7 @@ PlayTrainerEncounterMusic:: ; e900a
  877.     ld [MusicFade], a
  878.     ; play nothing for one frame
  879.     push de
  880.     ld de, $0000 ; id: Music_Nothing
  881.     call PlayMusic
  882.     call DelayFrame
  883.     ; play new song
  884. diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm
  885. index 5c4c435..21707f1 100644
  886. --- a/battle/anim_objects.asm
  887. +++ b/battle/anim_objects.asm
  888. @@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
  889.  
  890.  
  891.  Functioncc9bd: ; cc9bd
  892.     ld hl, $0000
  893.     add hl, bc
  894.     ld [hl], $0
  895.     ret
  896. diff --git a/battle/core.asm b/battle/core.asm
  897. index 6fc9a6f..a0d72da 100644
  898. --- a/battle/core.asm
  899. +++ b/battle/core.asm
  900. @@ -3240,7 +3240,7 @@ MonFaintedAnimation: ; 3d444
  901.  
  902.  
  903.  Function3d490: ; 3d490
  904. -   ld [hConnectionStripLength], a
  905. +   ld [hMapObjectIndexBuffer1], a
  906.     ld c, a
  907.  .asm_3d493
  908.     push bc
  909. @@ -3264,7 +3264,7 @@ Function3d490: ; 3d490
  910.  ; 3d4ae
  911.  
  912.  Function3d4ae: ; 3d4ae
  913. -   ld a, [hConnectionStripLength]
  914. +   ld a, [hMapObjectIndexBuffer1]
  915.     ld c, a
  916.     cp $8
  917.     jr nz, .back
  918. @@ -3646,7 +3646,7 @@ Function3d714: ; 3d714
  919.     push af
  920.     ld a, [CurBattleMon]
  921.     ld [CurPartyMon], a
  922. -   callba Functione538
  923. +   callba CheckCurPartyMonFainted
  924.     pop bc
  925.     ld a, b
  926.     ld [CurPartyMon], a
  927. @@ -9458,7 +9458,7 @@ Function3fc30: ; 3fc30
  928.  Function3fc5b: ; 3fc5b
  929.     ld hl, Sprites
  930.     xor a
  931. -   ld [hConnectionStripLength], a
  932. +   ld [hMapObjectIndexBuffer1], a
  933.     ld b, $6
  934.     ld e, $a8
  935.  .asm_3fc65
  936. @@ -9469,10 +9469,10 @@ Function3fc5b: ; 3fc5b
  937.     inc hl
  938.     ld [hl], e
  939.     inc hl
  940. -   ld a, [hConnectionStripLength]
  941. +   ld a, [hMapObjectIndexBuffer1]
  942.     ld [hli], a
  943.     inc a
  944. -   ld [hConnectionStripLength], a
  945. +   ld [hMapObjectIndexBuffer1], a
  946.     ld a, $1
  947.     ld [hli], a
  948.     ld a, d
  949. @@ -9480,9 +9480,9 @@ Function3fc5b: ; 3fc5b
  950.     ld d, a
  951.     dec c
  952.     jr nz, .asm_3fc69
  953. -   ld a, [hConnectionStripLength]
  954. +   ld a, [hMapObjectIndexBuffer1]
  955.     add $3
  956. -   ld [hConnectionStripLength], a
  957. +   ld [hMapObjectIndexBuffer1], a
  958.     ld a, e
  959.     add $8
  960.     ld e, a
  961. diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm
  962. index 073fe40..8248955 100644
  963. --- a/battle/effect_command_pointers.asm
  964. +++ b/battle/effect_command_pointers.asm
  965. @@ -1,5 +1,5 @@
  966.  
  967.     dw $0000 ; padding
  968.  
  969.  BattleCommandPointers: ; 3fd28
  970.     dw BattleCommand01 ; 34084
  971. diff --git a/constants.asm b/constants.asm
  972. index 1c37913..e0a2961 100644
  973. --- a/constants.asm
  974. +++ b/constants.asm
  975. @@ -1,4 +1,3 @@
  976. -
  977.  INCLUDE "macros.asm"
  978.  
  979.  INCLUDE "gbhw.asm"
  980. diff --git a/constants/map_constants.asm b/constants/map_constants.asm
  981. index 1b553c7..7a40a6f 100644
  982. --- a/constants/map_constants.asm
  983. +++ b/constants/map_constants.asm
  984. @@ -517,8 +517,8 @@ const_value SET 1
  985.     const OBJECT_MAP_OBJECT_INDEX
  986.     const OBJECT_SPRITE_TILE
  987.     const OBJECT_03
  988. -   const OBJECT_04
  989. -   const OBJECT_FLAGS
  990. +   const OBJECT_FLAGS1
  991. +   const OBJECT_FLAGS2
  992.     const OBJECT_PALETTE
  993.     const OBJECT_DIRECTION_WALKING
  994.     const OBJECT_FACING
  995. diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
  996. index 833c843..d333a51 100644
  997. --- a/constants/misc_constants.asm
  998. +++ b/constants/misc_constants.asm
  999. @@ -1,5 +1,4 @@
  1000.  NONE EQU 0
  1001. -
  1002.  PARTY_LENGTH EQU 6
  1003.  
  1004.  MAX_ITEMS     EQU 20
  1005. diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
  1006. index f0fb8d6..ecbe7ad 100644
  1007. --- a/constants/sprite_constants.asm
  1008. +++ b/constants/sprite_constants.asm
  1009. @@ -217,3 +217,6 @@ const_value SET 1
  1010.     const SPRITEMOVEFN_1F
  1011.     const SPRITEMOVEFN_20
  1012.     const SPRITEMOVEFN_21
  1013. +   const SPRITEMOVEFN_22
  1014. +   const SPRITEMOVEFN_23
  1015. +   const SPRITEMOVEFN_24
  1016. diff --git a/engine/events.asm b/engine/events.asm
  1017. index 961a7f5..e60f08b 100644
  1018. --- a/engine/events.asm
  1019. +++ b/engine/events.asm
  1020. @@ -606,7 +606,7 @@ TryObjectEvent: ; 969b5
  1021.  
  1022.  .IsObject
  1023.     call PlayTalkObject
  1024. -   ld a, [hConnectedMapWidth]
  1025. +   ld a, [hMapObjectIndexBuffer2]
  1026.     call GetObjectStruct
  1027.     ld hl, OBJECT_MAP_OBJECT_INDEX
  1028.     add hl, bc
  1029. diff --git a/engine/events_2.asm b/engine/events_2.asm
  1030. index 966fa7d..42bae51 100644
  1031. --- a/engine/events_2.asm
  1032. +++ b/engine/events_2.asm
  1033. @@ -352,7 +352,7 @@ Function97e08:: ; 97e08
  1034.     ld hl, wd6de
  1035.     xor a
  1036.  .asm_97e0c
  1037. -   ld [hConnectionStripLength], a
  1038. +   ld [hMapObjectIndexBuffer1], a
  1039.     ld a, [hl]
  1040.     and a
  1041.     jr z, .asm_97e19
  1042. @@ -365,7 +365,7 @@ Function97e08:: ; 97e08
  1043.  .asm_97e19
  1044.     ld de, $0006
  1045.     add hl, de
  1046. -   ld a, [hConnectionStripLength]
  1047. +   ld a, [hMapObjectIndexBuffer1]
  1048.     inc a
  1049.     cp $4
  1050.     jr nz, .asm_97e0c
  1051. @@ -441,14 +441,14 @@ Function97e5c:: ; 97e5c
  1052.  ; 97e72
  1053.  
  1054.  Function97e72: ; 97e72
  1055.     ld hl, $0000
  1056.     add hl, bc
  1057.     ld [hl], 0
  1058.     ret
  1059.  ; 97e79
  1060.  
  1061.  Function97e79: ; 97e79
  1062.     ld hl, $0000
  1063.     add hl, bc
  1064.     ld a, [hl]
  1065.     cp 5
  1066. @@ -620,7 +620,7 @@ Function97f42: ; 97f42
  1067.  .asm_97f47
  1068.     push af
  1069.  
  1070.     ld hl, $0000
  1071.     add hl, de
  1072.     ld a, [hl]
  1073.     and a
  1074. diff --git a/engine/map_objects.asm b/engine/map_objects.asm
  1075. index d73ebd1..270ad71 100644
  1076. --- a/engine/map_objects.asm
  1077. +++ b/engine/map_objects.asm
  1078. @@ -78,7 +78,7 @@ Function437b: ; 437b
  1079.  ; 4386
  1080.  
  1081.  Function4386: ; 4386
  1082. -   ld hl, OBJECT_FLAGS
  1083. +   ld hl, OBJECT_FLAGS2
  1084.     add hl, bc
  1085.     res 6, [hl]
  1086.     ld a, [XCoord]
  1087. @@ -104,7 +104,7 @@ Function4386: ; 4386
  1088.     jr .yes
  1089.  
  1090.  .ok
  1091. -   ld hl, OBJECT_FLAGS
  1092. +   ld hl, OBJECT_FLAGS2
  1093.     add hl, bc
  1094.     set 6, [hl]
  1095.     ld a, [XCoord]
  1096. @@ -133,7 +133,7 @@ Function4386: ; 4386
  1097.     ret
  1098.  
  1099.  .ok2
  1100. -   ld hl, OBJECT_04
  1101. +   ld hl, OBJECT_FLAGS1
  1102.     add hl, bc
  1103.     bit 1, [hl]
  1104.     jr nz, .yes2
  1105. @@ -142,7 +142,7 @@ Function4386: ; 4386
  1106.     ret
  1107.  
  1108.  .yes2
  1109. -   ld hl, OBJECT_FLAGS
  1110. +   ld hl, OBJECT_FLAGS2
  1111.     add hl, bc
  1112.     set 6, [hl]
  1113.     and a
  1114. @@ -155,7 +155,7 @@ Function43f3: ; 43f3
  1115.     ld a, [hl]
  1116.     and a
  1117.     jr z, .zero
  1118. -   ld hl, OBJECT_FLAGS
  1119. +   ld hl, OBJECT_FLAGS2
  1120.     add hl, bc
  1121.     bit 5, [hl]
  1122.     jr nz, .not_bit5
  1123. @@ -165,7 +165,7 @@ Function43f3: ; 43f3
  1124.  
  1125.  .zero
  1126.     call Function47bc
  1127. -   ld hl, OBJECT_FLAGS
  1128. +   ld hl, OBJECT_FLAGS2
  1129.     add hl, bc
  1130.     bit 5, [hl]
  1131.     jr nz, .not_bit5
  1132. @@ -190,12 +190,12 @@ Function43f3: ; 43f3
  1133.  ; 4427
  1134.  
  1135.  Function4427: ; 4427
  1136. -   ld hl, OBJECT_04
  1137. +   ld hl, OBJECT_FLAGS1
  1138.     add hl, bc
  1139.     bit 0, [hl]
  1140.     jr nz, Function44a3
  1141.  
  1142. -   ld hl, OBJECT_FLAGS
  1143. +   ld hl, OBJECT_FLAGS2
  1144.     add hl, bc
  1145.     bit 6, [hl]
  1146.     jr nz, Function44a3
  1147. @@ -208,7 +208,7 @@ Function4427: ; 4427
  1148.  ; 4440
  1149.  
  1150.  Function4440: ; 4440
  1151. -   ld hl, OBJECT_04
  1152. +   ld hl, OBJECT_FLAGS1
  1153.     add hl, bc
  1154.     bit 0, [hl]
  1155.     jr nz, Function44a3
  1156. @@ -300,7 +300,7 @@ Function44b5: ; 44b5
  1157.  ; 44c1
  1158.  
  1159.  Function44c1: ; 44c1
  1160. -   ld hl, OBJECT_04
  1161. +   ld hl, OBJECT_FLAGS1
  1162.     add hl, bc
  1163.     bit 3, [hl]
  1164.     jp nz, Function44aa
  1165. @@ -324,7 +324,7 @@ Function44c1: ; 44c1
  1166.  ; 44e4
  1167.  
  1168.  Function44e4: ; 44e4
  1169. -   ld hl, OBJECT_04
  1170. +   ld hl, OBJECT_FLAGS1
  1171.     add hl, bc
  1172.     bit 3, [hl]
  1173.     jp nz, Function44aa
  1174. @@ -348,7 +348,7 @@ Function44e4: ; 44e4
  1175.  ; 4508
  1176.  
  1177.  Function4508: ; 4508
  1178. -   ld hl, OBJECT_04
  1179. +   ld hl, OBJECT_FLAGS1
  1180.     add hl, bc
  1181.     bit 3, [hl]
  1182.     jp nz, Function44aa
  1183. @@ -603,7 +603,7 @@ Function462a: ; 462a
  1184.  ; 463f
  1185.  
  1186.  Function463f: ; 463f
  1187. -   ld hl, OBJECT_FLAGS
  1188. +   ld hl, OBJECT_FLAGS2
  1189.     add hl, bc
  1190.     bit 3, [hl]
  1191.     jr z, .ok
  1192. @@ -632,13 +632,13 @@ Function4661: ; 4661
  1193.     jr c, .reset
  1194.  
  1195.  .set
  1196. -   ld hl, OBJECT_FLAGS
  1197. +   ld hl, OBJECT_FLAGS2
  1198.     add hl, bc
  1199.     set 3, [hl]
  1200.     ret
  1201.  
  1202.  .reset
  1203. -   ld hl, OBJECT_FLAGS
  1204. +   ld hl, OBJECT_FLAGS2
  1205.     add hl, bc
  1206.     res 3, [hl]
  1207.     ret
  1208. @@ -670,7 +670,7 @@ Function4690: ; 4690
  1209.     ld hl, OBJECT_DIRECTION_WALKING
  1210.     add hl, bc
  1211.     ld [hl], a
  1212. -   ld hl, OBJECT_04
  1213. +   ld hl, OBJECT_FLAGS1
  1214.     add hl, bc
  1215.     bit 2, [hl]
  1216.     jr nz, .ok
  1217. @@ -1098,7 +1098,7 @@ Function48b3: ; 48b3
  1218.     ld a, [hl]
  1219.     call CheckPitTile
  1220.     jr z, .on_pit
  1221. -   ld hl, OBJECT_FLAGS
  1222. +   ld hl, OBJECT_FLAGS2
  1223.     add hl, bc
  1224.     bit 2, [hl]
  1225.     res 2, [hl]
  1226. @@ -1192,7 +1192,7 @@ Function48ff: ; 48ff
  1227.     and %00001100
  1228.     or d
  1229.     pop bc
  1230. -   jp Function5412
  1231. +   jp NormalStep
  1232.  
  1233.  .standing
  1234.     pop bc
  1235. @@ -1499,7 +1499,7 @@ Function4af0: ; 4af0
  1236.     add hl, bc
  1237.     ld [hl], 2
  1238.     ld hl, wd4cf
  1239. -   ld a, [hConnectionStripLength]
  1240. +   ld a, [hMapObjectIndexBuffer1]
  1241.     cp [hl]
  1242.     jr z, .ok
  1243.     ld hl, OBJECT_09
  1244. @@ -1604,7 +1604,7 @@ Function4b8d: ; 4b8d
  1245.     ret nz
  1246.     call Function4600
  1247.     call Function46a6
  1248. -   ld hl, OBJECT_FLAGS
  1249. +   ld hl, OBJECT_FLAGS2
  1250.     add hl, bc
  1251.     res 3, [hl]
  1252.     call IncrementObjectStructField28
  1253. @@ -1648,7 +1648,7 @@ Function4bd2: ; 4bd2
  1254.     dec [hl]
  1255.     ret nz
  1256.     call Function4600
  1257. -   ld hl, OBJECT_FLAGS
  1258. +   ld hl, OBJECT_FLAGS2
  1259.     add hl, bc
  1260.     res 3, [hl]
  1261.     ld hl, wd150
  1262. @@ -1723,7 +1723,7 @@ Function4c42: ; 4c42
  1263.     ld hl, OBJECT_STEP_DURATION
  1264.     add hl, bc
  1265.     ld [hl], $10
  1266. -   ld hl, OBJECT_FLAGS
  1267. +   ld hl, OBJECT_FLAGS2
  1268.     add hl, bc
  1269.     res 3, [hl]
  1270.     call IncrementObjectStructField28
  1271. @@ -2198,7 +2198,7 @@ Function4ecd: ; 4ecd
  1272.     ld b, a
  1273.     callba CopyDECoordsToMapObject
  1274.     pop bc
  1275. -   ld hl, OBJECT_FLAGS
  1276. +   ld hl, OBJECT_FLAGS2
  1277.     add hl, bc
  1278.     res 2, [hl]
  1279.     call Function4600
  1280. @@ -2508,7 +2508,7 @@ Function54b8: ; 54b8
  1281.     ret z
  1282.     ld a, [wd4cd]
  1283.     ld d, a
  1284. -   ld a, [hConnectionStripLength]
  1285. +   ld a, [hMapObjectIndexBuffer1]
  1286.     cp d
  1287.     ret nz
  1288.     ld a, e
  1289. @@ -2651,7 +2651,7 @@ Function5565: ; 5565
  1290.  
  1291.  Function5579: ; 5579
  1292.     push bc
  1293. -   ld a, [hConnectionStripLength]
  1294. +   ld a, [hMapObjectIndexBuffer1]
  1295.     ld c, a
  1296.     call Function5582
  1297.     pop bc
  1298. @@ -2663,7 +2663,7 @@ Function5582: ; 5582
  1299.     ld a, NUM_OBJECT_STRUCTS
  1300.  .loop
  1301.     push af
  1302. -   ld hl, OBJECT_04
  1303. +   ld hl, OBJECT_FLAGS1
  1304.     add hl, de
  1305.     bit 7, [hl]
  1306.     jr z, .next
  1307. @@ -2712,7 +2712,7 @@ Function55b9: ; 55b9
  1308.     ld [hli], a
  1309.     ld a, [de]
  1310.     ld [hli], a
  1311. -   ld a, [hConnectionStripLength]
  1312. +   ld a, [hMapObjectIndexBuffer1]
  1313.     ld [hli], a
  1314.     push hl
  1315.     ld hl, OBJECT_MAP_X
  1316. @@ -2737,7 +2737,7 @@ Function55e0:: ; 55e0
  1317.     ld bc, ObjectStructs
  1318.     xor a
  1319.  .loop
  1320. -   ld [hConnectionStripLength], a
  1321. +   ld [hMapObjectIndexBuffer1], a
  1322.     call GetObjectSprite
  1323.     jr z, .ok
  1324.     call Function565c
  1325. @@ -2747,7 +2747,7 @@ Function55e0:: ; 55e0
  1326.     add hl, bc
  1327.     ld b, h
  1328.     ld c, l
  1329. -   ld a, [hConnectionStripLength]
  1330. +   ld a, [hMapObjectIndexBuffer1]
  1331.     inc a
  1332.     cp NUM_OBJECT_STRUCTS
  1333.     jr nz, .loop
  1334. @@ -2801,13 +2801,13 @@ Function5645: ; 5645
  1335.     xor a
  1336.     ld bc, ObjectStructs
  1337.  .loop
  1338. -   ld [hConnectionStripLength], a
  1339. +   ld [hMapObjectIndexBuffer1], a
  1340.     call Function5680
  1341.     ld hl, OBJECT_STRUCT_LENGTH
  1342.     add hl, bc
  1343.     ld b, h
  1344.     ld c, l
  1345. -   ld a, [hConnectionStripLength]
  1346. +   ld a, [hMapObjectIndexBuffer1]
  1347.     inc a
  1348.     cp NUM_OBJECT_STRUCTS
  1349.     jr nz, .loop
  1350. @@ -3032,7 +3032,7 @@ Function5781: ; 5781
  1351.     ld bc, ObjectStructs
  1352.     xor a
  1353.  .loop
  1354. -   ld [hConnectionStripLength], a
  1355. +   ld [hMapObjectIndexBuffer1], a
  1356.     call GetObjectSprite
  1357.     jr z, .next
  1358.     call Function437b
  1359. @@ -3042,7 +3042,7 @@ Function5781: ; 5781
  1360.     add hl, bc
  1361.     ld b, h
  1362.     ld c, l
  1363. -   ld a, [hConnectionStripLength]
  1364. +   ld a, [hMapObjectIndexBuffer1]
  1365.     inc a
  1366.     cp NUM_OBJECT_STRUCTS
  1367.     jr nz, .loop
  1368. @@ -3102,7 +3102,7 @@ Function57e2: ; 57e2
  1369.     ld a, d
  1370.     and $80
  1371.     ret z
  1372.     ld bc, $0000 ; debug?
  1373.     ld hl, OBJECT_FACING
  1374.     add hl, bc
  1375.     ld a, [hl]
  1376. @@ -3137,7 +3137,7 @@ Function5803:: ; 5803
  1377.  Function5815: ; 5815
  1378.     call Function18de
  1379.     ret c
  1380. -   ld a, [hConnectedMapWidth]
  1381. +   ld a, [hMapObjectIndexBuffer2]
  1382.     ld [wd4cd], a
  1383.     ret
  1384.  ; 581f
  1385. @@ -3166,7 +3166,7 @@ Function582c: ; 582c
  1386.     ld hl, OBJECT_09
  1387.     add hl, bc
  1388.     ld [hl], 0
  1389. -   ld a, [hConnectedMapWidth]
  1390. +   ld a, [hMapObjectIndexBuffer2]
  1391.     ld [wd4ce], a
  1392.     ret
  1393.  ; 5847
  1394. @@ -3189,7 +3189,7 @@ SetFlagsForMovement_1:: ; 585c
  1395.     push bc
  1396.     call Function587a
  1397.     pop bc
  1398. -   ld hl, OBJECT_FLAGS
  1399. +   ld hl, OBJECT_FLAGS2
  1400.     add hl, bc
  1401.     res 5, [hl]
  1402.     xor a
  1403. @@ -3199,7 +3199,7 @@ SetFlagsForMovement_1:: ; 585c
  1404.  Function586e: ; 586e
  1405.     call Function18de
  1406.     ret c
  1407. -   ld hl, OBJECT_FLAGS
  1408. +   ld hl, OBJECT_FLAGS2
  1409.     add hl, bc
  1410.     set 5, [hl]
  1411.     xor a
  1412. @@ -3213,7 +3213,7 @@ Function587a: ; 587a
  1413.     push af
  1414.     call GetObjectSprite
  1415.     jr z, .next
  1416. -   ld hl, OBJECT_FLAGS
  1417. +   ld hl, OBJECT_FLAGS2
  1418.     add hl, bc
  1419.     set 5, [hl]
  1420.  
  1421. @@ -3245,7 +3245,7 @@ _SetFlagsForMovement_2:: ; 5897
  1422.     cp -1
  1423.     ret z
  1424.     call GetObjectStruct
  1425. -   ld hl, OBJECT_FLAGS
  1426. +   ld hl, OBJECT_FLAGS2
  1427.     add hl, bc
  1428.     res 5, [hl]
  1429.     ret
  1430. @@ -3259,7 +3259,7 @@ Function58b9:: ; 58b9
  1431.     push af
  1432.     call GetObjectSprite
  1433.     jr z, .next
  1434. -   ld hl, OBJECT_FLAGS
  1435. +   ld hl, OBJECT_FLAGS2
  1436.     add hl, bc
  1437.     res 5, [hl]
  1438.  
  1439. @@ -3279,7 +3279,7 @@ Function58b9:: ; 58b9
  1440.  Function58d8: ; 58d8
  1441.     call Function18de
  1442.     ret c
  1443. -   ld hl, OBJECT_FLAGS
  1444. +   ld hl, OBJECT_FLAGS2
  1445.     add hl, bc
  1446.     res 5, [hl]
  1447.     ret
  1448. @@ -3357,7 +3357,7 @@ Function593a: ; 593a
  1449.     ret nc
  1450.     ld l, a
  1451.     ld h, $c4
  1452. -   ld de, OBJECT_04
  1453. +   ld de, OBJECT_FLAGS1
  1454.     ld a, b
  1455.     ld c, $a0
  1456.  .loop
  1457. @@ -3447,7 +3447,7 @@ Function59a4: ; 59a4
  1458.  
  1459.  ; Define the sprite priority.
  1460.     ld e, $10
  1461. -   ld hl, OBJECT_FLAGS
  1462. +   ld hl, OBJECT_FLAGS2
  1463.     add hl, bc
  1464.     bit 0, [hl]
  1465.     jr nz, .add
  1466. @@ -3517,7 +3517,7 @@ Function5a0d: ; 5a0d
  1467.     or %00001000
  1468.  .skip1
  1469.  
  1470. -   ld hl, OBJECT_FLAGS
  1471. +   ld hl, OBJECT_FLAGS2
  1472.     add hl, bc
  1473.     ld e, [hl]
  1474.     bit 7, e
  1475. diff --git a/engine/movement.asm b/engine/movement.asm
  1476. index d3c570c..8a4f09c 100644
  1477. --- a/engine/movement.asm
  1478. +++ b/engine/movement.asm
  1479. @@ -1,120 +1,120 @@
  1480.  MovementPointers: ; 5075
  1481. -   dw Movement_turn_head_down
  1482. -   dw Movement_turn_head_up
  1483. -   dw Movement_turn_head_left
  1484. -   dw Movement_turn_head_right
  1485. -   dw Movement_half_step_down
  1486. -   dw Movement_half_step_up
  1487. -   dw Movement_half_step_left
  1488. -   dw Movement_half_step_right
  1489. -   dw Movement_slow_step_down
  1490. -   dw Movement_slow_step_up
  1491. -   dw Movement_slow_step_left
  1492. -   dw Movement_slow_step_right
  1493. -   dw Movement_step_down
  1494. -   dw Movement_step_up
  1495. -   dw Movement_step_left
  1496. -   dw Movement_step_right
  1497. -   dw Movement_big_step_down
  1498. -   dw Movement_big_step_up
  1499. -   dw Movement_big_step_left
  1500. -   dw Movement_big_step_right
  1501. -   dw Movement_slow_slide_step_down
  1502. -   dw Movement_slow_slide_step_up
  1503. -   dw Movement_slow_slide_step_left
  1504. -   dw Movement_slow_slide_step_right
  1505. -   dw Movement_slide_step_down
  1506. -   dw Movement_slide_step_up
  1507. -   dw Movement_slide_step_left
  1508. -   dw Movement_slide_step_right
  1509. -   dw Movement_fast_slide_step_down
  1510. -   dw Movement_fast_slide_step_up
  1511. -   dw Movement_fast_slide_step_left
  1512. -   dw Movement_fast_slide_step_right
  1513. -   dw Movement_turn_away_down
  1514. -   dw Movement_turn_away_up
  1515. -   dw Movement_turn_away_left
  1516. -   dw Movement_turn_away_right
  1517. -   dw Movement_turn_in_down
  1518. -   dw Movement_turn_in_up
  1519. -   dw Movement_turn_in_left
  1520. -   dw Movement_turn_in_right
  1521. -   dw Movement_turn_waterfall_down
  1522. -   dw Movement_turn_waterfall_up
  1523. -   dw Movement_turn_waterfall_left
  1524. -   dw Movement_turn_waterfall_right
  1525. -   dw Movement_slow_jump_step_down
  1526. -   dw Movement_slow_jump_step_up
  1527. -   dw Movement_slow_jump_step_left
  1528. -   dw Movement_slow_jump_step_right
  1529. -   dw Movement_jump_step_down
  1530. -   dw Movement_jump_step_up
  1531. -   dw Movement_jump_step_left
  1532. -   dw Movement_jump_step_right
  1533. -   dw Movement_fast_jump_step_down
  1534. -   dw Movement_fast_jump_step_up
  1535. -   dw Movement_fast_jump_step_left
  1536. -   dw Movement_fast_jump_step_right
  1537. -   dw Function5293
  1538. -   dw Function529c
  1539. -   dw Movement_remove_fixed_facing
  1540. -   dw Movement_fix_facing
  1541. -   dw Function52b7
  1542. -   dw Movement_hide_person
  1543. -   dw Movement_show_person
  1544. -   dw Function5226
  1545. -   dw Function522a
  1546. -   dw Function522e
  1547. -   dw Function5232
  1548. -   dw Function5236
  1549. -   dw Function523a
  1550. -   dw Movement_accelerate_last
  1551. -   dw Movement_step_sleep
  1552. -   dw Movement_step_end
  1553. -   dw Function51db
  1554. -   dw Movement_remove_person
  1555. -   dw Function51b8
  1556. -   dw Function5210
  1557. -   dw Movement_teleport_from
  1558. -   dw Movement_teleport_to
  1559. -   dw Movement_skyfall
  1560. -   dw Movement_step_wait5
  1561. -   dw Function525f
  1562. -   dw Function5189
  1563. -   dw Function51ab
  1564. -   dw Movement_hide_emote
  1565. -   dw Movement_show_emote
  1566. -   dw Movement_step_shake
  1567. -   dw Function5279
  1568. -   dw Function5196
  1569. -   dw Function516a
  1570. -   dw Function513e
  1571. +   dw Movement_turn_head_down        ; 00
  1572. +   dw Movement_turn_head_up          ; 01
  1573. +   dw Movement_turn_head_left        ; 02
  1574. +   dw Movement_turn_head_right       ; 03
  1575. +   dw Movement_half_step_down        ; 04
  1576. +   dw Movement_half_step_up          ; 05
  1577. +   dw Movement_half_step_left        ; 06
  1578. +   dw Movement_half_step_right       ; 07
  1579. +   dw Movement_slow_step_down        ; 08
  1580. +   dw Movement_slow_step_up          ; 09
  1581. +   dw Movement_slow_step_left        ; 0a
  1582. +   dw Movement_slow_step_right       ; 0b
  1583. +   dw Movement_step_down             ; 0c
  1584. +   dw Movement_step_up               ; 0d
  1585. +   dw Movement_step_left             ; 0e
  1586. +   dw Movement_step_right            ; 0f
  1587. +   dw Movement_big_step_down         ; 10
  1588. +   dw Movement_big_step_up           ; 11
  1589. +   dw Movement_big_step_left         ; 12
  1590. +   dw Movement_big_step_right        ; 13
  1591. +   dw Movement_slow_slide_step_down  ; 14
  1592. +   dw Movement_slow_slide_step_up    ; 15
  1593. +   dw Movement_slow_slide_step_left  ; 16
  1594. +   dw Movement_slow_slide_step_right ; 17
  1595. +   dw Movement_slide_step_down       ; 18
  1596. +   dw Movement_slide_step_up         ; 19
  1597. +   dw Movement_slide_step_left       ; 1a
  1598. +   dw Movement_slide_step_right      ; 1b
  1599. +   dw Movement_fast_slide_step_down  ; 1c
  1600. +   dw Movement_fast_slide_step_up    ; 1d
  1601. +   dw Movement_fast_slide_step_left  ; 1e
  1602. +   dw Movement_fast_slide_step_right ; 1f
  1603. +   dw Movement_turn_away_down        ; 20
  1604. +   dw Movement_turn_away_up          ; 21
  1605. +   dw Movement_turn_away_left        ; 22
  1606. +   dw Movement_turn_away_right       ; 23
  1607. +   dw Movement_turn_in_down          ; 24
  1608. +   dw Movement_turn_in_up            ; 25
  1609. +   dw Movement_turn_in_left          ; 26
  1610. +   dw Movement_turn_in_right         ; 27
  1611. +   dw Movement_turn_waterfall_down   ; 28
  1612. +   dw Movement_turn_waterfall_up     ; 29
  1613. +   dw Movement_turn_waterfall_left   ; 2a
  1614. +   dw Movement_turn_waterfall_right  ; 2b
  1615. +   dw Movement_slow_jump_step_down   ; 2c
  1616. +   dw Movement_slow_jump_step_up     ; 2d
  1617. +   dw Movement_slow_jump_step_left   ; 2e
  1618. +   dw Movement_slow_jump_step_right  ; 2f
  1619. +   dw Movement_jump_step_down        ; 30
  1620. +   dw Movement_jump_step_up          ; 31
  1621. +   dw Movement_jump_step_left        ; 32
  1622. +   dw Movement_jump_step_right       ; 33
  1623. +   dw Movement_fast_jump_step_down   ; 34
  1624. +   dw Movement_fast_jump_step_up     ; 35
  1625. +   dw Movement_fast_jump_step_left   ; 36
  1626. +   dw Movement_fast_jump_step_right  ; 37
  1627. +   dw Movement_38                    ; 38
  1628. +   dw Movement_39                    ; 39
  1629. +   dw Movement_remove_fixed_facing   ; 3a
  1630. +   dw Movement_fix_facing            ; 3b
  1631. +   dw Movement_3c                    ; 3c
  1632. +   dw Movement_hide_person           ; 3d
  1633. +   dw Movement_show_person           ; 3e
  1634. +   dw Movement_3f                    ; 3f
  1635. +   dw Movement_40                    ; 40
  1636. +   dw Movement_41                    ; 41
  1637. +   dw Movement_42                    ; 42
  1638. +   dw Movement_43                    ; 43
  1639. +   dw Movement_44                    ; 44
  1640. +   dw Movement_accelerate_last       ; 45
  1641. +   dw Movement_step_sleep            ; 46
  1642. +   dw Movement_step_end              ; 47
  1643. +   dw Movement_48                    ; 48
  1644. +   dw Movement_remove_person         ; 49
  1645. +   dw Movement_4a                    ; 4a
  1646. +   dw Movement_4b                    ; 4b
  1647. +   dw Movement_teleport_from         ; 4c
  1648. +   dw Movement_teleport_to           ; 4d
  1649. +   dw Movement_skyfall               ; 4e
  1650. +   dw Movement_step_wait5            ; 4f
  1651. +   dw Movement_50                    ; 50
  1652. +   dw Movement_51                    ; 51
  1653. +   dw Movement_52                    ; 52
  1654. +   dw Movement_hide_emote            ; 53
  1655. +   dw Movement_show_emote            ; 54
  1656. +   dw Movement_step_shake            ; 55
  1657. +   dw Movement_56                    ; 56
  1658. +   dw Movement_57                    ; 57
  1659. +   dw Movement_58                    ; 58
  1660. +   dw Movement_59                    ; 59
  1661.  ; 5129
  1662.  
  1663.  
  1664.  Movement_teleport_from: ; 5129
  1665. -   ld hl, $0009
  1666. +   ld hl, OBJECT_09
  1667.     add hl, bc
  1668.     ld [hl], $c
  1669.     ret
  1670.  ; 5130
  1671.  
  1672.  Movement_teleport_to: ; 5130
  1673. -   ld hl, $0009
  1674. +   ld hl, OBJECT_09
  1675.     add hl, bc
  1676.     ld [hl], $d
  1677.     ret
  1678.  ; 5137
  1679.  
  1680.  Movement_skyfall: ; 5137
  1681. -   ld hl, $0009
  1682. +   ld hl, OBJECT_09
  1683.     add hl, bc
  1684.     ld [hl], $e
  1685.     ret
  1686.  ; 513e
  1687.  
  1688. -Function513e: ; 513e
  1689. -   ld hl, $0009
  1690. +Movement_59: ; 513e
  1691. +   ld hl, OBJECT_09
  1692.     add hl, bc
  1693.     ld [hl], $19
  1694.     ret
  1695. @@ -124,81 +124,81 @@ Movement_step_wait5: ; 5145
  1696.     call GetSpriteDirection
  1697.     rlca
  1698.     rlca
  1699. -   ld hl, $000c
  1700. +   ld hl, OBJECT_12
  1701.     add hl, bc
  1702.     ld [hl], a
  1703. -   ld hl, $000b
  1704. +   ld hl, OBJECT_11
  1705.     add hl, bc
  1706.     ld [hl], $4
  1707.     call GetMovementByte
  1708. -   ld hl, $000a
  1709. +   ld hl, OBJECT_STEP_DURATION
  1710.     add hl, bc
  1711.     ld [hl], a
  1712. -   ld hl, $0009
  1713. +   ld hl, OBJECT_09
  1714.     add hl, bc
  1715.     ld [hl], $3
  1716. -   ld hl, $0007
  1717. +   ld hl, OBJECT_DIRECTION_WALKING
  1718.     add hl, bc
  1719.     ld [hl], $ff
  1720.     ret
  1721.  ; 516a
  1722.  
  1723. -Function516a: ; 516a
  1724. +Movement_58: ; 516a
  1725.     call GetSpriteDirection
  1726.     rlca
  1727.     rlca
  1728. -   ld hl, $000c
  1729. +   ld hl, OBJECT_12
  1730.     add hl, bc
  1731.     ld [hl], a
  1732.     call GetMovementByte
  1733. -   ld hl, $000a
  1734. +   ld hl, OBJECT_STEP_DURATION
  1735.     add hl, bc
  1736.     ld [hl], a
  1737. -   ld hl, $0007
  1738. +   ld hl, OBJECT_DIRECTION_WALKING
  1739.     add hl, bc
  1740.     ld [hl], $ff
  1741. -   ld hl, $0009
  1742. +   ld hl, OBJECT_09
  1743.     add hl, bc
  1744.     ld [hl], $12
  1745.     ret
  1746.  ; 5189
  1747.  
  1748. -Function5189: ; 5189
  1749. -   ld hl, $000b
  1750. +Movement_51: ; 5189
  1751. +   ld hl, OBJECT_11
  1752.     add hl, bc
  1753.     ld [hl], $6
  1754. -   ld hl, $0009
  1755. +   ld hl, OBJECT_09
  1756.     add hl, bc
  1757.     ld [hl], $10
  1758.     ret
  1759.  ; 5196
  1760.  
  1761. -Function5196: ; 5196
  1762. +Movement_57: ; 5196
  1763.     call GetMovementByte
  1764. -   ld hl, $000a
  1765. +   ld hl, OBJECT_STEP_DURATION
  1766.     add hl, bc
  1767.     ld [hl], a
  1768. -   ld hl, $000b
  1769. +   ld hl, OBJECT_11
  1770.     add hl, bc
  1771.     ld [hl], $1
  1772. -   ld hl, $0009
  1773. +   ld hl, OBJECT_09
  1774.     add hl, bc
  1775.     ld [hl], $11
  1776.     ret
  1777.  ; 51ab
  1778.  
  1779. -Function51ab: ; 51ab
  1780. -   ld hl, $000b
  1781. +Movement_52: ; 51ab
  1782. +   ld hl, OBJECT_11
  1783.     add hl, bc
  1784.     ld [hl], $6
  1785. -   ld hl, $0009
  1786. +   ld hl, OBJECT_09
  1787.     add hl, bc
  1788.     ld [hl], $1
  1789.     ret
  1790.  ; 51b8
  1791.  
  1792. -Function51b8: ; 51b8
  1793. -   ld hl, $001b
  1794. +Movement_4a: ; 51b8
  1795. +   ld hl, OBJECT_27
  1796.     add hl, bc
  1797.     ld [hl], $0
  1798.     jp Function5065
  1799. @@ -206,33 +206,33 @@ Function51b8: ; 51b8
  1800.  
  1801.  Movement_step_end: ; 51c1
  1802.     call Function4769
  1803. -   ld hl, $0003
  1804. +   ld hl, OBJECT_03
  1805.     add hl, bc
  1806.     ld [hl], a
  1807. -   ld hl, $001b
  1808. +   ld hl, OBJECT_27
  1809.     add hl, bc
  1810.     ld [hl], $0
  1811.     ld hl, VramState
  1812.     res 7, [hl]
  1813. -   ld hl, $0009
  1814. +   ld hl, OBJECT_09
  1815.     add hl, bc
  1816.     ld [hl], $1
  1817.     ret
  1818.  ; 51db
  1819.  
  1820. -Function51db: ; 51db
  1821. +Movement_48: ; 51db
  1822.     call Function4769
  1823. -   ld hl, $0003
  1824. +   ld hl, OBJECT_03
  1825.     add hl, bc
  1826.     ld [hl], a
  1827. -   ld hl, $001b
  1828. +   ld hl, OBJECT_27
  1829.     add hl, bc
  1830.     ld [hl], $0
  1831.     call GetMovementByte
  1832. -   ld hl, $000a
  1833. +   ld hl, OBJECT_STEP_DURATION
  1834.     add hl, bc
  1835.     ld [hl], a
  1836. -   ld hl, $0009
  1837. +   ld hl, OBJECT_09
  1838.     add hl, bc
  1839.     ld [hl], $3
  1840.     ld hl, VramState
  1841. @@ -243,7 +243,7 @@ Function51db: ; 51db
  1842.  Movement_remove_person: ; 51fd
  1843.     call Function4357
  1844.     ld hl, wd4cd
  1845. -   ld a, [hConnectionStripLength]
  1846. +   ld a, [hMapObjectIndexBuffer1]
  1847.     cp [hl]
  1848.     jr nz, .asm_520a
  1849.     ld [hl], $ff
  1850. @@ -254,11 +254,11 @@ Movement_remove_person: ; 51fd
  1851.     ret
  1852.  ; 5210
  1853.  
  1854. -Function5210: ; 5210
  1855. -   ld hl, $000b
  1856. +Movement_4b: ; 5210
  1857. +   ld hl, OBJECT_11
  1858.     add hl, bc
  1859.     ld [hl], $1
  1860. -   ld hl, $0009
  1861. +   ld hl, OBJECT_09
  1862.     add hl, bc
  1863.     ld [hl], $4
  1864.     ld hl, VramState
  1865. @@ -270,27 +270,27 @@ Movement_show_person: ; 5222
  1866.     ld a, $1
  1867.     jr Function5247
  1868.  
  1869. -Function5226: ; 5226
  1870. +Movement_3f: ; 5226
  1871.     ld a, $2
  1872.     jr Function5247
  1873.  
  1874. -Function522a: ; 522a
  1875. +Movement_40: ; 522a
  1876.     ld a, $3
  1877.     jr Function5247
  1878.  
  1879. -Function522e: ; 522e
  1880. +Movement_41: ; 522e
  1881.     ld a, $4
  1882.     jr Function5247
  1883.  
  1884. -Function5232: ; 5232
  1885. +Movement_42: ; 5232
  1886.     ld a, $5
  1887.     jr Function5247
  1888.  
  1889. -Function5236: ; 5236
  1890. +Movement_43: ; 5236
  1891.     ld a, $6
  1892.     jr Function5247
  1893.  
  1894. -Function523a: ; 523a
  1895. +Movement_44: ; 523a
  1896.     ld a, $7
  1897.     jr Function5247
  1898.  
  1899. @@ -306,92 +306,92 @@ Movement_step_sleep: ; 5242
  1900.     jr Function5247
  1901.  
  1902.  Function5247: ; 5247
  1903. -   ld hl, $000a
  1904. +   ld hl, OBJECT_STEP_DURATION
  1905.     add hl, bc
  1906.     ld [hl], a
  1907. -   ld hl, $0009
  1908. +   ld hl, OBJECT_09
  1909.     add hl, bc
  1910.     ld [hl], $3
  1911. -   ld hl, $000b
  1912. +   ld hl, OBJECT_11
  1913.     add hl, bc
  1914.     ld [hl], $1
  1915. -   ld hl, $0007
  1916. +   ld hl, OBJECT_DIRECTION_WALKING
  1917.     add hl, bc
  1918.     ld [hl], $ff
  1919.     ret
  1920.  ; 525f
  1921.  
  1922. -Function525f: ; 525f
  1923. +Movement_50: ; 525f
  1924.     ld a, $1
  1925. -   ld hl, $000a
  1926. +   ld hl, OBJECT_STEP_DURATION
  1927.     add hl, bc
  1928.     ld [hl], a
  1929. -   ld hl, $0009
  1930. +   ld hl, OBJECT_09
  1931.     add hl, bc
  1932.     ld [hl], $b
  1933. -   ld hl, $000b
  1934. +   ld hl, OBJECT_11
  1935.     add hl, bc
  1936.     ld [hl], $3
  1937. -   ld hl, $0007
  1938. +   ld hl, OBJECT_DIRECTION_WALKING
  1939.     add hl, bc
  1940.     ld [hl], $ff
  1941.     ret
  1942.  ; 5279
  1943.  
  1944. -Function5279: ; 5279
  1945. +Movement_56: ; 5279
  1946.     ld a, $18
  1947. -   ld hl, $000a
  1948. +   ld hl, OBJECT_STEP_DURATION
  1949.     add hl, bc
  1950.     ld [hl], a
  1951. -   ld hl, $0009
  1952. +   ld hl, OBJECT_09
  1953.     add hl, bc
  1954.     ld [hl], $3
  1955. -   ld hl, $000b
  1956. +   ld hl, OBJECT_11
  1957.     add hl, bc
  1958.     ld [hl], $b
  1959. -   ld hl, $0007
  1960. +   ld hl, OBJECT_DIRECTION_WALKING
  1961.     add hl, bc
  1962.     ld [hl], $ff
  1963.     ret
  1964.  ; 5293
  1965.  
  1966. -Function5293: ; 5293
  1967. -   ld hl, $0004
  1968. +Movement_38: ; 5293
  1969. +   ld hl, OBJECT_FLAGS1
  1970.     add hl, bc
  1971.     res 3, [hl]
  1972.     jp Function5065
  1973.  ; 529c
  1974.  
  1975. -Function529c: ; 529c
  1976. -   ld hl, $0004
  1977. +Movement_39: ; 529c
  1978. +   ld hl, OBJECT_FLAGS1
  1979.     add hl, bc
  1980.     set 3, [hl]
  1981.     jp Function5065
  1982.  ; 52a5
  1983.  
  1984.  Movement_remove_fixed_facing: ; 52a5
  1985. -   ld hl, $0004
  1986. +   ld hl, OBJECT_FLAGS1
  1987.     add hl, bc
  1988.     res 2, [hl]
  1989.     jp Function5065
  1990.  ; 52ae
  1991.  
  1992.  Movement_fix_facing: ; 52ae
  1993. -   ld hl, $0004
  1994. +   ld hl, OBJECT_FLAGS1
  1995.     add hl, bc
  1996.     set 2, [hl]
  1997.     jp Function5065
  1998.  ; 52b7
  1999.  
  2000. -Function52b7: ; 52b7
  2001. -   ld hl, $0004
  2002. +Movement_3c: ; 52b7
  2003. +   ld hl, OBJECT_FLAGS1
  2004.     add hl, bc
  2005.     res 0, [hl]
  2006.     jp Function5065
  2007.  ; 52c0
  2008.  
  2009.  Movement_hide_person: ; 52c0
  2010. -   ld hl, $0004
  2011. +   ld hl, OBJECT_FLAGS1
  2012.     add hl, bc
  2013.     set 0, [hl]
  2014.     jp Function5065
  2015. @@ -417,311 +417,311 @@ Movement_step_shake: ; 52d5
  2016.  ; 52de
  2017.  
  2018.  Movement_turn_head_down: ; 52de
  2019. -   ld a, $0
  2020. -   jr Function52ee
  2021. +   ld a, OW_DOWN
  2022. +   jr TurnHead
  2023.  
  2024.  Movement_turn_head_up: ; 52e2
  2025. -   ld a, $4
  2026. -   jr Function52ee
  2027. +   ld a, OW_UP
  2028. +   jr TurnHead
  2029.  
  2030.  Movement_turn_head_left: ; 52e6
  2031. -   ld a, $8
  2032. -   jr Function52ee
  2033. +   ld a, OW_LEFT
  2034. +   jr TurnHead
  2035.  
  2036.  Movement_turn_head_right: ; 52ea
  2037. -   ld a, $c
  2038. -   jr Function52ee
  2039. +   ld a, OW_RIGHT
  2040. +   jr TurnHead
  2041.  
  2042. -Function52ee: ; 52ee
  2043. -   ld hl, $0008
  2044. +TurnHead: ; 52ee
  2045. +   ld hl, OBJECT_FACING
  2046.     add hl, bc
  2047.     ld [hl], a
  2048. -   ld hl, $000b
  2049. +   ld hl, OBJECT_11
  2050.     add hl, bc
  2051.     ld [hl], $1
  2052. -   ld hl, $0007
  2053. +   ld hl, OBJECT_DIRECTION_WALKING
  2054.     add hl, bc
  2055.     ld [hl], $ff
  2056.     ret
  2057.  ; 5300
  2058.  
  2059.  Movement_slow_step_down: ; 5300
  2060. -   ld a, $0
  2061. -   jp Function5412
  2062. +   ld a, STEP_SLOW << 2 | DOWN
  2063. +   jp NormalStep
  2064.  ; 5305
  2065.  
  2066.  Movement_slow_step_up: ; 5305
  2067. -   ld a, $1
  2068. -   jp Function5412
  2069. +   ld a, STEP_SLOW << 2 | UP
  2070. +   jp NormalStep
  2071.  ; 530a
  2072.  
  2073.  Movement_slow_step_left: ; 530a
  2074. -   ld a, $2
  2075. -   jp Function5412
  2076. +   ld a, STEP_SLOW << 2 | LEFT
  2077. +   jp NormalStep
  2078.  ; 530f
  2079.  
  2080.  Movement_slow_step_right: ; 530f
  2081. -   ld a, $3
  2082. -   jp Function5412
  2083. +   ld a, STEP_SLOW << 2 | RIGHT
  2084. +   jp NormalStep
  2085.  ; 5314
  2086.  
  2087.  Movement_step_down: ; 5314
  2088. -   ld a, $4
  2089. -   jp Function5412
  2090. +   ld a, STEP_WALK << 2 | DOWN
  2091. +   jp NormalStep
  2092.  ; 5319
  2093.  
  2094.  Movement_step_up: ; 5319
  2095. -   ld a, $5
  2096. -   jp Function5412
  2097. +   ld a, STEP_WALK << 2 | UP
  2098. +   jp NormalStep
  2099.  ; 531e
  2100.  
  2101.  Movement_step_left: ; 531e
  2102. -   ld a, $6
  2103. -   jp Function5412
  2104. +   ld a, STEP_WALK << 2 | LEFT
  2105. +   jp NormalStep
  2106.  ; 5323
  2107.  
  2108.  Movement_step_right: ; 5323
  2109. -   ld a, $7
  2110. -   jp Function5412
  2111. +   ld a, STEP_WALK << 2 | RIGHT
  2112. +   jp NormalStep
  2113.  ; 5328
  2114.  
  2115.  Movement_big_step_down: ; 5328
  2116. -   ld a, $8
  2117. -   jp Function5412
  2118. +   ld a, STEP_BIKE << 2 | DOWN
  2119. +   jp NormalStep
  2120.  ; 532d
  2121.  
  2122.  Movement_big_step_up: ; 532d
  2123. -   ld a, $9
  2124. -   jp Function5412
  2125. +   ld a, STEP_BIKE << 2 | UP
  2126. +   jp NormalStep
  2127.  ; 5332
  2128.  
  2129.  Movement_big_step_left: ; 5332
  2130. -   ld a, $a
  2131. -   jp Function5412
  2132. +   ld a, STEP_BIKE << 2 | LEFT
  2133. +   jp NormalStep
  2134.  ; 5337
  2135.  
  2136.  Movement_big_step_right: ; 5337
  2137. -   ld a, $b
  2138. -   jp Function5412
  2139. +   ld a, STEP_BIKE << 2 | RIGHT
  2140. +   jp NormalStep
  2141.  ; 533c
  2142.  
  2143.  
  2144.  Movement_turn_away_down: ; 533c
  2145. -   ld a, $0
  2146. -   jp Function5446
  2147. +   ld a, STEP_SLOW << 2 | DOWN
  2148. +   jp TurningStep
  2149.  ; 5341
  2150.  
  2151.  Movement_turn_away_up: ; 5341
  2152. -   ld a, $1
  2153. -   jp Function5446
  2154. +   ld a, STEP_SLOW << 2 | UP
  2155. +   jp TurningStep
  2156.  ; 5346
  2157.  
  2158.  Movement_turn_away_left: ; 5346
  2159. -   ld a, $2
  2160. -   jp Function5446
  2161. +   ld a, STEP_SLOW << 2 | LEFT
  2162. +   jp TurningStep
  2163.  ; 534b
  2164.  
  2165.  Movement_turn_away_right: ; 534b
  2166. -   ld a, $3
  2167. -   jp Function5446
  2168. +   ld a, STEP_SLOW << 2 | RIGHT
  2169. +   jp TurningStep
  2170.  ; 5350
  2171.  
  2172.  Movement_turn_in_down: ; 5350
  2173. -   ld a, $4
  2174. -   jp Function5446
  2175. +   ld a, STEP_WALK << 2 | DOWN
  2176. +   jp TurningStep
  2177.  ; 5355
  2178.  
  2179.  Movement_turn_in_up: ; 5355
  2180. -   ld a, $5
  2181. -   jp Function5446
  2182. +   ld a, STEP_WALK << 2 | UP
  2183. +   jp TurningStep
  2184.  ; 535a
  2185.  
  2186.  Movement_turn_in_left: ; 535a
  2187. -   ld a, $6
  2188. -   jp Function5446
  2189. +   ld a, STEP_WALK << 2 | LEFT
  2190. +   jp TurningStep
  2191.  ; 535f
  2192.  
  2193.  Movement_turn_in_right: ; 535f
  2194. -   ld a, $7
  2195. -   jp Function5446
  2196. +   ld a, STEP_WALK << 2 | RIGHT
  2197. +   jp TurningStep
  2198.  ; 5364
  2199.  
  2200.  Movement_turn_waterfall_down: ; 5364
  2201. -   ld a, $8
  2202. -   jp Function5446
  2203. +   ld a, STEP_BIKE << 2 | DOWN
  2204. +   jp TurningStep
  2205.  ; 5369
  2206.  
  2207.  Movement_turn_waterfall_up: ; 5369
  2208. -   ld a, $9
  2209. -   jp Function5446
  2210. +   ld a, STEP_BIKE << 2 | UP
  2211. +   jp TurningStep
  2212.  ; 536e
  2213.  
  2214.  Movement_turn_waterfall_left: ; 536e
  2215. -   ld a, $a
  2216. -   jp Function5446
  2217. +   ld a, STEP_BIKE << 2 | LEFT
  2218. +   jp TurningStep
  2219.  ; 5373
  2220.  
  2221.  Movement_turn_waterfall_right: ; 5373
  2222. -   ld a, $b
  2223. -   jp Function5446
  2224. +   ld a, STEP_BIKE << 2 | RIGHT
  2225. +   jp TurningStep
  2226.  ; 5378
  2227.  
  2228.  
  2229.  Movement_slow_slide_step_down: ; 5378
  2230. -   ld a, $0
  2231. -   jp Function5468
  2232. +   ld a, STEP_SLOW << 2 | DOWN
  2233. +   jp SlideStep
  2234.  ; 537d
  2235.  
  2236.  Movement_slow_slide_step_up: ; 537d
  2237. -   ld a, $1
  2238. -   jp Function5468
  2239. +   ld a, STEP_SLOW << 2 | UP
  2240. +   jp SlideStep
  2241.  ; 5382
  2242.  
  2243.  Movement_slow_slide_step_left: ; 5382
  2244. -   ld a, $2
  2245. -   jp Function5468
  2246. +   ld a, STEP_SLOW << 2 | LEFT
  2247. +   jp SlideStep
  2248.  ; 5387
  2249.  
  2250.  Movement_slow_slide_step_right: ; 5387
  2251. -   ld a, $3
  2252. -   jp Function5468
  2253. +   ld a, STEP_SLOW << 2 | RIGHT
  2254. +   jp SlideStep
  2255.  ; 538c
  2256.  
  2257.  Movement_slide_step_down: ; 538c
  2258. -   ld a, $4
  2259. -   jp Function5468
  2260. +   ld a, STEP_WALK << 2 | DOWN
  2261. +   jp SlideStep
  2262.  ; 5391
  2263.  
  2264.  Movement_slide_step_up: ; 5391
  2265. -   ld a, $5
  2266. -   jp Function5468
  2267. +   ld a, STEP_WALK << 2 | UP
  2268. +   jp SlideStep
  2269.  ; 5396
  2270.  
  2271.  Movement_slide_step_left: ; 5396
  2272. -   ld a, $6
  2273. -   jp Function5468
  2274. +   ld a, STEP_WALK << 2 | LEFT
  2275. +   jp SlideStep
  2276.  ; 539b
  2277.  
  2278.  Movement_slide_step_right: ; 539b
  2279. -   ld a, $7
  2280. -   jp Function5468
  2281. +   ld a, STEP_WALK << 2 | RIGHT
  2282. +   jp SlideStep
  2283.  ; 53a0
  2284.  
  2285.  Movement_fast_slide_step_down: ; 53a0
  2286. -   ld a, $8
  2287. -   jp Function5468
  2288. +   ld a, STEP_BIKE << 2 | DOWN
  2289. +   jp SlideStep
  2290.  ; 53a5
  2291.  
  2292.  Movement_fast_slide_step_up: ; 53a5
  2293. -   ld a, $9
  2294. -   jp Function5468
  2295. +   ld a, STEP_BIKE << 2 | UP
  2296. +   jp SlideStep
  2297.  ; 53aa
  2298.  
  2299.  Movement_fast_slide_step_left: ; 53aa
  2300. -   ld a, $a
  2301. -   jp Function5468
  2302. +   ld a, STEP_BIKE << 2 | LEFT
  2303. +   jp SlideStep
  2304.  ; 53af
  2305.  
  2306.  Movement_fast_slide_step_right: ; 53af
  2307. -   ld a, $b
  2308. -   jp Function5468
  2309. +   ld a, STEP_BIKE << 2 | RIGHT
  2310. +   jp SlideStep
  2311.  ; 53b4
  2312.  
  2313.  
  2314.  Movement_slow_jump_step_down: ; 53b4
  2315. -   ld a, $0
  2316. -   jp Function548a
  2317. +   ld a, STEP_SLOW << 2 | DOWN
  2318. +   jp JumpStep
  2319.  ; 53b9
  2320.  
  2321.  Movement_slow_jump_step_up: ; 53b9
  2322. -   ld a, $1
  2323. -   jp Function548a
  2324. +   ld a, STEP_SLOW << 2 | UP
  2325. +   jp JumpStep
  2326.  ; 53be
  2327.  
  2328.  Movement_slow_jump_step_left: ; 53be
  2329. -   ld a, $2
  2330. -   jp Function548a
  2331. +   ld a, STEP_SLOW << 2 | LEFT
  2332. +   jp JumpStep
  2333.  ; 53c3
  2334.  
  2335.  Movement_slow_jump_step_right: ; 53c3
  2336. -   ld a, $3
  2337. -   jp Function548a
  2338. +   ld a, STEP_SLOW << 2 | RIGHT
  2339. +   jp JumpStep
  2340.  ; 53c8
  2341.  
  2342.  Movement_jump_step_down: ; 53c8
  2343. -   ld a, $4
  2344. -   jp Function548a
  2345. +   ld a, STEP_WALK << 2 | DOWN
  2346. +   jp JumpStep
  2347.  ; 53cd
  2348.  
  2349.  Movement_jump_step_up: ; 53cd
  2350. -   ld a, $5
  2351. -   jp Function548a
  2352. +   ld a, STEP_WALK << 2 | UP
  2353. +   jp JumpStep
  2354.  ; 53d2
  2355.  
  2356.  Movement_jump_step_left: ; 53d2
  2357. -   ld a, $6
  2358. -   jp Function548a
  2359. +   ld a, STEP_WALK << 2 | LEFT
  2360. +   jp JumpStep
  2361.  ; 53d7
  2362.  
  2363.  Movement_jump_step_right: ; 53d7
  2364. -   ld a, $7
  2365. -   jp Function548a
  2366. +   ld a, STEP_WALK << 2 | RIGHT
  2367. +   jp JumpStep
  2368.  ; 53dc
  2369.  
  2370.  Movement_fast_jump_step_down: ; 53dc
  2371. -   ld a, $8
  2372. -   jp Function548a
  2373. +   ld a, STEP_BIKE << 2 | DOWN
  2374. +   jp JumpStep
  2375.  ; 53e1
  2376.  
  2377.  Movement_fast_jump_step_up: ; 53e1
  2378. -   ld a, $9
  2379. -   jp Function548a
  2380. +   ld a, STEP_BIKE << 2 | UP
  2381. +   jp JumpStep
  2382.  ; 53e6
  2383.  
  2384.  Movement_fast_jump_step_left: ; 53e6
  2385. -   ld a, $a
  2386. -   jp Function548a
  2387. +   ld a, STEP_BIKE << 2 | LEFT
  2388. +   jp JumpStep
  2389.  ; 53eb
  2390.  
  2391.  Movement_fast_jump_step_right: ; 53eb
  2392. -   ld a, $b
  2393. -   jp Function548a
  2394. +   ld a, STEP_BIKE << 2 | RIGHT
  2395. +   jp JumpStep
  2396.  ; 53f0
  2397.  
  2398.  
  2399.  Movement_half_step_down: ; 53f0
  2400. -   ld a, $0
  2401. -   jr Function5400
  2402. +   ld a, OW_DOWN
  2403. +   jr HalfStep
  2404.  
  2405.  Movement_half_step_up: ; 53f4
  2406. -   ld a, $4
  2407. -   jr Function5400
  2408. +   ld a, OW_UP
  2409. +   jr HalfStep
  2410.  
  2411.  Movement_half_step_left: ; 53f8
  2412. -   ld a, $8
  2413. -   jr Function5400
  2414. +   ld a, OW_LEFT
  2415. +   jr HalfStep
  2416.  
  2417.  Movement_half_step_right: ; 53fc
  2418. -   ld a, $c
  2419. -   jr Function5400
  2420. +   ld a, OW_RIGHT
  2421. +   jr HalfStep
  2422.  
  2423. -Function5400: ; 5400
  2424. -   ld hl, $001d
  2425. +HalfStep: ; 5400
  2426. +   ld hl, OBJECT_29
  2427.     add hl, bc
  2428.     ld [hl], a
  2429. -   ld hl, $000b
  2430. +   ld hl, OBJECT_11
  2431.     add hl, bc
  2432.     ld [hl], $2
  2433. -   ld hl, $0009
  2434. +   ld hl, OBJECT_09
  2435.     add hl, bc
  2436.     ld [hl], $a
  2437.     ret
  2438.  ; 5412
  2439.  
  2440. -Function5412: ; 5412
  2441. +NormalStep: ; 5412
  2442.     call Function4690
  2443.     call Function463f
  2444. -   ld hl, $000b
  2445. +   ld hl, OBJECT_11
  2446.     add hl, bc
  2447.     ld [hl], $2
  2448.     ld hl, OBJECT_STANDING_TILE
  2449. @@ -738,91 +738,91 @@ Function5412: ; 5412
  2450.  
  2451.  .asm_5430
  2452.     ld hl, wd4cf
  2453. -   ld a, [hConnectionStripLength]
  2454. +   ld a, [hMapObjectIndexBuffer1]
  2455.     cp [hl]
  2456.     jr z, .asm_543f
  2457.  
  2458. -   ld hl, $0009
  2459. +   ld hl, OBJECT_09
  2460.     add hl, bc
  2461.     ld [hl], $2
  2462.     ret
  2463.  
  2464.  .asm_543f
  2465. -   ld hl, $0009
  2466. +   ld hl, OBJECT_09
  2467.     add hl, bc
  2468.     ld [hl], $6
  2469.     ret
  2470.  ; 5446
  2471.  
  2472. -Function5446: ; 5446
  2473. +TurningStep: ; 5446
  2474.     call Function4690
  2475.     call Function463f
  2476. -   ld hl, $000b
  2477. +   ld hl, OBJECT_11
  2478.     add hl, bc
  2479.     ld [hl], $4
  2480.     ld hl, wd4cf
  2481. -   ld a, [hConnectionStripLength]
  2482. +   ld a, [hMapObjectIndexBuffer1]
  2483.     cp [hl]
  2484.     jr z, .asm_5461
  2485. -   ld hl, $0009
  2486. +   ld hl, OBJECT_09
  2487.     add hl, bc
  2488.     ld [hl], $2
  2489.     ret
  2490.  
  2491.  .asm_5461
  2492. -   ld hl, $0009
  2493. +   ld hl, OBJECT_09
  2494.     add hl, bc
  2495.     ld [hl], $6
  2496.     ret
  2497.  ; 5468
  2498.  
  2499.  
  2500. -Function5468: ; 5468
  2501. +SlideStep: ; 5468
  2502.     call Function4690
  2503.     call Function463f
  2504. -   ld hl, $000b
  2505. +   ld hl, OBJECT_11
  2506.     add hl, bc
  2507.     ld [hl], $1
  2508.     ld hl, wd4cf
  2509. -   ld a, [hConnectionStripLength]
  2510. +   ld a, [hMapObjectIndexBuffer1]
  2511.     cp [hl]
  2512.     jr z, .asm_5483
  2513. -   ld hl, $0009
  2514. +   ld hl, OBJECT_09
  2515.     add hl, bc
  2516.     ld [hl], $2
  2517.     ret
  2518.  
  2519.  .asm_5483
  2520. -   ld hl, $0009
  2521. +   ld hl, OBJECT_09
  2522.     add hl, bc
  2523.     ld [hl], $6
  2524.     ret
  2525.  ; 548a
  2526.  
  2527.  
  2528. -Function548a: ; 548a
  2529. +JumpStep: ; 548a
  2530.     call Function4690
  2531. -   ld hl, $001f
  2532. +   ld hl, OBJECT_31
  2533.     add hl, bc
  2534.     ld [hl], $0
  2535. -   ld hl, $0005
  2536. +   ld hl, OBJECT_FLAGS2
  2537.     add hl, bc
  2538.     res 3, [hl]
  2539. -   ld hl, $000b
  2540. +   ld hl, OBJECT_11
  2541.     add hl, bc
  2542.     ld [hl], $2
  2543.     call Function5529
  2544.     ld hl, wd4cf
  2545. -   ld a, [hConnectionStripLength]
  2546. +   ld a, [hMapObjectIndexBuffer1]
  2547.     cp [hl]
  2548.     jr z, .asm_54b1
  2549. -   ld hl, $0009
  2550. +   ld hl, OBJECT_09
  2551.     add hl, bc
  2552.     ld [hl], $8
  2553.     ret
  2554.  
  2555.  .asm_54b1
  2556. -   ld hl, $0009
  2557. +   ld hl, OBJECT_09
  2558.     add hl, bc
  2559.     ld [hl], $9
  2560.     ret
  2561. diff --git a/engine/scripting.asm b/engine/scripting.asm
  2562. index 2dadafe..3aef651 100644
  2563. --- a/engine/scripting.asm
  2564. +++ b/engine/scripting.asm
  2565. @@ -1200,7 +1200,7 @@ ApplyPersonFacing: ; 0x9728b
  2566.     call Function1836
  2567.     pop bc
  2568.     jr c, .not_visible ; 0x9729c $1b
  2569. -   ld hl, OBJECT_04
  2570. +   ld hl, OBJECT_FLAGS1
  2571.     add hl, bc
  2572.     bit 2, [hl]
  2573.     jr nz, .not_visible ; 0x972a4 $13
  2574. @@ -1258,7 +1258,7 @@ Script_appear: ; 0x972dd
  2575.     call GetScriptByte
  2576.     call GetScriptPerson
  2577.     call _CopyObjectStruct
  2578. -   ld a, [hConnectionStripLength]
  2579. +   ld a, [hMapObjectIndexBuffer1]
  2580.     ld b, 0 ; clear
  2581.     call ApplyEventActionAppearDisappear
  2582.     ret
  2583. @@ -1276,7 +1276,7 @@ Script_disappear: ; 0x972ee
  2584.     ld a, [hLastTalked]
  2585.  .ok
  2586.     call DeleteObjectStruct
  2587. -   ld a, [hConnectionStripLength]
  2588. +   ld a, [hMapObjectIndexBuffer1]
  2589.     ld b, 1 ; set
  2590.     call ApplyEventActionAppearDisappear
  2591.     callba RefreshMapAppearDisappear
  2592. @@ -1390,7 +1390,7 @@ Script_loademote: ; 0x97384
  2593.     ld a, [ScriptVar]
  2594.  .not_var_emote
  2595.     ld c, a
  2596. -   callba Function1442f
  2597. +   callba LoadEmote
  2598.     ret
  2599.  ; 0x97396
  2600.  
  2601. @@ -1446,7 +1446,7 @@ Script_earthquake: ; 0x973c7
  2602.     call CopyBytes
  2603.     call GetScriptByte
  2604.     ld [wd003], a
  2605. -   and $3f
  2606. +   and (1 << 6) - 1
  2607.     ld [wd005], a
  2608.     ld b, BANK(.script)
  2609.     ld de, .script
  2610. @@ -2428,10 +2428,10 @@ Script_checkmoney: ; 0x97843
  2611.  
  2612.     call GetMoneyAccount
  2613.     call LoadMoneyAmountToMem
  2614. -   callba CheckMoney
  2615. +   callba CompareMoney
  2616.  ; 0x9784f
  2617.  
  2618. -CheckMoneyAction: ; 0x9784f
  2619. +CompareMoneyAction: ; 0x9784f
  2620.     jr c, .two
  2621.     jr z, .one
  2622.     ld a, 0
  2623. @@ -2497,12 +2497,12 @@ Script_checkcoins: ; 0x97895
  2624.  
  2625.     call LoadCoinAmountToMem
  2626.     callba CheckCoins
  2627. -   jr CheckMoneyAction
  2628. +   jr CompareMoneyAction
  2629.  ; 978a0
  2630.  
  2631.  LoadCoinAmountToMem: ; 978a0
  2632.     call GetScriptByte
  2633. -   ld [$ffc4], a
  2634. +   ld [hMoneyTemp + 1], a
  2635.     call GetScriptByte
  2636.     ld [hMoneyTemp], a
  2637.     ld bc, hMoneyTemp
  2638. diff --git a/event/battle_tower.asm b/event/battle_tower.asm
  2639. index 04f578f..6865830 100644
  2640. --- a/event/battle_tower.asm
  2641. +++ b/event/battle_tower.asm
  2642. @@ -117,7 +117,7 @@ JumpText_YouCantTakeAnEgg: ; 0x8b256
  2643.  ; 0x8b25b
  2644.  
  2645.  Function8b25b: ; 8b25b
  2646.     ld bc, $0000
  2647.  .asm_8b25e
  2648.     call Function8b26c
  2649.     call c, Function8b28e
  2650. diff --git a/event/mom.asm b/event/mom.asm
  2651. index c3e407b..e1feba8 100644
  2652. --- a/event/mom.asm
  2653. +++ b/event/mom.asm
  2654. @@ -162,7 +162,7 @@ endr
  2655.     jr z, .CancelDeposit
  2656.     ld de, Money
  2657.     ld bc, StringBuffer2
  2658. -   callba CheckMoney
  2659. +   callba CompareMoney
  2660.     jr c, .DontHaveThatMuchToDeposit
  2661.     ld hl, StringBuffer2
  2662.     ld de, StringBuffer2 + 3
  2663. @@ -234,7 +234,7 @@ endr
  2664.     call CopyBytes
  2665.     ld de, wd851
  2666.     ld bc, StringBuffer2
  2667. -   callba CheckMoney
  2668. +   callba CompareMoney
  2669.     jr c, .InsufficientFundsInBank
  2670.     ld bc, Money
  2671.     ld de, StringBuffer2
  2672. diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm
  2673. index 165cf64..f973c0a 100644
  2674. --- a/gfx/pics/animation.asm
  2675. +++ b/gfx/pics/animation.asm
  2676. @@ -445,7 +445,7 @@ PokeAnim_End: ; d02a8
  2677.  Functiond02ae: ; d02ae
  2678.     ld c, a
  2679.     ld b, $0
  2680.     ld hl, $0000
  2681.     ld a, [w2_d173]
  2682.     call AddNTimes
  2683.     ld a, h
  2684. diff --git a/home/joypad.asm b/home/joypad.asm
  2685. index d5bfc83..450fa28 100644
  2686. --- a/home/joypad.asm
  2687. +++ b/home/joypad.asm
  2688. @@ -356,14 +356,14 @@ JoyTextDelay:: ; a57
  2689.  ; a80
  2690.  
  2691.  Functiona80:: ; a80
  2692. -   ld a, [hConnectionStripLength]
  2693. +   ld a, [hMapObjectIndexBuffer1]
  2694.     push af
  2695. -   ld a, [hConnectedMapWidth]
  2696. +   ld a, [hMapObjectIndexBuffer2]
  2697.     push af
  2698.     xor a
  2699. -   ld [hConnectionStripLength], a
  2700. +   ld [hMapObjectIndexBuffer1], a
  2701.     ld a, 6
  2702. -   ld [hConnectedMapWidth], a
  2703. +   ld [hMapObjectIndexBuffer2], a
  2704.  
  2705.  .loop
  2706.     push hl
  2707. @@ -377,9 +377,9 @@ Functiona80:: ; a80
  2708.     jr z, .loop
  2709.  
  2710.     pop af
  2711. -   ld [hConnectedMapWidth], a
  2712. +   ld [hMapObjectIndexBuffer2], a
  2713.     pop af
  2714. -   ld [hConnectionStripLength], a
  2715. +   ld [hMapObjectIndexBuffer1], a
  2716.     ret
  2717.  ; aa5
  2718.  
  2719. @@ -459,37 +459,37 @@ Functionb06:: ; b06
  2720.     cp b
  2721.     pop bc
  2722.     jr nz, .asm_b27
  2723. -   ld a, [hConnectionStripLength]
  2724. +   ld a, [hMapObjectIndexBuffer1]
  2725.     dec a
  2726. -   ld [hConnectionStripLength], a
  2727. +   ld [hMapObjectIndexBuffer1], a
  2728.     ret nz
  2729. -   ld a, [hConnectedMapWidth]
  2730. +   ld a, [hMapObjectIndexBuffer2]
  2731.     dec a
  2732. -   ld [hConnectedMapWidth], a
  2733. +   ld [hMapObjectIndexBuffer2], a
  2734.     ret nz
  2735.     ld a, "─"
  2736.     ld [hl], a
  2737.     ld a, -1
  2738. -   ld [hConnectionStripLength], a
  2739. +   ld [hMapObjectIndexBuffer1], a
  2740.     ld a, 6
  2741. -   ld [hConnectedMapWidth], a
  2742. +   ld [hMapObjectIndexBuffer2], a
  2743.     ret
  2744.  
  2745.  .asm_b27
  2746. -   ld a, [hConnectionStripLength]
  2747. +   ld a, [hMapObjectIndexBuffer1]
  2748.     and a
  2749.     ret z
  2750.     dec a
  2751. -   ld [hConnectionStripLength], a
  2752. +   ld [hMapObjectIndexBuffer1], a
  2753.     ret nz
  2754.     dec a
  2755. -   ld [hConnectionStripLength], a
  2756. -   ld a, [hConnectedMapWidth]
  2757. +   ld [hMapObjectIndexBuffer1], a
  2758. +   ld a, [hMapObjectIndexBuffer2]
  2759.     dec a
  2760. -   ld [hConnectedMapWidth], a
  2761. +   ld [hMapObjectIndexBuffer2], a
  2762.     ret nz
  2763.     ld a, $6
  2764. -   ld [hConnectedMapWidth], a
  2765. +   ld [hMapObjectIndexBuffer2], a
  2766.     ld a, $ee
  2767.     ld [hl], a
  2768.     ret
  2769. diff --git a/home/map.asm b/home/map.asm
  2770. index 7f1c83b..9ddb2f8 100644
  2771. --- a/home/map.asm
  2772. +++ b/home/map.asm
  2773. @@ -729,9 +729,9 @@ ChangeMap:: ; 24e4
  2774.  
  2775.     ld hl, OverworldMap
  2776.     ld a, [MapWidth]
  2777. -   ld [hConnectedMapWidth], a
  2778. +   ld [hMapObjectIndexBuffer2], a
  2779.     add $6
  2780. -   ld [hConnectionStripLength], a
  2781. +   ld [hMapObjectIndexBuffer1], a
  2782.     ld c, a
  2783.     ld b, 0
  2784.  rept 3
  2785. @@ -750,7 +750,7 @@ endr
  2786.     ld b, a
  2787.  .asm_250c
  2788.     push hl
  2789. -   ld a, [hConnectedMapWidth]
  2790. +   ld a, [hMapObjectIndexBuffer2]
  2791.     ld c, a
  2792.  .asm_2510
  2793.     ld a, [de]
  2794. @@ -759,7 +759,7 @@ endr
  2795.     dec c
  2796.     jr nz, .asm_2510
  2797.     pop hl
  2798. -   ld a, [hConnectionStripLength]
  2799. +   ld a, [hMapObjectIndexBuffer1]
  2800.     add l
  2801.     ld l, a
  2802.     jr nc, .asm_251e
  2803. @@ -794,10 +794,10 @@ FillMapConnections:: ; 2524
  2804.     ld e, a
  2805.     ld a, [NorthConnectionStripLocation + 1]
  2806.     ld d, a
  2807. -   ld a, [NorthConnectionStripLength]
  2808. -   ld [hConnectionStripLength], a
  2809. -   ld a, [NorthConnectedMapWidth]
  2810. -   ld [hConnectedMapWidth], a
  2811. +   ld a, [NorthMapObjectIndexBuffer1]
  2812. +   ld [hMapObjectIndexBuffer1], a
  2813. +   ld a, [NorthMapObjectIndexBuffer2]
  2814. +   ld [hMapObjectIndexBuffer2], a
  2815.     call FillNorthConnectionStrip
  2816.  
  2817.  .South
  2818. @@ -817,10 +817,10 @@ FillMapConnections:: ; 2524
  2819.     ld e, a
  2820.     ld a, [SouthConnectionStripLocation + 1]
  2821.     ld d, a
  2822. -   ld a, [SouthConnectionStripLength]
  2823. -   ld [hConnectionStripLength], a
  2824. -   ld a, [SouthConnectedMapWidth]
  2825. -   ld [hConnectedMapWidth], a
  2826. +   ld a, [SouthMapObjectIndexBuffer1]
  2827. +   ld [hMapObjectIndexBuffer1], a
  2828. +   ld a, [SouthMapObjectIndexBuffer2]
  2829. +   ld [hMapObjectIndexBuffer2], a
  2830.     call FillSouthConnectionStrip
  2831.  
  2832.  .West
  2833. @@ -843,7 +843,7 @@ FillMapConnections:: ; 2524
  2834.     ld a, [WestConnectionStripLength]
  2835.     ld b, a
  2836.     ld a, [WestConnectedMapWidth]
  2837. -   ld [hConnectionStripLength], a
  2838. +   ld [hMapObjectIndexBuffer1], a
  2839.     call FillWestConnectionStrip
  2840.  
  2841.  .East
  2842. @@ -866,7 +866,7 @@ FillMapConnections:: ; 2524
  2843.     ld a, [EastConnectionStripLength]
  2844.     ld b, a
  2845.     ld a, [EastConnectedMapWidth]
  2846. -   ld [hConnectionStripLength], a
  2847. +   ld [hMapObjectIndexBuffer1], a
  2848.     call FillEastConnectionStrip
  2849.  
  2850.  .Done
  2851. @@ -882,7 +882,7 @@ FillSouthConnectionStrip:: ; 25d3
  2852.     push de
  2853.  
  2854.     push hl
  2855. -   ld a, [hConnectionStripLength]
  2856. +   ld a, [hMapObjectIndexBuffer1]
  2857.     ld b, a
  2858.  .x
  2859.     ld a, [hli]
  2860. @@ -892,7 +892,7 @@ FillSouthConnectionStrip:: ; 25d3
  2861.     jr nz, .x
  2862.     pop hl
  2863.  
  2864. -   ld a, [hConnectedMapWidth]
  2865. +   ld a, [hMapObjectIndexBuffer2]
  2866.     ld e, a
  2867.     ld d, 0
  2868.     add hl, de
  2869. @@ -917,7 +917,7 @@ FillEastConnectionStrip:: ; 25f6
  2870.  .asm_25f6
  2871.     ld a, [MapWidth]
  2872.     add 6
  2873. -   ld [hConnectedMapWidth], a
  2874. +   ld [hMapObjectIndexBuffer2], a
  2875.  
  2876.     push de
  2877.  
  2878. @@ -933,13 +933,13 @@ FillEastConnectionStrip:: ; 25f6
  2879.     inc de
  2880.     pop hl
  2881.  
  2882. -   ld a, [hConnectionStripLength]
  2883. +   ld a, [hMapObjectIndexBuffer1]
  2884.     ld e, a
  2885.     ld d, 0
  2886.     add hl, de
  2887.     pop de
  2888.  
  2889. -   ld a, [hConnectedMapWidth]
  2890. +   ld a, [hMapObjectIndexBuffer2]
  2891.     add e
  2892.     ld e, a
  2893.     jr nc, .asm_2617
  2894. @@ -1171,7 +1171,7 @@ CoordinatesEventText:: ; 2702
  2895.  
  2896.  
  2897.  Function2707:: ; 2707
  2898. -   ld a, [hConnectionStripLength]
  2899. +   ld a, [hMapObjectIndexBuffer1]
  2900.     ld e, a
  2901.     ld d, $0
  2902.     ld hl, wd81e
  2903. @@ -1181,7 +1181,7 @@ Function2707:: ; 2707
  2904.  ; 2712
  2905.  
  2906.  Function2712:: ; 2712
  2907. -   ld a, [hConnectionStripLength]
  2908. +   ld a, [hMapObjectIndexBuffer1]
  2909.     ld e, a
  2910.     ld d, $0
  2911.     ld hl, wd81e
  2912. @@ -1191,7 +1191,7 @@ Function2712:: ; 2712
  2913.  ; 271e
  2914.  
  2915.  Function271e:: ; 271e
  2916. -   ld a, [hConnectionStripLength]
  2917. +   ld a, [hMapObjectIndexBuffer1]
  2918.     ld e, a
  2919.     ld d, $0
  2920.     ld hl, wd81e
  2921. @@ -1463,7 +1463,7 @@ SaveScreen:: ; 289d
  2922.     ld de, XCoord + 1
  2923.     ld a, [MapWidth]
  2924.     add $6
  2925. -   ld [hConnectionStripLength], a
  2926. +   ld [hMapObjectIndexBuffer1], a
  2927.     ld a, [wd151]
  2928.     and a
  2929.     jr z, .asm_28cb
  2930. @@ -1477,7 +1477,7 @@ SaveScreen:: ; 289d
  2931.  
  2932.  .asm_28c0
  2933.     ld de, wdcbf
  2934. -   ld a, [hConnectionStripLength]
  2935. +   ld a, [hMapObjectIndexBuffer1]
  2936.     ld c, a
  2937.     ld b, $0
  2938.     add hl, bc
  2939. @@ -1512,7 +1512,7 @@ LoadNeighboringBlockData:: ; 28e3
  2940.     ld l, a
  2941.     ld a, [MapWidth]
  2942.     add $6
  2943. -   ld [hConnectionStripLength], a
  2944. +   ld [hMapObjectIndexBuffer1], a
  2945.     ld de, XCoord + 1
  2946.     ld b, $6
  2947.     ld c, $5
  2948. @@ -1537,7 +1537,7 @@ Function28f7:: ; 28f7
  2949.  
  2950.  .asm_2908
  2951.     pop hl
  2952. -   ld a, [hConnectionStripLength]
  2953. +   ld a, [hMapObjectIndexBuffer1]
  2954.     ld c, a
  2955.     ld b, $0
  2956.     add hl, bc
  2957. @@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29
  2958.  GetAnyMapBank:: ; 2c31
  2959.     push hl
  2960.     push de
  2961.     ld de, $0000
  2962.     call GetAnyMapHeaderMember
  2963.     ld a, c
  2964.     pop de
  2965. diff --git a/home/map_objects.asm b/home/map_objects.asm
  2966. index ac363b3..74273f3 100644
  2967. --- a/home/map_objects.asm
  2968. +++ b/home/map_objects.asm
  2969. @@ -21,7 +21,7 @@ Function180e:: ; 180e
  2970.     ld hl, UsedSprites + 2
  2971.     ld c, SPRITE_GFX_LIST_CAPACITY - 1
  2972.     ld b, a
  2973. -   ld a, [hConnectionStripLength]
  2974. +   ld a, [hMapObjectIndexBuffer1]
  2975.     cp 0
  2976.     jr z, .nope
  2977.     ld a, b
  2978. @@ -234,14 +234,14 @@ GetMapObject:: ; 18d2
  2979.  
  2980.  Function18de:: ; 18de
  2981.  ; Sets carry if the object is not visible on the screen.
  2982. -   ld [hConnectionStripLength], a
  2983. +   ld [hMapObjectIndexBuffer1], a
  2984.     call GetMapObject
  2985.     ld hl, MAPOBJECT_OBJECT_STRUCT_ID
  2986.     add hl, bc
  2987.     ld a, [hl]
  2988.     cp -1
  2989.     jr z, .not_visible
  2990. -   ld [hConnectedMapWidth], a
  2991. +   ld [hMapObjectIndexBuffer2], a
  2992.     call GetObjectStruct
  2993.     and a
  2994.     ret
  2995. @@ -326,7 +326,7 @@ Function18f5:: ; 18f5
  2996.  ; 194d
  2997.  
  2998.  Function194d:: ; 194d
  2999. -   ld [hConnectionStripLength], a
  3000. +   ld [hMapObjectIndexBuffer1], a
  3001.     call GetMapObject
  3002.     call CopyObjectStruct
  3003.     ret
  3004. @@ -335,16 +335,16 @@ Function194d:: ; 194d
  3005.  
  3006.  
  3007.  _CopyObjectStruct:: ; 1956
  3008. -   ld [hConnectionStripLength], a
  3009. +   ld [hMapObjectIndexBuffer1], a
  3010.     call Function271e
  3011. -   ld a, [hConnectionStripLength]
  3012. +   ld a, [hMapObjectIndexBuffer1]
  3013.     call GetMapObject
  3014.     callba CopyObjectStruct
  3015.     ret
  3016.  ; 1967
  3017.  
  3018.  Function1967:: ; 1967
  3019. -   ld [hConnectionStripLength], a
  3020. +   ld [hMapObjectIndexBuffer1], a
  3021.     call GetMapObject
  3022.     ld hl, MAPOBJECT_OBJECT_STRUCT_ID
  3023.     add hl, bc
  3024. @@ -569,12 +569,12 @@ endr
  3025.     ld [hl], a
  3026.     ld a, [bc]
  3027.     inc bc
  3028. -   ld hl, OBJECT_04
  3029. +   ld hl, OBJECT_FLAGS1
  3030.     add hl, de
  3031.     ld [hl], a
  3032.     ld a, [bc]
  3033.     inc bc
  3034. -   ld hl, OBJECT_FLAGS
  3035. +   ld hl, OBJECT_FLAGS2
  3036.     add hl, de
  3037.     ld [hl], a
  3038.     ld a, [bc]
  3039. diff --git a/home/menu.asm b/home/menu.asm
  3040. index c4f0ed0..a63f74c 100644
  3041. --- a/home/menu.asm
  3042. +++ b/home/menu.asm
  3043. @@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75
  3044.     db $40 ; tile backup
  3045.     db 0, 0 ; start coords
  3046.     db 17, 19 ; end coords
  3047.     dw $0000
  3048.     db 1 ; default option
  3049.  ; 1d7d
  3050.  
  3051. diff --git a/hram.asm b/hram.asm
  3052. index 52ff0bf..54e7a90 100644
  3053. --- a/hram.asm
  3054. +++ b/hram.asm
  3055. @@ -32,8 +32,8 @@ hJoyDown           EQU $ffa8
  3056.  hJoyLast           EQU $ffa9
  3057.  hInMenu            EQU $ffaa
  3058.  
  3059. -hConnectionStripLength EQU $ffaf
  3060. -hConnectedMapWidth EQU $ffb0
  3061. +hMapObjectIndexBuffer1 EQU $ffaf
  3062. +hMapObjectIndexBuffer2 EQU $ffb0
  3063.  
  3064.  hPastLeadingZeroes EQU $ffb3
  3065.  
  3066. diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm
  3067. index 8d763da..d70434b 100644
  3068. --- a/lib/mobile/main.asm
  3069. +++ b/lib/mobile/main.asm
  3070. @@ -1,7 +1,7 @@
  3071.  ; A library included as part of the Mobile Adapter GB SDK.
  3072.  
  3073.  INCLUDE "gbhw.asm"
  3074. -
  3075.  
  3076.  SECTION "Main", ROMX
  3077.  
  3078. @@ -258,7 +258,7 @@ Function110115: ; 110115
  3079.     cp $0
  3080.     jr z, .asm_11015d
  3081.  .asm_110158
  3082.     ld hl, $0000
  3083.  .asm_11015b
  3084.     ld a, e
  3085.     ret
  3086. @@ -684,14 +684,14 @@ rept 2
  3087.     inc de
  3088.  endr
  3089.     pop hl
  3090.     ld bc, $0000
  3091.     call Function110007
  3092.     ld a, c
  3093.     ld [$cb7a], a
  3094.     ld [$c86b], a
  3095.     push de
  3096.     inc de
  3097.     ld bc, $0000
  3098.     ld a, $20
  3099.     call Function11000f
  3100.     ld l, e
  3101. @@ -1021,7 +1021,7 @@ Function110615: ; 110615
  3102.     push de
  3103.     inc de
  3104.     ld a, b
  3105.     ld bc, $0000
  3106.     call Function11000f
  3107.     ld a, c
  3108.     pop hl
  3109. @@ -4810,7 +4810,7 @@ Function111f07: ; 111f07 (44:5f07)
  3110.  
  3111.  Function111f63: ; 111f63
  3112.     push de
  3113.     ld hl, $0000
  3114.     ld c, b
  3115.     xor a
  3116.     cp b
  3117. @@ -5233,7 +5233,7 @@ Function112271: ; 112271
  3118.     cp $41
  3119.     jr nz, .asm_1122f5
  3120.     ld b, $be
  3121.     ld de, $0000
  3122.  .asm_1122b3
  3123.     ld a, [hli]
  3124.     add e
  3125. @@ -6506,8 +6506,8 @@ Function112aac: ; 112aac
  3126.     push af
  3127.     ld a, [$c874]
  3128.     push af
  3129.     ld bc, $0000
  3130.     ld de, $0000
  3131.  .asm_112abe
  3132.     ld a, [hli]
  3133.     cp $d
  3134. @@ -6584,7 +6584,7 @@ Function112b11: ; 112b11
  3135.  .asm_112b36
  3136.     push hl
  3137.     ld hl, $c872
  3138.     ld de, $0000
  3139.     ld a, b
  3140.     or a
  3141.     jr z, .asm_112b49
  3142. @@ -8226,7 +8226,7 @@ Function113519: ; 113519
  3143.     cp $41
  3144.     jr nz, .asm_113586
  3145.     ld b, $be
  3146.     ld de, $0000
  3147.  .asm_113551
  3148.     ld a, [hli]
  3149.     add e
  3150. diff --git a/main.asm b/main.asm
  3151. index 592bdf6..3d3f35f 100644
  3152. --- a/main.asm
  3153. +++ b/main.asm
  3154. @@ -71,7 +71,7 @@ Function5ae8: ; 5ae8
  3155.     jp Function6219
  3156.  ; 5b04
  3157.  
  3158. -Function5b04: ; 5b04
  3159. +; unreferenced
  3160.     ret
  3161.  ; 5b05
  3162.  
  3163. @@ -883,7 +883,7 @@ NamePlayer: ; 0x6074
  3164.     db "KRIS@@@@@@@"
  3165.  ; 60e9
  3166.  
  3167. -Function60e9: ; 60e9
  3168. +Function60e9: ; Unreferenced
  3169.     call LoadMenuDataHeader
  3170.     call InterpretMenu2
  3171.     ld a, [wcfa9]
  3172. @@ -1180,7 +1180,7 @@ endr
  3173.     dw TitleScreenEnd
  3174.  ; 62b7
  3175.  
  3176. -Function62b7: ; 62b7
  3177. +Function62b7: ; Unreferenced
  3178.     ld hl, wJumptableIndex
  3179.     inc [hl]
  3180.     ret
  3181. @@ -1384,7 +1384,7 @@ ResetClock: ; 6392
  3182.     jp Init
  3183.  ; 639b
  3184.  
  3185. -Function639b: ; 639b
  3186. +Function639b: ; unreferenced
  3187.     ; If bit 0 or 1 of [wcf65] is set, we don't need to be here.
  3188.     ld a, [wcf65]
  3189.     and $3
  3190. @@ -1420,12 +1420,12 @@ endr
  3191.  ; 63ca
  3192.  
  3193.  Data63ca: ; 63ca
  3194.     dw $505c, $0000
  3195.     dw $685c, $585c
  3196.     dw $685c, $785c
  3197.     dw $885c, $785c
  3198.     dw $0000, $785c
  3199.     dw $0000, $585c
  3200.  ; 63e2
  3201.  
  3202.  Copyright: ; 63e2
  3203. @@ -2117,7 +2117,7 @@ Function6ec1: ; 6ec1
  3204.     add hl, bc
  3205.     bit 5, [hl]
  3206.     jr z, .asm_6ed9
  3207. -   ld hl, OBJECT_04
  3208. +   ld hl, OBJECT_FLAGS1
  3209.     add hl, bc
  3210.     bit 4, [hl]
  3211.     push hl
  3212. @@ -2129,7 +2129,7 @@ Function6ec1: ; 6ec1
  3213.     jr .asm_6ee9
  3214.  
  3215.  .asm_6ed9
  3216. -   ld hl, OBJECT_04
  3217. +   ld hl, OBJECT_FLAGS1
  3218.     add hl, bc
  3219.     bit 4, [hl]
  3220.     jr nz, .asm_6ee9
  3221. @@ -2361,7 +2361,7 @@ CheckFacingObject:: ; 6fd9
  3222.  .asm_6ff1
  3223.     ld bc, ObjectStructs ; redundant
  3224.     ld a, 0
  3225. -   ld [hConnectionStripLength], a
  3226. +   ld [hMapObjectIndexBuffer1], a
  3227.     call Function7041
  3228.     ret nc
  3229.     ld hl, OBJECT_DIRECTION_WALKING
  3230. @@ -2388,8 +2388,8 @@ Function7009: ; 7009
  3231.     jr Function7041
  3232.  ; 7015
  3233.  
  3234. -Function7015: ; 7015
  3235. -   ld a, [hConnectionStripLength]
  3236. +Function7015: ; unreferenced
  3237. +   ld a, [hMapObjectIndexBuffer1]
  3238.     call GetObjectStruct
  3239.     call Function7021
  3240.     call Function7041
  3241. @@ -2429,10 +2429,10 @@ Function7041: ; 7041
  3242.     ld bc, ObjectStructs
  3243.     xor a
  3244.  .loop
  3245. -   ld [hConnectedMapWidth], a
  3246. +   ld [hMapObjectIndexBuffer2], a
  3247.     call GetObjectSprite
  3248.     jr z, .nope
  3249. -   ld hl, OBJECT_04
  3250. +   ld hl, OBJECT_FLAGS1
  3251.     add hl, bc
  3252.     bit 7, [hl]
  3253.     jr nz, .nope
  3254. @@ -2457,9 +2457,9 @@ Function7041: ; 7041
  3255.     jr nz, .ok
  3256.  
  3257.  .ok2
  3258. -   ld a, [hConnectionStripLength]
  3259. +   ld a, [hMapObjectIndexBuffer1]
  3260.     ld l, a
  3261. -   ld a, [hConnectedMapWidth]
  3262. +   ld a, [hMapObjectIndexBuffer2]
  3263.     cp l
  3264.     jr nz, .setcarry
  3265.  
  3266. @@ -2474,9 +2474,9 @@ Function7041: ; 7041
  3267.     ld a, [hl]
  3268.     cp e
  3269.     jr nz, .nope
  3270. -   ld a, [hConnectionStripLength]
  3271. +   ld a, [hMapObjectIndexBuffer1]
  3272.     ld l, a
  3273. -   ld a, [hConnectedMapWidth]
  3274. +   ld a, [hMapObjectIndexBuffer2]
  3275.     cp l
  3276.     jr nz, .setcarry
  3277.  
  3278. @@ -2485,7 +2485,7 @@ Function7041: ; 7041
  3279.     add hl, bc
  3280.     ld b, h
  3281.     ld c, l
  3282. -   ld a, [hConnectedMapWidth]
  3283. +   ld a, [hMapObjectIndexBuffer2]
  3284.     inc a
  3285.     cp NUM_OBJECT_STRUCTS
  3286.     jr nz, .loop
  3287. @@ -2588,7 +2588,7 @@ Function70ed: ; 70ed
  3288.     ret
  3289.  ; 7113
  3290.  
  3291. -Function7113: ; 7113
  3292. +Function7113: ; unreferenced
  3293.     ld a, [MapX]
  3294.     ld d, a
  3295.     ld a, [MapY]
  3296. @@ -2596,7 +2596,7 @@ Function7113: ; 7113
  3297.     ld bc, ObjectStructs
  3298.     xor a
  3299.  .loop
  3300. -   ld [hConnectedMapWidth], a
  3301. +   ld [hMapObjectIndexBuffer2], a
  3302.     call GetObjectSprite
  3303.     jr z, .asm_7160
  3304.     ld hl, OBJECT_03
  3305. @@ -2619,7 +2619,7 @@ Function7113: ; 7113
  3306.     ld a, [hl]
  3307.     cp d
  3308.     jr nz, .asm_714e
  3309. -   ld a, [hConnectedMapWidth]
  3310. +   ld a, [hMapObjectIndexBuffer2]
  3311.     cp $0
  3312.     jr z, .asm_7160
  3313.     jr .asm_716f
  3314. @@ -2642,7 +2642,7 @@ Function7113: ; 7113
  3315.     add hl, bc
  3316.     ld b, h
  3317.     ld c, l
  3318. -   ld a, [hConnectedMapWidth]
  3319. +   ld a, [hMapObjectIndexBuffer2]
  3320.     inc a
  3321.     cp NUM_OBJECT_STRUCTS
  3322.     jr nz, .loop
  3323. @@ -3003,7 +3003,7 @@ SpecialShuckleNick:
  3324.  
  3325.  SpecialReturnShuckle: ; 737e
  3326.     callba SelectMonFromParty
  3327. -   jr c, .asm_73e6
  3328. +   jr c, .refused
  3329.  
  3330.     ld a, [CurPartySpecies]
  3331.     cp SHUCKLE
  3332. @@ -3015,11 +3015,12 @@ SpecialReturnShuckle: ; 737e
  3333.     call AddNTimes
  3334.  
  3335.  ; OT ID
  3336. +; 00518
  3337.     ld a, [hli]
  3338. -   cp $2
  3339. +   cp 00518 / $100
  3340.     jr nz, .DontReturn
  3341.     ld a, [hl]
  3342. -   cp $6
  3343. +   cp 00518 % $100
  3344.     jr nz, .DontReturn
  3345.  
  3346.  ; OT
  3347. @@ -3032,14 +3033,14 @@ SpecialReturnShuckle: ; 737e
  3348.     cp [hl]
  3349.     jr nz, .DontReturn
  3350.     cp "@"
  3351. -   jr z, .asm_73bb
  3352. +   jr z, .done
  3353.     inc de
  3354.     inc hl
  3355.     jr .CheckOT
  3356.  
  3357. -.asm_73bb
  3358. -   callba Functione538
  3359. -   jr c, .asm_73f1
  3360. +.done
  3361. +   callba CheckCurPartyMonFainted
  3362. +   jr c, .fainted
  3363.     ld a, [CurPartyMon]
  3364.     ld hl, PartyMon1Happiness
  3365.     ld bc, PartyMon2 - PartyMon1
  3366. @@ -3047,17 +3048,17 @@ SpecialReturnShuckle: ; 737e
  3367.     ld a, [hl]
  3368.     cp 150
  3369.     ld a, $3
  3370. -   jr nc, .asm_73e2
  3371. +   jr nc, .HappyToStayWithYou
  3372.     xor a
  3373.     ld [wd10b], a
  3374.     callab Functione039
  3375.     ld a, $2
  3376.  
  3377. -.asm_73e2
  3378. +.HappyToStayWithYou
  3379.     ld [ScriptVar], a
  3380.     ret
  3381.  
  3382. -.asm_73e6
  3383. +.refused
  3384.     ld a, $1
  3385.     ld [ScriptVar], a
  3386.     ret
  3387. @@ -3067,7 +3068,7 @@ SpecialReturnShuckle: ; 737e
  3388.     ld [ScriptVar], a
  3389.     ret
  3390.  
  3391. -.asm_73f1
  3392. +.fainted
  3393.     ld a, $4
  3394.     ld [ScriptVar], a
  3395.     ret
  3396. @@ -3219,10 +3220,10 @@ GetSpawnCoord: ; 8029
  3397.  .ok
  3398.     ld [hl], e
  3399.     ld a, $0
  3400. -   ld [hConnectionStripLength], a
  3401. +   ld [hMapObjectIndexBuffer1], a
  3402.     ld bc, MapObjects
  3403.     ld a, $0
  3404. -   ld [hConnectedMapWidth], a
  3405. +   ld [hMapObjectIndexBuffer2], a
  3406.     ld de, ObjectStructs
  3407.     call Function8116
  3408.     ld a, $0
  3409. @@ -3234,7 +3235,7 @@ PlayerObjectTemplate: ; 8071
  3410.  ; A dummy map object used to initialize the player object.
  3411.  ; Shorter than the actual amount copied by two bytes.
  3412.  ; Said bytes seem to be unused.
  3413.     person_event SPRITE_CHRIS, -4, -4, $0b, 15, 15, -1, -1, 0, 0, 0, $0000, -1
  3414.  ; 807e
  3415.  
  3416.  CopyDECoordsToMapObject:: ; 807e
  3417. @@ -3275,7 +3276,7 @@ Function80a1:: ; 80a1
  3418.     ld hl, OBJECT_MAP_Y
  3419.     add hl, bc
  3420.     ld e, [hl]
  3421. -   ld a, [hConnectionStripLength]
  3422. +   ld a, [hMapObjectIndexBuffer1]
  3423.     ld b, a
  3424.     call CopyDECoordsToMapObject
  3425.     and a
  3426. @@ -3320,12 +3321,12 @@ CopyObjectStruct:: ; 80e7
  3427.     ld a, 1
  3428.     ld de, OBJECT_STRUCT_LENGTH
  3429.  .loop
  3430. -   ld [hConnectedMapWidth], a
  3431. +   ld [hMapObjectIndexBuffer2], a
  3432.     ld a, [hl]
  3433.     and a
  3434.     jr z, .done
  3435.     add hl, de
  3436. -   ld a, [hConnectedMapWidth]
  3437. +   ld a, [hMapObjectIndexBuffer2]
  3438.     inc a
  3439.     cp NUM_OBJECT_STRUCTS
  3440.     jr nz, .loop
  3441. @@ -3339,7 +3340,7 @@ CopyObjectStruct:: ; 80e7
  3442.     ld hl, VramState
  3443.     bit 7, [hl]
  3444.     ret z
  3445. -   ld hl, OBJECT_FLAGS
  3446. +   ld hl, OBJECT_FLAGS2
  3447.     add hl, de
  3448.     set 5, [hl]
  3449.     ret
  3450. @@ -3352,11 +3353,11 @@ Function8116: ; 8116
  3451.  ; 811d
  3452.  
  3453.  Function811d: ; 811d
  3454. -   ld a, [hConnectedMapWidth]
  3455. +   ld a, [hMapObjectIndexBuffer2]
  3456.     ld hl, MAPOBJECT_OBJECT_STRUCT_ID
  3457.     add hl, bc
  3458.     ld [hl], a
  3459. -   ld a, [hConnectionStripLength]
  3460. +   ld a, [hMapObjectIndexBuffer1]
  3461.     ld [wc2f0], a
  3462.     ld hl, MAPOBJECT_SPRITE
  3463.     add hl, bc
  3464. @@ -3404,7 +3405,7 @@ Function8177: ; 8177
  3465.     ld bc, MapObjects + OBJECT_LENGTH
  3466.     ld a, 1
  3467.  .loop
  3468. -   ld [hConnectionStripLength], a
  3469. +   ld [hMapObjectIndexBuffer1], a
  3470.     ld hl, MAPOBJECT_SPRITE
  3471.     add hl, bc
  3472.     ld a, [hl]
  3473. @@ -3445,7 +3446,7 @@ Function8177: ; 8177
  3474.     add hl, bc
  3475.     ld b, h
  3476.     ld c, l
  3477. -   ld a, [hConnectionStripLength]
  3478. +   ld a, [hMapObjectIndexBuffer1]
  3479.     inc a
  3480.     cp NUM_OBJECTS
  3481.     jr nz, .loop
  3482. @@ -3489,7 +3490,7 @@ Function81ea: ; 81ea
  3483.     ld bc, MapObjects + OBJECT_LENGTH
  3484.     ld a, 1
  3485.  .loop
  3486. -   ld [hConnectionStripLength], a
  3487. +   ld [hMapObjectIndexBuffer1], a
  3488.     ld hl, MAPOBJECT_SPRITE
  3489.     add hl, bc
  3490.     ld a, [hl]
  3491. @@ -3524,7 +3525,7 @@ Function81ea: ; 81ea
  3492.     add hl, bc
  3493.     ld b, h
  3494.     ld c, l
  3495. -   ld a, [hConnectionStripLength]
  3496. +   ld a, [hMapObjectIndexBuffer1]
  3497.     inc a
  3498.     cp NUM_OBJECTS
  3499.     jr nz, .loop
  3500. @@ -3547,7 +3548,7 @@ Function823e: ; 823e
  3501.     ld bc, MapObjects + OBJECT_LENGTH
  3502.     ld a, 1
  3503.  .loop
  3504. -   ld [hConnectionStripLength], a
  3505. +   ld [hMapObjectIndexBuffer1], a
  3506.     ld hl, MAPOBJECT_SPRITE
  3507.     add hl, bc
  3508.     ld a, [hl]
  3509. @@ -3582,7 +3583,7 @@ Function823e: ; 823e
  3510.     add hl, bc
  3511.     ld b, h
  3512.     ld c, l
  3513. -   ld a, [hConnectionStripLength]
  3514. +   ld a, [hMapObjectIndexBuffer1]
  3515.     inc a
  3516.     cp NUM_OBJECTS
  3517.     jr nz, .loop
  3518. @@ -3839,7 +3840,7 @@ Function839e:: ; 839e
  3519.     ld hl, OBJECT_SPRITE_Y
  3520.     add hl, de
  3521.     ld [hl], a
  3522. -   ld a, [hConnectedMapWidth]
  3523. +   ld a, [hMapObjectIndexBuffer2]
  3524.     ld hl, OBJECT_32
  3525.     add hl, de
  3526.     ld [hl], a
  3527. @@ -4920,9 +4921,6 @@ Script_UseFlash: ; 0xc8e6
  3528.  UnknownText_0xc8f3: ; 0xc8f3
  3529.     text_jump UnknownText_0x1c0609
  3530.     start_asm
  3531. -; 0xc8f8
  3532. -
  3533. -Functionc8f8: ; c8f8
  3534.     call WaitSFX
  3535.     ld de, SFX_FLASH
  3536.     call PlaySFX
  3537. @@ -5646,7 +5644,7 @@ StrengthFunction: ; cce5
  3538.     jr StartToUseStrength
  3539.  ; ccf8
  3540.  
  3541. -AlreadyUsingStrength: ; ccf8
  3542. +AlreadyUsingStrength: ; unreferenced
  3543.     ld hl, UnknownText_0xcd01
  3544.     call MenuTextBoxBackup
  3545.     ld a, $80
  3546. @@ -5696,7 +5694,7 @@ Script_UsedStrength: ; 0xcd2d
  3547.     callasm Functioncd12
  3548.     writetext UnknownText_0xcd41
  3549.     copybytetovar wd1ef
  3550.     cry $0000
  3551.     pause 3
  3552.     writetext UnknownText_0xcd46
  3553.     loadmovesprites
  3554. @@ -6068,7 +6066,7 @@ GetFacingObject: ; cf0d
  3555.     callba CheckFacingObject
  3556.     jr nc, .fail
  3557.  
  3558. -   ld a, [hConnectedMapWidth]
  3559. +   ld a, [hMapObjectIndexBuffer2]
  3560.     call GetObjectStruct
  3561.     ld hl, OBJECT_MAP_OBJECT_INDEX
  3562.     add hl, bc
  3563. @@ -6376,7 +6374,7 @@ UnknownText_0xd0a9: ; 0xd0a9
  3564.     db "@"
  3565.  ; 0xd0ae
  3566.  
  3567. -UnknownText_0xd0ae: ; 0xd0ae
  3568. +UnknownText_0xd0ae: ; unused
  3569.     ; Looks like there's nothing here.
  3570.     text_jump UnknownText_0x1c0979
  3571.     db "@"
  3572. @@ -7873,7 +7871,7 @@ Functiond839: ; d839
  3573.     ld a, [Buffer1]
  3574.     ld c, a
  3575.     ld b, $0
  3576.     ld hl, $0000
  3577.     ld a, [wd1f1]
  3578.     cp $30
  3579.     jr nc, .asm_d885
  3580. @@ -9851,7 +9849,7 @@ Functione4fe: ; e4fe (3:64fe)
  3581.     ret
  3582.  ; e512 (3:6512)
  3583.  
  3584. -Functione512: ; e512
  3585. +Functione512: ; unused
  3586.     ld a, [PartyCount]
  3587.     and a
  3588.     jr z, .asm_e51e
  3589. @@ -9886,32 +9884,32 @@ UnknownText_0xe533: ; 0xe533
  3590.  ; 0xe538
  3591.  
  3592.  
  3593. -Functione538: ; e538
  3594. +CheckCurPartyMonFainted: ; e538
  3595.     ld hl, PartyMon1HP
  3596.     ld de, PartyMon2 - PartyMon1
  3597.     ld b, $0
  3598. -.asm_e540
  3599. +.loop
  3600.     ld a, [CurPartyMon]
  3601.     cp b
  3602. -   jr z, .asm_e54b
  3603. +   jr z, .skip
  3604.     ld a, [hli]
  3605.     or [hl]
  3606. -   jr nz, .asm_e557
  3607. +   jr nz, .notfainted
  3608.     dec hl
  3609.  
  3610. -.asm_e54b
  3611. +.skip
  3612.     inc b
  3613.     ld a, [PartyCount]
  3614.     cp b
  3615. -   jr z, .asm_e555
  3616. +   jr z, .done
  3617.     add hl, de
  3618. -   jr .asm_e540
  3619. +   jr .loop
  3620.  
  3621. -.asm_e555
  3622. +.done
  3623.     scf
  3624.     ret
  3625.  
  3626. -.asm_e557
  3627. +.notfainted
  3628.     and a
  3629.     ret
  3630.  ; e559
  3631. @@ -9927,7 +9925,7 @@ Functione559: ; e559 (3:6559)
  3632.     ret
  3633.  ; e56d (3:656d)
  3634.  
  3635. -Functione56d: ; e56d
  3636. +Functione56d: ; unused
  3637.     ld a, [PartyCount]
  3638.     cp PARTY_LENGTH
  3639.     jr nc, .asm_e576
  3640. @@ -9987,7 +9985,7 @@ Functione5bb: ; e5bb
  3641.     ret
  3642.  ; e5d9
  3643.  
  3644. -Functione5d9: ; e5d9
  3645. +Functione5d9: ; unreferenced
  3646.     ld a, [wCurBox]
  3647.     cp b
  3648.     jr z, .asm_e5f1
  3649. @@ -10022,7 +10020,7 @@ Functione5d9: ; e5d9
  3650.     push hl
  3651.     push bc
  3652.     ld a, c
  3653.     ld bc, $0000
  3654.     add hl, bc
  3655.     ld bc, $0020
  3656.     call AddNTimes
  3657. @@ -11159,7 +11157,7 @@ Function11b39: ; 11b39
  3658.     jr Function11b23
  3659.  ; 11b56
  3660.  
  3661. -Dakutens: ; 11b56
  3662. +Dakutens: ; Dummied out
  3663.     db "かが", "きぎ", "くぐ", "けげ", "こご"
  3664.     db "さざ", "しじ", "すず", "せぜ", "そぞ"
  3665.     db "ただ", "ちぢ", "つづ", "てで", "とど"
  3666. @@ -11170,7 +11168,7 @@ Dakutens: ; 11b56
  3667.     db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
  3668.     db $ff
  3669.  
  3670. -Handakutens: ; 11ba7
  3671. +Handakutens: ; Dummied out
  3672.     db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
  3673.     db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
  3674.     db $ff
  3675. @@ -11348,7 +11346,7 @@ NameInputLower:
  3676.     db "a b c d e f g h i"
  3677.     db "j k l m n o p q r"
  3678.     db "s t u v w x y z  "
  3679. -   db "× ( ) : ; [ ] ", $e1, " ", $e2
  3680. +   db "× ( ) : ; [ ] <PK> <MN>"
  3681.     db "UPPER  DEL   END "
  3682.  BoxNameInputLower:
  3683.     db "a b c d e f g h i"
  3684. @@ -11357,7 +11355,7 @@ BoxNameInputLower:
  3685.     db "é 'd 'l 'm 'r 's 't 'v 0"
  3686.     db "1 2 3 4 5 6 7 8 9"
  3687.     db "UPPER  DEL   END "
  3688. -NameInputUpper:
  3689. +NameInputUpper: ; Unreferenced?
  3690.     db "A B C D E F G H I"
  3691.     db "J K L M N O P Q R"
  3692.     db "S T U V W X Y Z  "
  3693. @@ -11367,12 +11365,12 @@ BoxNameInputUpper:
  3694.     db "A B C D E F G H I"
  3695.     db "J K L M N O P Q R"
  3696.     db "S T U V W X Y Z  "
  3697. -   db "× ( ) : ; [ ] ", $e1, " ", $e2
  3698. +   db "× ( ) : ; [ ] <PK> <MN>"
  3699.     db "- ? ! ♂ ♀ / . , &"
  3700.     db "lower  DEL   END "
  3701.  ; 11e5d
  3702.  
  3703. -GFX_11e5d: ; 11e5d
  3704. +GFX_11e5d: ; ????
  3705.  INCBIN "gfx/unknown/011e5d.2bpp"
  3706.  ; 11e6d
  3707.  
  3708. @@ -11460,7 +11458,7 @@ Function11f74: ; 11f74 (4:5f74)
  3709.     ret
  3710.  ; 11f7a (4:5f7a)
  3711.  
  3712. -String_11f7a: ; 11f7a
  3713. +String_11f7a: ; dummied out
  3714.     db "メールを かいてね@"
  3715.  ; 11f84
  3716.  
  3717. @@ -11824,7 +11822,7 @@ Function121ac: ; 121ac (4:61ac)
  3718.     jp Function11b17
  3719.  ; 121b2 (4:61b2)
  3720.  
  3721. -Function121b2: ; 121b2
  3722. +Function121b2: ; unreferenced
  3723.     ld a, [wc6d2]
  3724.     and a
  3725.     ret z
  3726. @@ -15056,8 +15054,6 @@ _BugContestJudging: ; 1369d
  3727.  BugContest_FirstPlaceText: ; 0x136eb
  3728.     text_jump ContestJudging_FirstPlaceText
  3729.     start_asm
  3730. -; 0x136f0
  3731. -
  3732.  BugContest_FirstPlace: ; 136f0
  3733.     ld de, SFX_1ST_PLACE
  3734.     call PlaySFX
  3735. @@ -15076,8 +15072,6 @@ BugContest_SecondPlaceText: ; 0x13702
  3736.     ; Placing second was @ , who caught a @ !@ @
  3737.     text_jump ContestJudging_SecondPlaceText
  3738.     start_asm
  3739. -; 0x13707
  3740. -
  3741.  BugContest_SecondPlace: ; 13707
  3742.     ld de, SFX_2ND_PLACE
  3743.     call PlaySFX
  3744. @@ -15672,7 +15666,7 @@ ContestReturnMons: ; 13a31
  3745.     ret
  3746.  ; 13a47
  3747.  
  3748. -Function13a47: ; 13a47
  3749. +Function13a47: ; unreferenced
  3750.     ld hl, PartyCount
  3751.     ld a, [hl]
  3752.     and a
  3753. @@ -15940,7 +15934,7 @@ root    set root+1
  3754.  SECTION "bank5", ROMX, BANK[$5]
  3755.  
  3756.  
  3757. -StopRTC: ; 14000
  3758. +StopRTC: ; Unreferenced???
  3759.     ld a, SRAM_ENABLE
  3760.     ld [MBC3SRamEnable], a
  3761.     call LatchClock
  3762. @@ -16002,7 +15996,7 @@ TimesOfDay: ; 14044
  3763.     db -1, MORN
  3764.  ; 1404e
  3765.  
  3766. -Unknown_1404e: ; 1404e
  3767. +Unknown_1404e: ; Unreferenced
  3768.     db 20, 2
  3769.     db 40, 0
  3770.     db 60, 1
  3771. @@ -16153,7 +16147,7 @@ Function140ed:: ; 140ed
  3772.     ret
  3773.  ; 1412a
  3774.  
  3775. -Function1412a: ; 1412a
  3776. +GetEmote2bpp: ; 1412a
  3777.     ld a, $1
  3778.     ld [rVBK], a
  3779.     call Get2bpp
  3780. @@ -16336,7 +16330,7 @@ Function14215: ; 14215
  3781.     bit 6, a
  3782.     ret nz
  3783.     ld c, $8
  3784. -   callba Function1442f
  3785. +   callba LoadEmote
  3786.     call GetMapPermission
  3787.     call CheckOutdoorMap
  3788.     ld c, $b
  3789. @@ -16344,7 +16338,7 @@ Function14215: ; 14215
  3790.     ld c, $a
  3791.  
  3792.  .asm_1422f
  3793. -   callba Function1442f
  3794. +   callba LoadEmote
  3795.     ret
  3796.  ; 14236
  3797.  
  3798. @@ -16838,27 +16832,33 @@ Function14418: ; 14418
  3799.     ret
  3800.  ; 1442f
  3801.  
  3802. -Function1442f:: ; 1442f
  3803. +LoadEmote:: ; 1442f
  3804. +; Get the address of the pointer to emote c.
  3805.     ld a, c
  3806.     ld bc, 6
  3807.     ld hl, EmotesPointers
  3808.     call AddNTimes
  3809. +; Load the emote address into de
  3810.     ld e, [hl]
  3811.     inc hl
  3812.     ld d, [hl]
  3813. +; load the length of the emote (in tiles) into c
  3814.     inc hl
  3815.     ld c, [hl]
  3816.     swap c
  3817. +; load the emote pointer bank into b
  3818.     inc hl
  3819.     ld b, [hl]
  3820. +; load the VRAM destination into hl
  3821.     inc hl
  3822.     ld a, [hli]
  3823.     ld h, [hl]
  3824.     ld l, a
  3825. +; if the emote has a length of 0, do not proceed (error handling)
  3826.     ld a, c
  3827.     and a
  3828.     ret z
  3829. -   call Function1412a
  3830. +   call GetEmote2bpp
  3831.     ret
  3832.  ; 1444d
  3833.  
  3834. @@ -18962,7 +18962,7 @@ Function15cef: ; 15cef
  3835.     ld de, Money
  3836.     ld bc, hMoneyTemp
  3837.     ld a, $3
  3838. -   call CheckMoney
  3839. +   call CompareMoney
  3840.     jr c, .asm_15d79
  3841.     ld hl, NumItems
  3842.     call ReceiveItem
  3843. @@ -19289,7 +19289,7 @@ Function15ece: ; 15ece
  3844.     ret
  3845.  ; 15ed3
  3846.  
  3847. -Function15ed3: ; 15ed3
  3848. +Function15ed3: ; unreferenced
  3849.     ld hl, UnknownText_0x15edb
  3850.     call MenuTextBoxBackup
  3851.     and a
  3852. @@ -19465,10 +19465,10 @@ Function15fcd: ; 15fcd
  3853.  
  3854.  GiveMoney:: ; 15fd7
  3855.     ld a, $3
  3856. -   call Function16053
  3857. +   call AddMoney
  3858.     ld bc, MaxMoney
  3859.     ld a, $3
  3860. -   call CheckMoney
  3861. +   call CompareMoney
  3862.     jr z, .asm_15ff5
  3863.     jr c, .asm_15ff5
  3864.     ld hl, MaxMoney
  3865. @@ -19495,7 +19495,7 @@ MaxMoney: ; 15ff7
  3866.  
  3867.  TakeMoney:: ; 15ffa
  3868.     ld a, 3
  3869. -   call CheckMoney2
  3870. +   call SubtractMoney
  3871.     jr nc, .asm_16009
  3872.     xor a
  3873.     ld [de], a
  3874. @@ -19511,9 +19511,9 @@ TakeMoney:: ; 15ffa
  3875.     ret
  3876.  ; 1600b
  3877.  
  3878. -CheckMoney:: ; 1600b
  3879. +CompareMoney:: ; 1600b
  3880.     ld a, $3
  3881. -CheckFunds: ; 1600d
  3882. +CompareFunds: ; 1600d
  3883.     push hl
  3884.     push de
  3885.     push bc
  3886. @@ -19521,46 +19521,46 @@ CheckFunds: ; 1600d
  3887.     ld l, c
  3888.     ld c, $0
  3889.     ld b, a
  3890. -.asm_16015
  3891. +.loop1
  3892.     dec a
  3893. -   jr z, .asm_1601c
  3894. +   jr z, .done
  3895.     inc de
  3896.     inc hl
  3897. -   jr .asm_16015
  3898. +   jr .loop1
  3899.  
  3900. -.asm_1601c
  3901. +.done
  3902.     and a
  3903. -.asm_1601d
  3904. +.loop2
  3905.     ld a, [de]
  3906.     sbc [hl]
  3907. -   jr z, .asm_16022
  3908. +   jr z, .okay
  3909.     inc c
  3910.  
  3911. -.asm_16022
  3912. +.okay
  3913.     dec de
  3914.     dec hl
  3915.     dec b
  3916. -   jr nz, .asm_1601d
  3917. -   jr c, .asm_1602d
  3918. +   jr nz, .loop2
  3919. +   jr c, .set_carry
  3920.     ld a, c
  3921.     and a
  3922. -   jr .asm_16031
  3923. +   jr .skip_carry
  3924.  
  3925. -.asm_1602d
  3926. +.set_carry
  3927.     ld a, $1
  3928.     and a
  3929.     scf
  3930.  
  3931. -.asm_16031
  3932. +.skip_carry
  3933.     pop bc
  3934.     pop de
  3935.     pop hl
  3936.     ret
  3937.  ; 16035
  3938.  
  3939. -CheckMoney2: ; 16035
  3940. +SubtractMoney: ; 16035
  3941.     ld a, 3
  3942. -CheckFunds2: ; 16037
  3943. +SubtractFunds: ; 16037
  3944.     push hl
  3945.     push de
  3946.     push bc
  3947. @@ -19591,32 +19591,32 @@ CheckFunds2: ; 16037
  3948.     ret
  3949.  ; 16053
  3950.  
  3951. -Function16053: ; 16053
  3952. +AddMoney: ; 16053
  3953.     ld a, $3
  3954. -Function16055: ; 16055
  3955. +AddFunds: ; 16055
  3956.     push hl
  3957.     push de
  3958.     push bc
  3959.     ld h, b
  3960.     ld l, c
  3961.     ld b, a
  3962. -.asm_1605b
  3963. +.loop1
  3964.     dec a
  3965. -   jr z, .asm_16062
  3966. +   jr z, .done
  3967.     inc de
  3968.     inc hl
  3969. -   jr .asm_1605b
  3970. +   jr .loop1
  3971.  
  3972. -.asm_16062
  3973. +.done
  3974.     and a
  3975. -.asm_16063
  3976. +.loop2
  3977.     ld a, [de]
  3978.     adc [hl]
  3979.     ld [de], a
  3980.     dec de
  3981.     dec hl
  3982.     dec b
  3983. -   jr nz, .asm_16063
  3984. +   jr nz, .loop2
  3985.     pop bc
  3986.     pop de
  3987.     pop hl
  3988. @@ -19626,11 +19626,11 @@ Function16055: ; 16055
  3989.  GiveCoins:: ; 1606f
  3990.     ld a, 2
  3991.     ld de, Coins
  3992. -   call Function16055
  3993. +   call AddFunds
  3994.     ld a, 2
  3995.     ld bc, .maxcoins
  3996. -   call CheckFunds
  3997. -   jr c, .asm_1608b
  3998. +   call CompareFunds
  3999. +   jr c, .not_maxed
  4000.     ld hl, .maxcoins
  4001.     ld a, [hli]
  4002.     ld [de], a
  4003. @@ -19640,7 +19640,7 @@ GiveCoins:: ; 1606f
  4004.     scf
  4005.     ret
  4006.  
  4007. -.asm_1608b
  4008. +.not_maxed
  4009.     and a
  4010.     ret
  4011.  ; 1608d
  4012. @@ -19653,7 +19653,7 @@ GiveCoins:: ; 1606f
  4013.  TakeCoins:: ; 1608f
  4014.     ld a, 2
  4015.     ld de, Coins
  4016. -   call CheckFunds2
  4017. +   call SubtractFunds
  4018.     jr nc, .asm_1609f
  4019.     xor a
  4020.     ld [de], a
  4021. @@ -19670,7 +19670,7 @@ TakeCoins:: ; 1608f
  4022.  CheckCoins:: ; 160a1
  4023.     ld a, $2
  4024.     ld de, Coins
  4025. -   jp CheckFunds
  4026. +   jp CompareFunds
  4027.  ; 160a9
  4028.  
  4029.  
  4030. @@ -19788,7 +19788,7 @@ Function16798: ; 16798
  4031.     ld a, [CurPartySpecies]
  4032.     cp EGG
  4033.     jr z, .asm_167e1
  4034. -   callba Functione538
  4035. +   callba CheckCurPartyMonFainted
  4036.     jr c, .asm_167e9
  4037.     ld hl, PartyMon1Item
  4038.     ld bc, PartyMon2 - PartyMon1
  4039. @@ -19868,7 +19868,7 @@ Function16807: ; 16807
  4040.  .asm_1682d
  4041.     ld de, Money
  4042.     ld bc, StringBuffer2 + 2
  4043. -   callba CheckMoney
  4044. +   callba CompareMoney
  4045.     jr c, .asm_16848
  4046.     ld a, [PartyCount]
  4047.     cp $6
  4048. @@ -19913,7 +19913,7 @@ Function1686d: ; 1686d
  4049.     ld de, StringBuffer1
  4050.     ld bc, $000b
  4051.     call CopyBytes
  4052.     ld hl, $0000
  4053.     ld bc, $0064
  4054.     ld a, [StringBuffer2 + 1]
  4055.     call AddNTimes
  4056. @@ -24143,7 +24143,7 @@ MenuDataHeader_0x24d3f: ; 24d3f
  4057.     db $40 ; tile backup
  4058.     db 00, 06 ; start coords
  4059.     db 17, 19 ; end coords
  4060.     dw $0000
  4061.     db 1 ; default option
  4062.  ; 24d47
  4063.  
  4064. @@ -24475,7 +24475,7 @@ MenuData_0x24f34: ; 0x24f34
  4065.     dn 2, 2 ; rows, columns
  4066.     db 6 ; spacing
  4067.     dba Strings24f3d
  4068.     dbw $09, $0000
  4069.  ; 0x24f3d
  4070.  
  4071.  Strings24f3d: ; 0x24f3d
  4072. @@ -27816,7 +27816,7 @@ endr
  4073.     jr nz, .asm_28457
  4074.     ld hl, wc818
  4075.     ld de, wc608 + 10
  4076.     ld bc, $0000
  4077.  .asm_28464
  4078.     inc c
  4079.     ld a, c
  4080. @@ -32498,7 +32498,7 @@ Function2b995: ; 2b995
  4081.  ; 2b9a6
  4082.  
  4083.  Function2b9a6: ; 2b9a6
  4084.     ld de, $0000
  4085.     ld c, $3
  4086.  .asm_2b9ab
  4087.     ld a, [hli]
  4088. @@ -36346,7 +36346,7 @@ Function44654:: ; 44654
  4089.     jr nz, .asm_44691
  4090.  
  4091.  .asm_446ab
  4092. -   callba Functione538
  4093. +   callba CheckCurPartyMonFainted
  4094.     ld a, $4
  4095.     jr c, .asm_446c1
  4096.     xor a
  4097. @@ -41789,15 +41789,15 @@ Function4aad3: ; 4aad3
  4098.  
  4099.     ld c, a
  4100.     xor a
  4101. -   ld [hConnectedMapWidth], a
  4102. +   ld [hMapObjectIndexBuffer2], a
  4103.  .loop
  4104.     push bc
  4105.     push hl
  4106.     ld e, 0
  4107.     callba Function8e83f
  4108. -   ld a, [hConnectedMapWidth]
  4109. +   ld a, [hMapObjectIndexBuffer2]
  4110.     inc a
  4111. -   ld [hConnectedMapWidth], a
  4112. +   ld [hMapObjectIndexBuffer2], a
  4113.     pop hl
  4114.     pop bc
  4115.     dec c
  4116. @@ -43080,7 +43080,7 @@ ClockResetPassword: ; 4d41e
  4117.  .CalculatePassword: ; 4d50f
  4118.     ld a, BANK(sPlayerData)
  4119.     call GetSRAMBank
  4120.     ld de, $0000
  4121.     ld hl, sPlayerData + (PlayerID - wPlayerData)
  4122.     ld c, $2
  4123.     call .ComponentFromNumber
  4124. @@ -46574,7 +46574,7 @@ Function503e0: ; 503e0
  4125.     ret z
  4126.     ld c, a
  4127.     xor a
  4128. -   ld [hConnectedMapWidth], a
  4129. +   ld [hMapObjectIndexBuffer2], a
  4130.  .asm_503ea
  4131.     push bc
  4132.     push hl
  4133. @@ -46582,9 +46582,9 @@ Function503e0: ; 503e0
  4134.     ld a, BANK(Function8e83f)
  4135.     ld e, $0
  4136.     rst FarCall
  4137. -   ld a, [hConnectedMapWidth]
  4138. +   ld a, [hMapObjectIndexBuffer2]
  4139.     inc a
  4140. -   ld [hConnectedMapWidth], a
  4141. +   ld [hMapObjectIndexBuffer2], a
  4142.     pop hl
  4143.     pop bc
  4144.     dec c
  4145. @@ -49737,7 +49737,7 @@ GetMovementAction: ; 802ec
  4146.  IsNPCInFront: ; 80341
  4147.  
  4148.     ld a, 0
  4149. -   ld [hConnectionStripLength], a
  4150. +   ld [hMapObjectIndexBuffer1], a
  4151.     ld a, [MapX]
  4152.     ld d, a
  4153.     ld a, [WalkingX]
  4154. @@ -55278,7 +55278,7 @@ rept 3
  4155.  endr
  4156.     ld e, l
  4157.     ld d, h
  4158.     ld hl, $0000
  4159.     add hl, bc
  4160.     ld a, [wc3b4]
  4161.     ld [hli], a
  4162. @@ -55323,7 +55323,7 @@ endr
  4163.  ; 8d036
  4164.  
  4165.  Function8d036: ; 8d036
  4166.     ld hl, $0000
  4167.     add hl, bc
  4168.     ld [hl], $0
  4169.     ret
  4170. @@ -55831,7 +55831,7 @@ endr
  4171.  
  4172.  .four_zero: ; 8d30a
  4173.     call Function8d6d8
  4174.     ld hl, $0000
  4175.     add hl, bc
  4176.     ld a, [hl]
  4177.     ld hl, $000d
  4178. @@ -58143,7 +58143,7 @@ Function8e862: ; 8e862 (23:6862)
  4179.  
  4180.  Function8e86c: ; 8e86c (23:686c)
  4181.     push bc
  4182. -   ld a, [hConnectedMapWidth]
  4183. +   ld a, [hMapObjectIndexBuffer2]
  4184.     ld hl, PartyMon1Item
  4185.     ld bc, PartyMon2 - PartyMon1
  4186.     call AddNTimes
  4187. @@ -58215,7 +58215,7 @@ Function8e8d5: ; 8e8d5 (23:68d5)
  4188.  
  4189.  Function8e8df: ; 8e8df (23:68df)
  4190.     push bc
  4191. -   ld a, [hConnectedMapWidth]
  4192. +   ld a, [hMapObjectIndexBuffer2]
  4193.     ld hl, PartyMon1Item
  4194.     ld bc, $30
  4195.     call AddNTimes
  4196. @@ -58243,7 +58243,7 @@ Function8e8df: ; 8e8df (23:68df)
  4197.  Function8e908: ; 8e908 (23:6908)
  4198.     ld a, [wc3b7]
  4199.     push af
  4200. -   ld a, [hConnectedMapWidth]
  4201. +   ld a, [hMapObjectIndexBuffer2]
  4202.     ld hl, PartySpecies
  4203.     ld e, a
  4204.     ld d, $0
  4205. @@ -58252,7 +58252,7 @@ Function8e908: ; 8e908 (23:6908)
  4206.     call ReadMonMenuIcon
  4207.     ld [CurIcon], a
  4208.     call Function8e9db
  4209. -   ld a, [hConnectedMapWidth]
  4210. +   ld a, [hMapObjectIndexBuffer2]
  4211.  rept 4
  4212.     add a
  4213.  endr
  4214. @@ -58269,7 +58269,7 @@ endr
  4215.  
  4216.  Function8e936: ; 8e936 (23:6936)
  4217.     push bc
  4218. -   ld a, [hConnectedMapWidth]
  4219. +   ld a, [hMapObjectIndexBuffer2]
  4220.     ld b, a
  4221.     call Function8e94c
  4222.     ld a, b
  4223. @@ -59977,7 +59977,7 @@ Function9102f: ; 9102f (24:502f)
  4224.  
  4225.  Function9106a: ; 9106a
  4226.     push af
  4227.     ld de, $0000
  4228.     ld b, $a
  4229.     ld a, [PlayerGender]
  4230.     bit 0, a
  4231. @@ -60006,7 +60006,7 @@ Function9106a: ; 9106a
  4232.  
  4233.  Function91098: ; 91098
  4234.     push af
  4235.     ld de, $0000
  4236.     ld a, $d
  4237.     call Function3b2a
  4238.     ld hl, $0003
  4239. @@ -61834,7 +61834,7 @@ TownMapMon: ; 91f7b
  4240.     callba GetSpeciesIcon
  4241.  
  4242.  ; Animation/palette
  4243.     ld de, $0000
  4244.     ld a, $0
  4245.     call Function3b2a
  4246.  
  4247. @@ -61869,7 +61869,7 @@ TownMapPlayerIcon: ; 91fa6
  4248.     call Request2bpp
  4249.  
  4250.  ; Animation/palette
  4251.     ld de, $0000
  4252.     ld b, $0a ; Male
  4253.     ld a, [PlayerGender]
  4254.     bit 0, a
  4255. @@ -62918,7 +62918,7 @@ Function92c3a: ; 92c3a
  4256.     ld hl, $0005
  4257.     add hl, bc
  4258.     ld [hl], $0
  4259.     ld hl, $0000
  4260.     add hl, bc
  4261.     ld [hl], $1
  4262.     ld hl, $000f
  4263. @@ -62935,7 +62935,7 @@ Function92c4c: ; 92c4c
  4264.     ret
  4265.  
  4266.  .asm_92c56
  4267.     ld hl, $0000
  4268.     add hl, bc
  4269.     ld a, $0
  4270.     ld [hl], a
  4271. @@ -63043,7 +63043,7 @@ Function92cd2: ; 92cd2
  4272.  .asm_92ce1
  4273.     ld a, SFX_STOP_SLOT
  4274.     call Function9331e
  4275.     ld hl, $0000
  4276.     add hl, bc
  4277.     inc [hl]
  4278.     ld hl, $000a
  4279. @@ -63067,7 +63067,7 @@ Function92cf8: ; 92cf8
  4280.  .asm_92d02
  4281.     ld a, SFX_THROW_BALL
  4282.     call Function9331e
  4283.     ld hl, $0000
  4284.     add hl, bc
  4285.     inc [hl]
  4286.     ld hl, $0005
  4287. @@ -63092,7 +63092,7 @@ Function92d20: ; 92d20
  4288.     ld a, SFX_STOP_SLOT
  4289.     call Function9331e
  4290.     call Function93316
  4291.     ld hl, $0000
  4292.     add hl, bc
  4293.     inc [hl]
  4294.     ld hl, $0005
  4295. @@ -63126,7 +63126,7 @@ Function92d4f: ; 92d4f
  4296.     ret
  4297.  
  4298.  .asm_92d62
  4299.     ld hl, $0000
  4300.     add hl, bc
  4301.     inc [hl]
  4302.     ld hl, $0005
  4303. @@ -63138,7 +63138,7 @@ Function92d4f: ; 92d4f
  4304.  Function92d6e: ; 92d6e
  4305.     xor a
  4306.     ld [wcf64], a
  4307.     ld hl, $0000
  4308.     add hl, bc
  4309.     dec [hl]
  4310.     ld hl, $0005
  4311. @@ -63153,7 +63153,7 @@ Function92d7e: ; 92d7e
  4312.     ld a, SFX_STOP_SLOT
  4313.     call Function9331e
  4314.     call Function93316
  4315.     ld hl, $0000
  4316.     add hl, bc
  4317.     inc [hl]
  4318.     ld hl, $0005
  4319. @@ -63173,7 +63173,7 @@ Function92da4: ; 92da4
  4320.     ld a, [wcf64]
  4321.     and a
  4322.     ret z
  4323.     ld hl, $0000
  4324.     add hl, bc
  4325.     inc [hl]
  4326.     ld a, $2
  4327. @@ -63183,7 +63183,7 @@ Function92db3: ; 92db3
  4328.     ld a, [wcf64]
  4329.     cp $4
  4330.     ret c
  4331.     ld hl, $0000
  4332.     add hl, bc
  4333.     inc [hl]
  4334.     ld hl, $0005
  4335. @@ -63216,7 +63216,7 @@ Function92dca: ; 92dca
  4336.     ld hl, $0005
  4337.     add hl, bc
  4338.     ld [hl], $0
  4339.     ld hl, $0000
  4340.     add hl, bc
  4341.  rept 2
  4342.     dec [hl]
  4343. @@ -63232,7 +63232,7 @@ Function92df7: ; 92df7
  4344.     ld a, SFX_STOP_SLOT
  4345.     call Function9331e
  4346.     call Function93316
  4347.     ld hl, $0000
  4348.     add hl, bc
  4349.     inc [hl]
  4350.     call Function92fc0
  4351. @@ -63252,7 +63252,7 @@ Function92e10: ; 92e10
  4352.  
  4353.  .asm_92e1f
  4354.     dec [hl]
  4355.     ld hl, $0000
  4356.     add hl, bc
  4357.     inc [hl]
  4358.     ld hl, $000b
  4359. @@ -63272,7 +63272,7 @@ Function92e31: ; 92e31
  4360.     ret
  4361.  
  4362.  .asm_92e3b
  4363.     ld hl, $0000
  4364.     add hl, bc
  4365.     dec [hl]
  4366.     ld hl, $0005
  4367. @@ -63290,7 +63290,7 @@ Function92e47: ; 92e47
  4368.     ld hl, $0005
  4369.     add hl, bc
  4370.     ld [hl], $1
  4371.     ld hl, $0000
  4372.     add hl, bc
  4373.     inc [hl]
  4374.     ld hl, $000a
  4375. @@ -66424,7 +66424,7 @@ Functione0000: ; e0000
  4376.     xor a
  4377.     call GetSRAMBank
  4378.     ld hl, sScratch
  4379.     ld bc, $0000
  4380.  .asm_e000b
  4381.     push bc
  4382.     push hl
  4383. @@ -66914,7 +66914,7 @@ Functione0366: ; e0366
  4384.  ; e0398
  4385.  
  4386.  Functione0398: ; e0398
  4387.     ld hl, $0000
  4388.     ld bc, $0006
  4389.     ld a, [wcf64]
  4390.     call AddNTimes
  4391. @@ -71405,7 +71405,7 @@ Functione2f18: ; e2f18 (38:6f18)
  4392.     ld hl, wcb2a
  4393.     add [hl]
  4394.     ld [CurPartyMon], a
  4395. -   callba Functione538
  4396. +   callba CheckCurPartyMonFainted
  4397.     jr c, .AllOthersFainted
  4398.     ld a, [wcb32]
  4399.     and a
  4400. @@ -77198,12 +77198,12 @@ CheckBalance_MomItem2: ; fd044
  4401.     ld a, [hli]
  4402.     ld [hMoneyTemp], a
  4403.     ld a, [hli]
  4404. -   ld [$ffc4], a
  4405. +   ld [hMoneyTemp + 1], a
  4406.     ld a, [hli]
  4407. -   ld [$ffc5], a
  4408. +   ld [hMoneyTemp + 2], a
  4409.     ld de, wd851
  4410.     ld bc, hMoneyTemp
  4411. -   callba CheckMoney
  4412. +   callba CompareMoney
  4413.     jr nc, .have_enough_money
  4414.  
  4415.  .nope
  4416. @@ -77223,7 +77223,7 @@ CheckBalance_MomItem2: ; fd044
  4417.  .loop
  4418.     ld de, wdc19
  4419.     ld bc, wd851
  4420. -   callba CheckMoney
  4421. +   callba CompareMoney
  4422.     jr z, .exact
  4423.     jr nc, .less_than
  4424.     call Functionfd099
  4425. @@ -77246,7 +77246,7 @@ CheckBalance_MomItem2: ; fd044
  4426.  Functionfd099: ; fd099
  4427.     ld de, wdc19
  4428.     ld bc, hMoneyTemp
  4429. -   callba Function16053
  4430. +   callba AddMoney
  4431.     ret
  4432.  ; fd0a6
  4433.  
  4434. @@ -77827,11 +77827,11 @@ Function104263: ; 104263 (41:4263)
  4435.     ld c, $0
  4436.  
  4437.  Function104265: ; 104265 (41:4265)
  4438. -; back up the value of c to hConnectionStripLength
  4439. -   ld a, [hConnectionStripLength]
  4440. +; back up the value of c to hMapObjectIndexBuffer1
  4441. +   ld a, [hMapObjectIndexBuffer1]
  4442.     push af
  4443.     ld a, c
  4444. -   ld [hConnectionStripLength], a
  4445. +   ld [hMapObjectIndexBuffer1], a
  4446.  
  4447.  ; for each row on the screen
  4448.     ld c, SCREEN_HEIGHT
  4449. @@ -77847,7 +77847,7 @@ Function104265: ; 104265 (41:4265)
  4450.     jr nz, .loop2
  4451.  
  4452.  ; load the original value of c into hl 12 times
  4453. -   ld a, [hConnectionStripLength]
  4454. +   ld a, [hMapObjectIndexBuffer1]
  4455.     ld b, 12
  4456.  .loop3
  4457.     ld [hli], a
  4458. @@ -77857,9 +77857,9 @@ Function104265: ; 104265 (41:4265)
  4459.     dec c
  4460.     jr nz, .loop1
  4461.  
  4462. -; restore the original value of hConnectionStripLength
  4463. +; restore the original value of hMapObjectIndexBuffer1
  4464.     pop af
  4465. -   ld [hConnectionStripLength], a
  4466. +   ld [hMapObjectIndexBuffer1], a
  4467.     ret
  4468.  
  4469.  
  4470. @@ -80965,7 +80965,7 @@ Function10616e: ; 10616e
  4471.     ld hl, $a001
  4472.     ld bc, $0080
  4473.     xor a
  4474.     ld de, $0000
  4475.  .asm_106179
  4476.     ld a, e
  4477.     add [hl]
  4478. diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
  4479. index bd764e9..54ba5cc 100644
  4480. --- a/maps/AzaleaGym.asm
  4481. +++ b/maps/AzaleaGym.asm
  4482. @@ -5,21 +5,21 @@ AzaleaGym_MapScriptHeader:
  4483.  .MapCallbacks:
  4484.     db 0
  4485.  
  4486. -BugsyScript_0x18ec1e:
  4487. +BugsyScript:
  4488.     faceplayer
  4489.     loadfont
  4490.     checkevent EVENT_BEAT_BUGSY
  4491.     iftrue .FightDone
  4492. -   writetext UnknownText_0x18ed0b
  4493. +   writetext BugsyText_INeverLose
  4494.     closetext
  4495.     loadmovesprites
  4496.     winlosstext UnknownText_0x18edae, $0000
  4497.     loadtrainer BUGSY, 1
  4498.     startbattle
  4499.     returnafterbattle
  4500.     setevent EVENT_BEAT_BUGSY
  4501.     loadfont
  4502. -   writetext UnknownText_0x18ee14
  4503. +   writetext Text_ReceivedHiveBadge
  4504.     playsound SFX_GET_BADGE
  4505.     waitbutton
  4506.     setflag ENGINE_HIVEBADGE
  4507. @@ -32,18 +32,18 @@ BugsyScript_0x18ec1e:
  4508.     setevent EVENT_BEAT_BUG_CATCHER_BENNY
  4509.     setevent EVENT_BEAT_BUG_CATCHER_AL
  4510.     setevent EVENT_BEAT_BUG_CATCHER_JOSH
  4511. -   writetext UnknownText_0x18ee2b
  4512. +   writetext BugsyText_HiveBadgeSpeech
  4513.     keeptextopen
  4514.     verbosegiveitem TM_FURY_CUTTER, 1
  4515.     iffalse .NoRoomForFuryCutter
  4516.     setevent EVENT_GOT_TM49_FURY_CUTTER
  4517. -   writetext UnknownText_0x18eefa
  4518. +   writetext BugsyText_FuryCutterSpeech
  4519.     closetext
  4520.     loadmovesprites
  4521.     end
  4522.  
  4523.  .GotFuryCutter:
  4524. -   writetext UnknownText_0x18ef98
  4525. +   writetext BugsyText_BugMonsAreDeep
  4526.     closetext
  4527.  .NoRoomForFuryCutter:
  4528.     loadmovesprites
  4529. @@ -61,56 +61,56 @@ AzaleaGymTriggerRockets:
  4530.     jumpstd radiotowerrockets
  4531.  
  4532.  TrainerTwinsAmyandmay1:
  4533.     trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, .AfterScript
  4534.  
  4535.  .AfterScript:
  4536.     talkaftercancel
  4537.     loadfont
  4538. -   writetext UnknownText_0x18f1fc
  4539. +   writetext TwinsAmyandmay1AfterBattleText
  4540.     closetext
  4541.     loadmovesprites
  4542.     end
  4543.  
  4544.  TrainerTwinsAmyandmay2:
  4545.     trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, .AfterScript
  4546.  
  4547.  .AfterScript:
  4548.     talkaftercancel
  4549.     loadfont
  4550. -   writetext UnknownText_0x18f269
  4551. +   writetext TwinsAmyandmay2AfterBattleText
  4552.     closetext
  4553.     loadmovesprites
  4554.     end
  4555.  
  4556. -TrainerBug_catcherBug_catcher_benny:
  4557.     trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, .AfterScript
  4558. +TrainerBug_catcherbenny:
  4559.  
  4560.  .AfterScript:
  4561.     talkaftercancel
  4562.     loadfont
  4563. -   writetext UnknownText_0x18f053
  4564. +   writetext Bug_catcherbennyAfterBattleText
  4565.     closetext
  4566.     loadmovesprites
  4567.     end
  4568.  
  4569.  TrainerBug_catcherAl:
  4570.     trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, .AfterScript
  4571.  
  4572.  .AfterScript:
  4573.     talkaftercancel
  4574.     loadfont
  4575. -   writetext UnknownText_0x18f0d3
  4576. +   writetext Bug_catcherAlAfterBattleText
  4577.     closetext
  4578.     loadmovesprites
  4579.     end
  4580.  
  4581.  TrainerBug_catcherJosh:
  4582.     trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, .AfterScript
  4583.  
  4584.  .AfterScript:
  4585.     talkaftercancel
  4586.     loadfont
  4587. -   writetext UnknownText_0x18f17e
  4588. +   writetext Bug_catcherJoshAfterBattleText
  4589.     closetext
  4590.     loadmovesprites
  4591.     end
  4592. @@ -140,7 +140,7 @@ AzaleaGymStatue:
  4593.     trainertotext BUGSY, 1, $1
  4594.     jumpstd gymstatue2
  4595.  
  4596. -UnknownText_0x18ed0b:
  4597. +BugsyText_INeverLose:
  4598.     text "I'm BUGSY!"
  4599.     line "I never lose when"
  4600.  
  4601. @@ -158,7 +158,7 @@ UnknownText_0x18ed0b:
  4602.     cont "from my studies."
  4603.     done
  4604.  
  4605. -UnknownText_0x18edae:
  4606. +BugsyText_ResearchIncomplete:
  4607.     text "Whoa, amazing!"
  4608.     line "You're an expert"
  4609.     cont "on #MON!"
  4610. @@ -170,12 +170,12 @@ UnknownText_0x18edae:
  4611.     line "this BADGE."
  4612.     done
  4613.  
  4614. -UnknownText_0x18ee14:
  4615. +Text_ReceivedHiveBadge:
  4616.     text "<PLAYER> received"
  4617.     line "HIVEBADGE."
  4618.     done
  4619.  
  4620. -UnknownText_0x18ee2b:
  4621. +BugsyText_HiveBadgeSpeech:
  4622.     text "Do you know the"
  4623.     line "benefits of HIVE-"
  4624.     cont "BADGE?"
  4625. @@ -196,7 +196,7 @@ UnknownText_0x18ee2b:
  4626.     line "you to have this."
  4627.     done
  4628.  
  4629. -UnknownText_0x18eefa:
  4630. +BugsyText_FuryCutterSpeech:
  4631.     text "TM49 contains"
  4632.     line "FURY CUTTER."
  4633.  
  4634. @@ -212,7 +212,7 @@ UnknownText_0x18eefa:
  4635.     line "I discovered it!"
  4636.     done
  4637.  
  4638. -UnknownText_0x18ef98:
  4639. +BugsyText_BugMonsAreDeep:
  4640.     text "Bug #MON are"
  4641.     line "deep. There are"
  4642.  
  4643. @@ -223,7 +223,7 @@ UnknownText_0x18ef98:
  4644.     line "ites thoroughly."
  4645.     done
  4646.  
  4647. -Bug_catcherBug_catcher_bennySeenText:
  4648. +Bug_catcherbennySeenText:
  4649.     text "Bug #MON evolve"
  4650.     line "young. So they get"
  4651.  
  4652. @@ -231,12 +231,12 @@ Bug_catcherBug_catcher_bennySeenText:
  4653.     line "faster."
  4654.     done
  4655.  
  4656. -Bug_catcherBug_catcher_bennyBeatenText:
  4657. +Bug_catcherbennyBeatenText:
  4658.     text "Just evolving"
  4659.     line "isn't enough!"
  4660.     done
  4661.  
  4662. -UnknownText_0x18f053:
  4663. +Bug_catcherbennyAfterBattleText:
  4664.     text "#MON become"
  4665.     line "stronger if they"
  4666.     cont "evolve. Really!"
  4667. @@ -255,7 +255,7 @@ Bug_catcherAlBeatenText:
  4668.     line "tough you are…"
  4669.     done
  4670.  
  4671. -UnknownText_0x18f0d3:
  4672. +Bug_catcherAlAfterBattleText:
  4673.     text "They're so cool,"
  4674.     line "but most girls"
  4675.  
  4676. @@ -279,7 +279,7 @@ Bug_catcherJoshBeatenText:
  4677.     text "Urrgggh!"
  4678.     done
  4679.  
  4680. -UnknownText_0x18f17e:
  4681. +Bug_catcherJoshAfterBattleText:
  4682.     text "I guess I should"
  4683.     line "teach them better"
  4684.     cont "moves…"
  4685. @@ -296,7 +296,7 @@ TwinsAmyandmay1BeatenText:
  4686.     line "double goodness!"
  4687.     done
  4688.  
  4689. -UnknownText_0x18f1fc:
  4690. +TwinsAmyandmay1AfterBattleText:
  4691.     text "AMY: You're"
  4692.     line "really strong!"
  4693.     done
  4694. @@ -312,7 +312,7 @@ TwinsAmyandmay2BeatenText:
  4695.     line "double goodness!"
  4696.     done
  4697.  
  4698. -UnknownText_0x18f269:
  4699. +TwinsAmyandmay2AfterBattleText:
  4700.     text "MAY: Our bug #-"
  4701.     line "MON lost! Oh, what"
  4702.     cont "a shame."
  4703. @@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
  4704.  
  4705.  .PersonEvents:
  4706.     db 7
  4707. -   person_event SPRITE_BUGSY, 7, 5, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript_0x18ec1e, -1
  4708. -   person_event SPRITE_BUG_CATCHER, 3, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherBug_catcher_benny, -1
  4709. -   person_event SPRITE_BUG_CATCHER, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
  4710. -   person_event SPRITE_BUG_CATCHER, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
  4711. -   person_event SPRITE_TWIN, 10, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
  4712. -   person_event SPRITE_TWIN, 10, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
  4713. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1
  4714. +   person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript, -1
  4715. +   person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherbenny, -1
  4716. +   person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
  4717. +   person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
  4718. +   person_event SPRITE_TWIN, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
  4719. +   person_event SPRITE_TWIN, 10, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
  4720. +   person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1
  4721. diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
  4722. index b40acd8..b43f896 100644
  4723. --- a/maps/AzaleaMart.asm
  4724. +++ b/maps/AzaleaMart.asm
  4725. @@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
  4726.  
  4727.  .PersonEvents:
  4728.     db 3
  4729. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
  4730. -   person_event SPRITE_COOLTRAINER_M, 5, 2, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
  4731. -   person_event SPRITE_BUG_CATCHER, 2, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1
  4732. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
  4733. +   person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
  4734. +   person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1
  4735. diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm
  4736. index f64d8ea..4d1a016 100644
  4737. --- a/maps/AzaleaPokeCenter1F.asm
  4738. +++ b/maps/AzaleaPokeCenter1F.asm
  4739. @@ -3,7 +3,7 @@ AzaleaPokeCenter1F_MapScriptHeader:
  4740.     db 1
  4741.  
  4742.     ; triggers
  4743.     dw UnknownScript_0x18db27, $0000
  4744.  
  4745.  .MapCallbacks:
  4746.     db 0
  4747. @@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
  4748.  
  4749.  .PersonEvents:
  4750.     db 4
  4751. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
  4752. -   person_event SPRITE_GENTLEMAN, 6, 9, $4, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
  4753. -   person_event SPRITE_FISHING_GURU, 1, 6, $6, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
  4754. -   person_event SPRITE_POKEFAN_F, 4, 1, $2, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1
  4755. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
  4756. +   person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
  4757. +   person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
  4758. +   person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1
  4759. diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
  4760. index a2016e4..0839586 100644
  4761. --- a/maps/AzaleaTown.asm
  4762. +++ b/maps/AzaleaTown.asm
  4763. @@ -3,9 +3,9 @@ AzaleaTown_MapScriptHeader:
  4764.     db 3
  4765.  
  4766.     ; triggers
  4767.     dw .Trigger1, $0000
  4768.     dw .Trigger2, $0000
  4769.     dw .Trigger3, $0000
  4770.  
  4771.  .MapCallbacks:
  4772.     db 1
  4773. @@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
  4774.  
  4775.  .PersonEvents:
  4776.     db 12
  4777. -   person_event SPRITE_AZALEA_ROCKET, 9, 31, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
  4778. -   person_event SPRITE_GRAMPS, 9, 21, $2, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
  4779. -   person_event SPRITE_TEACHER, 13, 15, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
  4780. -   person_event SPRITE_YOUNGSTER, 9, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
  4781. -   person_event SPRITE_SLOWPOKE, 17, 8, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4782. -   person_event SPRITE_SLOWPOKE, 9, 18, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4783. -   person_event SPRITE_SLOWPOKE, 9, 29, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4784. -   person_event SPRITE_SLOWPOKE, 15, 15, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4785. -   person_event SPRITE_FRUIT_TREE, 2, 8, $1, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
  4786. -   person_event SPRITE_AZALEA_ROCKET, 10, 11, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
  4787. -   person_event SPRITE_AZALEA_ROCKET, 16, 10, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
  4788. -   person_event SPRITE_KURT_OUTSIDE, 5, 6, $8, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
  4789. +   person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
  4790. +   person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
  4791. +   person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
  4792. +   person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
  4793. +   person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4794. +   person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4795. +   person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4796. +   person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4797. +   person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
  4798. +   person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
  4799. +   person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
  4800. +   person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
  4801. diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
  4802. index 53b6b87..44b2264 100644
  4803. --- a/maps/BattleTower1F.asm
  4804. +++ b/maps/BattleTower1F.asm
  4805. @@ -3,8 +3,8 @@ BattleTower1F_MapScriptHeader:
  4806.     db 2
  4807.  
  4808.     ; triggers
  4809.     dw UnknownScript_0x9e39d, $0000
  4810.     dw UnknownScript_0x9e3d3, $0000
  4811.  
  4812.  .MapCallbacks:
  4813.     db 0
  4814. @@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
  4815.  
  4816.  .PersonEvents:
  4817.     db 5
  4818. -   person_event SPRITE_RECEPTIONIST, 6, 7, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
  4819. -   person_event SPRITE_YOUNGSTER, 9, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
  4820. -   person_event SPRITE_COOLTRAINER_F, 9, 4, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
  4821. -   person_event SPRITE_BUG_CATCHER, 3, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
  4822. -   person_event SPRITE_GRANNY, 3, 14, $4, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1
  4823. +   person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
  4824. +   person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
  4825. +   person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
  4826. +   person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
  4827. +   person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1
  4828. diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
  4829. index 9bc80b1..7f704e8 100644
  4830. --- a/maps/BattleTowerBattleRoom.asm
  4831. +++ b/maps/BattleTowerBattleRoom.asm
  4832. @@ -3,8 +3,8 @@ BattleTowerBattleRoom_MapScriptHeader:
  4833.     db 2
  4834.  
  4835.     ; triggers
  4836.     dw Script_EnterBattleRoom, $0000
  4837.     dw UnknownScript_0x9f420, $0000
  4838.  
  4839.  .MapCallbacks:
  4840.     db 0
  4841. @@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
  4842.  
  4843.  .PersonEvents:
  4844.     db 2
  4845. -   person_event SPRITE_YOUNGSTER, 0, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
  4846. -   person_event SPRITE_RECEPTIONIST, 6, 1, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
  4847. +   person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
  4848. +   person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
  4849. diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
  4850. index abfd137..5ef5899 100644
  4851. --- a/maps/BattleTowerElevator.asm
  4852. +++ b/maps/BattleTowerElevator.asm
  4853. @@ -3,8 +3,8 @@ BattleTowerElevator_MapScriptHeader:
  4854.     db 2
  4855.  
  4856.     ; triggers
  4857.     dw UnknownScript_0x9f562, $0000
  4858.     dw UnknownScript_0x9f567, $0000
  4859.  
  4860.  .MapCallbacks:
  4861.     db 0
  4862. @@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
  4863.  
  4864.  .PersonEvents:
  4865.     db 1
  4866. -   person_event SPRITE_RECEPTIONIST, 2, 1, $9, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1
  4867. +   person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1
  4868. diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
  4869. index 179ec15..9533a4b 100644
  4870. --- a/maps/BattleTowerHallway.asm
  4871. +++ b/maps/BattleTowerHallway.asm
  4872. @@ -3,8 +3,8 @@ BattleTowerHallway_MapScriptHeader:
  4873.     db 2
  4874.  
  4875.     ; triggers
  4876.     dw UnknownScript_0x9f5bb, $0000
  4877.     dw UnknownScript_0x9f5c0, $0000
  4878.  
  4879.  .MapCallbacks:
  4880.     db 0
  4881. @@ -98,4 +98,4 @@ BattleTowerHallway_MapEventHeader:
  4882.  
  4883.  .PersonEvents:
  4884.     db 1
  4885. -   person_event SPRITE_RECEPTIONIST, 2, 11, $6, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1
  4886. +   person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1
  4887. diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
  4888. index 43ee41e..72030b5 100644
  4889. --- a/maps/BattleTowerOutside.asm
  4890. +++ b/maps/BattleTowerOutside.asm
  4891. @@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
  4892.  
  4893.  .PersonEvents:
  4894.     db 4
  4895. -   person_event SPRITE_STANDING_YOUNGSTER, 12, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
  4896. -   person_event SPRITE_BUENA, 11, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
  4897. -   person_event SPRITE_SAILOR, 18, 12, $5, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
  4898. -   person_event SPRITE_LASS, 24, 12, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
  4899. +   person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
  4900. +   person_event SPRITE_BUENA, 11, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
  4901. +   person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
  4902. +   person_event SPRITE_LASS, 24, 12, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
  4903. diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
  4904. index 3372d84..cdf3d67 100644
  4905. --- a/maps/BillsHouse.asm
  4906. +++ b/maps/BillsHouse.asm
  4907. @@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
  4908.  
  4909.  .PersonEvents:
  4910.     db 1
  4911. -   person_event SPRITE_GRAMPS, 3, 2, $7, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1
  4912. +   person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_07, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1
  4913. diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
  4914. index 9e2b246..4f328d3 100644
  4915. --- a/maps/BlackthornCity.asm
  4916. +++ b/maps/BlackthornCity.asm
  4917. @@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
  4918.  
  4919.  .PersonEvents:
  4920.     db 9
  4921. -   person_event SPRITE_SUPER_NERD, 12, 18, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
  4922. -   person_event SPRITE_SUPER_NERD, 12, 19, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
  4923. -   person_event SPRITE_GRAMPS, 2, 20, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
  4924. -   person_event SPRITE_GRAMPS, 2, 21, $8, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
  4925. -   person_event SPRITE_BLACK_BELT, 31, 24, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
  4926. -   person_event SPRITE_COOLTRAINER_F, 25, 9, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
  4927. -   person_event SPRITE_YOUNGSTER, 15, 13, $5, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
  4928. -   person_event SPRITE_YOUNGSTER, 20, 22, $6, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
  4929. -   person_event SPRITE_COOLTRAINER_F, 19, 35, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1
  4930. +   person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
  4931. +   person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
  4932. +   person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
  4933. +   person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
  4934. +   person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
  4935. +   person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
  4936. +   person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
  4937. +   person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
  4938. +   person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1
  4939. diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm
  4940. index 2e0749c..3fcb64a 100644
  4941. --- a/maps/BlackthornDodrioTradeHouse.asm
  4942. +++ b/maps/BlackthornDodrioTradeHouse.asm
  4943. @@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader:
  4944.  
  4945.  .PersonEvents:
  4946.     db 1
  4947. -   person_event SPRITE_LASS, 3, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1
  4948. +   person_event SPRITE_LASS, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1
  4949. diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
  4950. index 3a50fd9..c42170a 100644
  4951. --- a/maps/BlackthornDragonSpeechHouse.asm
  4952. +++ b/maps/BlackthornDragonSpeechHouse.asm
  4953. @@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
  4954.  
  4955.  .PersonEvents:
  4956.     db 2
  4957. -   person_event SPRITE_GRANNY, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
  4958. -   person_event SPRITE_EKANS, 5, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1
  4959. +   person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
  4960. +   person_event SPRITE_EKANS, 5, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1
  4961. diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
  4962. index 1ca6831..673d3c0 100644
  4963. --- a/maps/BlackthornGym1F.asm
  4964. +++ b/maps/BlackthornGym1F.asm
  4965. @@ -33,7 +33,7 @@ ClairScript_0x194e24:
  4966.     writetext UnknownText_0x194efa
  4967.     closetext
  4968.     loadmovesprites
  4969.     winlosstext UnknownText_0x194fd6, $0000
  4970.     loadtrainer CLAIR, 1
  4971.     startbattle
  4972.     returnafterbattle
  4973. @@ -87,7 +87,7 @@ UnknownScript_0x194e94:
  4974.     end
  4975.  
  4976.  TrainerCooltrainermPaul:
  4977.     trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, $0000, CooltrainermPaulScript
  4978.  
  4979.  CooltrainermPaulScript:
  4980.     talkaftercancel
  4981. @@ -98,7 +98,7 @@ CooltrainermPaulScript:
  4982.     end
  4983.  
  4984.  TrainerCooltrainermMike:
  4985.     trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, $0000, CooltrainermMikeScript
  4986.  
  4987.  CooltrainermMikeScript:
  4988.     talkaftercancel
  4989. @@ -109,7 +109,7 @@ CooltrainermMikeScript:
  4990.     end
  4991.  
  4992.  TrainerCooltrainerfLola:
  4993.     trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, $0000, CooltrainerfLolaScript
  4994.  
  4995.  CooltrainerfLolaScript:
  4996.     talkaftercancel
  4997. @@ -404,8 +404,8 @@ BlackthornGym1F_MapEventHeader:
  4998.  
  4999.  .PersonEvents:
  5000.     db 5
  5001. -   person_event SPRITE_CLAIR, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
  5002. -   person_event SPRITE_COOLTRAINER_M, 6, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
  5003. -   person_event SPRITE_COOLTRAINER_M, 14, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
  5004. -   person_event SPRITE_COOLTRAINER_F, 2, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
  5005. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1
  5006. +   person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
  5007. +   person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
  5008. +   person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
  5009. +   person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
  5010. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1
  5011. diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
  5012. index 50a86d5..880aae7 100644
  5013. --- a/maps/BlackthornGym2F.asm
  5014. +++ b/maps/BlackthornGym2F.asm
  5015. @@ -59,7 +59,7 @@ BlackthornGymBoulder:
  5016.     jumpstd strengthboulder
  5017.  
  5018.  TrainerCooltrainermCody:
  5019.     trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, $0000, CooltrainermCodyScript
  5020.  
  5021.  CooltrainermCodyScript:
  5022.     talkaftercancel
  5023. @@ -70,7 +70,7 @@ CooltrainermCodyScript:
  5024.     end
  5025.  
  5026.  TrainerCooltrainerfFran:
  5027.     trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, $0000, CooltrainerfFranScript
  5028.  
  5029.  CooltrainerfFranScript:
  5030.     talkaftercancel
  5031. @@ -145,11 +145,11 @@ BlackthornGym2F_MapEventHeader:
  5032.  
  5033.  .PersonEvents:
  5034.     db 8
  5035. -   person_event SPRITE_COOLTRAINER_M, 1, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1
  5036. -   person_event SPRITE_COOLTRAINER_F, 11, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1
  5037. -   person_event SPRITE_BOULDER, 2, 8, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
  5038. -   person_event SPRITE_BOULDER, 3, 2, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
  5039. -   person_event SPRITE_BOULDER, 16, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
  5040. -   person_event SPRITE_BOULDER, 3, 3, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  5041. -   person_event SPRITE_BOULDER, 1, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  5042. -   person_event SPRITE_BOULDER, 14, 8, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  5043. +   person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1
  5044. +   person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1
  5045. +   person_event SPRITE_BOULDER, 2, 8, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
  5046. +   person_event SPRITE_BOULDER, 3, 2, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
  5047. +   person_event SPRITE_BOULDER, 16, 6, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
  5048. +   person_event SPRITE_BOULDER, 3, 3, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  5049. +   person_event SPRITE_BOULDER, 1, 6, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  5050. +   person_event SPRITE_BOULDER, 14, 8, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  5051. diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
  5052. index f39b1f4..35ba57a 100644
  5053. --- a/maps/BlackthornMart.asm
  5054. +++ b/maps/BlackthornMart.asm
  5055. @@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader:
  5056.  
  5057.  .PersonEvents:
  5058.     db 3
  5059. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1
  5060. -   person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1
  5061. -   person_event SPRITE_BLACK_BELT, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1
  5062. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1
  5063. +   person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1
  5064. +   person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1
  5065. diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm
  5066. index 0c441b4..68078bd 100644
  5067. --- a/maps/BlackthornPokeCenter1F.asm
  5068. +++ b/maps/BlackthornPokeCenter1F.asm
  5069. @@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader:
  5070.  
  5071.  .PersonEvents:
  5072.     db 4
  5073. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1
  5074. -   person_event SPRITE_GENTLEMAN, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1
  5075. -   person_event SPRITE_TWIN, 4, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1
  5076. -   person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1
  5077. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1
  5078. +   person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1
  5079. +   person_event SPRITE_TWIN, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1
  5080. +   person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1
  5081. diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
  5082. index 40ff945..79b7a8e 100644
  5083. --- a/maps/BluesHouse.asm
  5084. +++ b/maps/BluesHouse.asm
  5085. @@ -158,4 +158,4 @@ BluesHouse_MapEventHeader:
  5086.  
  5087.  .PersonEvents:
  5088.     db 1
  5089. -   person_event SPRITE_DAISY, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1
  5090. +   person_event SPRITE_DAISY, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1
  5091. diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
  5092. index d01c549..37f0a63 100644
  5093. --- a/maps/BrunosRoom.asm
  5094. +++ b/maps/BrunosRoom.asm
  5095. @@ -3,8 +3,8 @@ BrunosRoom_MapScriptHeader:
  5096.     db 2
  5097.  
  5098.     ; triggers
  5099.     dw UnknownScript_0x180993, $0000
  5100.     dw UnknownScript_0x180997, $0000
  5101.  
  5102.  .MapCallbacks:
  5103.     db 1
  5104. @@ -52,7 +52,7 @@ BrunoScript_0x1809c5:
  5105.     writetext UnknownText_0x1809fe
  5106.     closetext
  5107.     loadmovesprites
  5108.     winlosstext UnknownText_0x180b23, $0000
  5109.     loadtrainer BRUNO, 1
  5110.     startbattle
  5111.     returnafterbattle
  5112. @@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader:
  5113.  
  5114.  .PersonEvents:
  5115.     db 1
  5116. -   person_event SPRITE_BRUNO, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1
  5117. +   person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1
  5118. diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
  5119. index 7bb2a3e..a7941e0 100644
  5120. --- a/maps/BurnedTower1F.asm
  5121. +++ b/maps/BurnedTower1F.asm
  5122. @@ -3,9 +3,9 @@ BurnedTower1F_MapScriptHeader:
  5123.     db 3
  5124.  
  5125.     ; triggers
  5126.     dw UnknownScript_0x185bf2, $0000
  5127.     dw UnknownScript_0x185bf6, $0000
  5128.     dw UnknownScript_0x185bf7, $0000
  5129.  
  5130.  .MapCallbacks:
  5131.     db 1
  5132. @@ -309,8 +309,8 @@ BurnedTower1F_MapEventHeader:
  5133.  
  5134.  .PersonEvents:
  5135.     db 5
  5136. -   person_event SPRITE_ROCK, 4, 15, $18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1
  5137. -   person_event SPRITE_SUPER_NERD, 12, 12, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
  5138. -   person_event SPRITE_SILVER, 9, 8, $8, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
  5139. -   person_event SPRITE_MORTY, 14, 14, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
  5140. -   person_event SPRITE_POKE_BALL, 2, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP
  5141. +   person_event SPRITE_ROCK, 4, 15, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1
  5142. +   person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
  5143. +   person_event SPRITE_SILVER, 9, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
  5144. +   person_event SPRITE_MORTY, 14, 14, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
  5145. +   person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP
  5146. diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
  5147. index fe4adc5..7241091 100644
  5148. --- a/maps/BurnedTowerB1F.asm
  5149. +++ b/maps/BurnedTowerB1F.asm
  5150. @@ -3,8 +3,8 @@ BurnedTowerB1F_MapScriptHeader:
  5151.     db 2
  5152.  
  5153.     ; triggers
  5154.     dw UnknownScript_0x18615e, $0000
  5155.     dw UnknownScript_0x18615f, $0000
  5156.  
  5157.  .MapCallbacks:
  5158.     db 1
  5159. @@ -251,12 +251,12 @@ BurnedTowerB1F_MapEventHeader:
  5160.  
  5161.  .PersonEvents:
  5162.     db 9
  5163. -   person_event SPRITE_BOULDER, 8, 17, $19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1
  5164. -   person_event SPRITE_RAIKOU, 3, 7, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
  5165. -   person_event SPRITE_ENTEI, 3, 12, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
  5166. -   person_event SPRITE_SUICUNE, 4, 10, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
  5167. -   person_event SPRITE_RAIKOU, 3, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
  5168. -   person_event SPRITE_ENTEI, 3, 12, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
  5169. -   person_event SPRITE_SUICUNE, 4, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
  5170. -   person_event SPRITE_POKE_BALL, 4, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
  5171. -   person_event SPRITE_SUPER_NERD, 12, 10, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER
  5172. +   person_event SPRITE_BOULDER, 8, 17, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1
  5173. +   person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
  5174. +   person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
  5175. +   person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
  5176. +   person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
  5177. +   person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
  5178. +   person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
  5179. +   person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
  5180. +   person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER
  5181. diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
  5182. index 22ca25f..39afc30 100644
  5183. --- a/maps/CeladonCafe.asm
  5184. +++ b/maps/CeladonCafe.asm
  5185. @@ -219,8 +219,8 @@ CeladonCafe_MapEventHeader:
  5186.  
  5187.  .PersonEvents:
  5188.     db 5
  5189. -   person_event SPRITE_SUPER_NERD, 3, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1
  5190. -   person_event SPRITE_FISHER, 6, 4, $8, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1
  5191. -   person_event SPRITE_FISHER, 7, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1
  5192. -   person_event SPRITE_FISHER, 2, 1, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1
  5193. -   person_event SPRITE_TEACHER, 3, 4, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1
  5194. +   person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1
  5195. +   person_event SPRITE_FISHER, 6, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1
  5196. +   person_event SPRITE_FISHER, 7, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1
  5197. +   person_event SPRITE_FISHER, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1
  5198. +   person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1
  5199. diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
  5200. index 1298c58..daaa7f0 100644
  5201. --- a/maps/CeladonCity.asm
  5202. +++ b/maps/CeladonCity.asm
  5203. @@ -257,12 +257,12 @@ CeladonCity_MapEventHeader:
  5204.  
  5205.  .PersonEvents:
  5206.     db 9
  5207. -   person_event SPRITE_FISHER, 11, 26, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1
  5208. -   person_event SPRITE_POLIWAG, 11, 27, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1
  5209. -   person_event SPRITE_TEACHER, 24, 20, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1
  5210. -   person_event SPRITE_GRAMPS, 16, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1
  5211. -   person_event SPRITE_GRAMPS, 31, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1
  5212. -   person_event SPRITE_YOUNGSTER, 13, 18, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1
  5213. -   person_event SPRITE_YOUNGSTER, 33, 24, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1
  5214. -   person_event SPRITE_TEACHER, 14, 6, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1
  5215. -   person_event SPRITE_LASS, 22, 7, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1
  5216. +   person_event SPRITE_FISHER, 11, 26, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1
  5217. +   person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1
  5218. +   person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1
  5219. +   person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1
  5220. +   person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1
  5221. +   person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1
  5222. +   person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1
  5223. +   person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1
  5224. +   person_event SPRITE_LASS, 22, 7, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1
  5225. diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
  5226. index 3f8250c..f875e29 100644
  5227. --- a/maps/CeladonDeptStore1F.asm
  5228. +++ b/maps/CeladonDeptStore1F.asm
  5229. @@ -89,6 +89,6 @@ CeladonDeptStore1F_MapEventHeader:
  5230.  
  5231.  .PersonEvents:
  5232.     db 3
  5233. -   person_event SPRITE_RECEPTIONIST, 1, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1
  5234. -   person_event SPRITE_GENTLEMAN, 4, 11, $2, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1
  5235. -   person_event SPRITE_TEACHER, 3, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1
  5236. +   person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1
  5237. +   person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1
  5238. +   person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1
  5239. diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
  5240. index 5124f6f..6524a6c 100644
  5241. --- a/maps/CeladonDeptStore2F.asm
  5242. +++ b/maps/CeladonDeptStore2F.asm
  5243. @@ -82,7 +82,7 @@ CeladonDeptStore2F_MapEventHeader:
  5244.  
  5245.  .PersonEvents:
  5246.     db 4
  5247. -   person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1
  5248. -   person_event SPRITE_CLERK, 5, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1
  5249. -   person_event SPRITE_POKEFAN_M, 2, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1
  5250. -   person_event SPRITE_YOUNGSTER, 2, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1
  5251. +   person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1
  5252. +   person_event SPRITE_CLERK, 5, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1
  5253. +   person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1
  5254. +   person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1
  5255. diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
  5256. index c36b713..b4ec72c 100644
  5257. --- a/maps/CeladonDeptStore3F.asm
  5258. +++ b/maps/CeladonDeptStore3F.asm
  5259. @@ -107,8 +107,8 @@ CeladonDeptStore3F_MapEventHeader:
  5260.  
  5261.  .PersonEvents:
  5262.     db 5
  5263. -   person_event SPRITE_CLERK, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1
  5264. -   person_event SPRITE_YOUNGSTER, 4, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1
  5265. -   person_event SPRITE_GAMEBOY_KID, 1, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1
  5266. -   person_event SPRITE_GAMEBOY_KID, 1, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1
  5267. -   person_event SPRITE_SUPER_NERD, 4, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1
  5268. +   person_event SPRITE_CLERK, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1
  5269. +   person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1
  5270. +   person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1
  5271. +   person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1
  5272. +   person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1
  5273. diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
  5274. index 99741b4..6e9c213 100644
  5275. --- a/maps/CeladonDeptStore4F.asm
  5276. +++ b/maps/CeladonDeptStore4F.asm
  5277. @@ -65,6 +65,6 @@ CeladonDeptStore4F_MapEventHeader:
  5278.  
  5279.  .PersonEvents:
  5280.     db 3
  5281. -   person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1
  5282. -   person_event SPRITE_SUPER_NERD, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1
  5283. -   person_event SPRITE_YOUNGSTER, 2, 8, $7, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1
  5284. +   person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1
  5285. +   person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1
  5286. +   person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1
  5287. diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
  5288. index 94af06d..9eb5040 100644
  5289. --- a/maps/CeladonDeptStore5F.asm
  5290. +++ b/maps/CeladonDeptStore5F.asm
  5291. @@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEventHeader:
  5292.  
  5293.  .PersonEvents:
  5294.     db 5
  5295. -   person_event SPRITE_CLERK, 5, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1
  5296. -   person_event SPRITE_CLERK, 5, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1
  5297. -   person_event SPRITE_GENTLEMAN, 5, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1
  5298. -   person_event SPRITE_SAILOR, 4, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1
  5299. -   person_event SPRITE_TEACHER, 7, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1
  5300. +   person_event SPRITE_CLERK, 5, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1
  5301. +   person_event SPRITE_CLERK, 5, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1
  5302. +   person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1
  5303. +   person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1
  5304. +   person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1
  5305. diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
  5306. index 2eff882..cf623ee 100644
  5307. --- a/maps/CeladonDeptStore6F.asm
  5308. +++ b/maps/CeladonDeptStore6F.asm
  5309. @@ -168,5 +168,5 @@ CeladonDeptStore6F_MapEventHeader:
  5310.  
  5311.  .PersonEvents:
  5312.     db 2
  5313. -   person_event SPRITE_SUPER_NERD, 2, 9, $7, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1
  5314. -   person_event SPRITE_YOUNGSTER, 5, 12, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1
  5315. +   person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1
  5316. +   person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEFN_02, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1
  5317. diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
  5318. index 4f4746f..c10ee71 100644
  5319. --- a/maps/CeladonGameCorner.asm
  5320. +++ b/maps/CeladonGameCorner.asm
  5321. @@ -325,12 +325,12 @@ CeladonGameCorner_MapEventHeader:
  5322.  
  5323.  .PersonEvents:
  5324.     db 9
  5325. -   person_event SPRITE_CLERK, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1
  5326. -   person_event SPRITE_RECEPTIONIST, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1
  5327. -   person_event SPRITE_POKEFAN_M, 10, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1
  5328. -   person_event SPRITE_TEACHER, 7, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1
  5329. -   person_event SPRITE_FISHING_GURU, 7, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1
  5330. -   person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
  5331. -   person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
  5332. -   person_event SPRITE_GYM_GUY, 3, 11, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1
  5333. -   person_event SPRITE_GRAMPS, 8, 2, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1
  5334. +   person_event SPRITE_CLERK, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1
  5335. +   person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1
  5336. +   person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1
  5337. +   person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1
  5338. +   person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1
  5339. +   person_event SPRITE_FISHER, 10, 8, SPRITEMOVEFN_08, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
  5340. +   person_event SPRITE_FISHER, 10, 8, SPRITEMOVEFN_08, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
  5341. +   person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1
  5342. +   person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1
  5343. diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
  5344. index 83f92f2..2a50e27 100644
  5345. --- a/maps/CeladonGameCornerPrizeRoom.asm
  5346. +++ b/maps/CeladonGameCornerPrizeRoom.asm
  5347. @@ -284,5 +284,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
  5348.  
  5349.  .PersonEvents:
  5350.     db 2
  5351. -   person_event SPRITE_GENTLEMAN, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1
  5352. -   person_event SPRITE_PHARMACIST, 4, 4, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1
  5353. +   person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1
  5354. +   person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1
  5355. diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
  5356. index d9128f8..511a4e3 100644
  5357. --- a/maps/CeladonGym.asm
  5358. +++ b/maps/CeladonGym.asm
  5359. @@ -13,7 +13,7 @@ ErikaScript_0x72a6a:
  5360.     writetext UnknownText_0x72b28
  5361.     closetext
  5362.     loadmovesprites
  5363.     winlosstext UnknownText_0x72c3e, $0000
  5364.     loadtrainer ERIKA, 1
  5365.     startbattle
  5366.     returnafterbattle
  5367. @@ -42,7 +42,7 @@ UnknownScript_0x72aae:
  5368.     end
  5369.  
  5370.  TrainerLassMichelle:
  5371.     trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, $0000, LassMichelleScript
  5372.  
  5373.  LassMichelleScript:
  5374.     talkaftercancel
  5375. @@ -53,7 +53,7 @@ LassMichelleScript:
  5376.     end
  5377.  
  5378.  TrainerPicnickerTanya:
  5379.     trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, $0000, PicnickerTanyaScript
  5380.  
  5381.  PicnickerTanyaScript:
  5382.     talkaftercancel
  5383. @@ -64,7 +64,7 @@ PicnickerTanyaScript:
  5384.     end
  5385.  
  5386.  TrainerBeautyJulia:
  5387.     trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, $0000, BeautyJuliaScript
  5388.  
  5389.  BeautyJuliaScript:
  5390.     talkaftercancel
  5391. @@ -75,7 +75,7 @@ BeautyJuliaScript:
  5392.     end
  5393.  
  5394.  TrainerTwinsJoandzoe1:
  5395.     trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, $0000, TwinsJoandzoe1Script
  5396.  
  5397.  TwinsJoandzoe1Script:
  5398.     talkaftercancel
  5399. @@ -86,7 +86,7 @@ TwinsJoandzoe1Script:
  5400.     end
  5401.  
  5402.  TrainerTwinsJoandzoe2:
  5403.     trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, $0000, TwinsJoandzoe2Script
  5404.  
  5405.  TwinsJoandzoe2Script:
  5406.     talkaftercancel
  5407. @@ -278,9 +278,9 @@ CeladonGym_MapEventHeader:
  5408.  
  5409.  .PersonEvents:
  5410.     db 6
  5411. -   person_event SPRITE_ERIKA, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1
  5412. -   person_event SPRITE_LASS, 8, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1
  5413. -   person_event SPRITE_LASS, 8, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1
  5414. -   person_event SPRITE_BUENA, 5, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1
  5415. -   person_event SPRITE_TWIN, 10, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1
  5416. -   person_event SPRITE_TWIN, 10, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1
  5417. +   person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1
  5418. +   person_event SPRITE_LASS, 8, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1
  5419. +   person_event SPRITE_LASS, 8, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1
  5420. +   person_event SPRITE_BUENA, 5, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1
  5421. +   person_event SPRITE_TWIN, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1
  5422. +   person_event SPRITE_TWIN, 10, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1
  5423. diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
  5424. index 26a9a43..897b918 100644
  5425. --- a/maps/CeladonMansion1F.asm
  5426. +++ b/maps/CeladonMansion1F.asm
  5427. @@ -91,7 +91,7 @@ CeladonMansion1F_MapEventHeader:
  5428.  
  5429.  .PersonEvents:
  5430.     db 4
  5431. -   person_event SPRITE_GRANNY, 5, 1, $3, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1
  5432. -   person_event SPRITE_GROWLITHE, 6, 2, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1
  5433. -   person_event SPRITE_CLEFAIRY, 4, 3, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1
  5434. -   person_event SPRITE_GROWLITHE, 4, 4, $16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1
  5435. +   person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1
  5436. +   person_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1
  5437. +   person_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1
  5438. +   person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEFN_16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1
  5439. diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
  5440. index 5e12a63..77adaf9 100644
  5441. --- a/maps/CeladonMansion3F.asm
  5442. +++ b/maps/CeladonMansion3F.asm
  5443. @@ -206,7 +206,7 @@ CeladonMansion3F_MapEventHeader:
  5444.  
  5445.  .PersonEvents:
  5446.     db 4
  5447. -   person_event SPRITE_COOLTRAINER_M, 6, 3, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1
  5448. -   person_event SPRITE_GYM_GUY, 4, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1
  5449. -   person_event SPRITE_SUPER_NERD, 7, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1
  5450. -   person_event SPRITE_FISHER, 4, 0, $7, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1
  5451. +   person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1
  5452. +   person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1
  5453. +   person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1
  5454. +   person_event SPRITE_FISHER, 4, 0, SPRITEMOVEFN_07, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1
  5455. diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
  5456. index b2b4f2b..4e2493f 100644
  5457. --- a/maps/CeladonMansionRoof.asm
  5458. +++ b/maps/CeladonMansionRoof.asm
  5459. @@ -49,4 +49,4 @@ CeladonMansionRoof_MapEventHeader:
  5460.  
  5461.  .PersonEvents:
  5462.     db 1
  5463. -   person_event SPRITE_FISHER, 5, 7, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1
  5464. +   person_event SPRITE_FISHER, 5, 7, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1
  5465. diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
  5466. index cc89ba5..140e837 100644
  5467. --- a/maps/CeladonMansionRoofHouse.asm
  5468. +++ b/maps/CeladonMansionRoofHouse.asm
  5469. @@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader:
  5470.  
  5471.  .PersonEvents:
  5472.     db 1
  5473. -   person_event SPRITE_PHARMACIST, 2, 3, $6, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1
  5474. +   person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEFN_06, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1
  5475. diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm
  5476. index 8142d0d..52cb90e 100644
  5477. --- a/maps/CeladonPokeCenter1F.asm
  5478. +++ b/maps/CeladonPokeCenter1F.asm
  5479. @@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader:
  5480.  
  5481.  .PersonEvents:
  5482.     db 5
  5483. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1
  5484. -   person_event SPRITE_GENTLEMAN, 5, 1, $5, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1
  5485. -   person_event SPRITE_PHARMACIST, 3, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1
  5486. -   person_event SPRITE_COOLTRAINER_F, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1
  5487. -   person_event SPRITE_SUPER_NERD, 3, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH
  5488. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1
  5489. +   person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1
  5490. +   person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1
  5491. +   person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1
  5492. +   person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH
  5493. diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
  5494. index ce2c1eb..60596a2 100644
  5495. --- a/maps/CeruleanCity.asm
  5496. +++ b/maps/CeruleanCity.asm
  5497. @@ -299,9 +299,9 @@ CeruleanCity_MapEventHeader:
  5498.  
  5499.  .PersonEvents:
  5500.     db 6
  5501. -   person_event SPRITE_COOLTRAINER_M, 23, 15, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1
  5502. -   person_event SPRITE_SUPER_NERD, 15, 23, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1
  5503. -   person_event SPRITE_SLOWPOKE, 24, 20, $1, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1
  5504. -   person_event SPRITE_COOLTRAINER_F, 24, 21, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1
  5505. -   person_event SPRITE_FISHER, 26, 30, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1
  5506. -   person_event SPRITE_YOUNGSTER, 12, 6, $3, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1
  5507. +   person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1
  5508. +   person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1
  5509. +   person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1
  5510. +   person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1
  5511. +   person_event SPRITE_FISHER, 26, 30, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1
  5512. +   person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEFN_03, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1
  5513. diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
  5514. index 6907f58..c64410c 100644
  5515. --- a/maps/CeruleanGym.asm
  5516. +++ b/maps/CeruleanGym.asm
  5517. @@ -3,8 +3,8 @@ CeruleanGym_MapScriptHeader:
  5518.     db 2
  5519.  
  5520.     ; triggers
  5521.     dw UnknownScript_0x1883d9, $0000
  5522.     dw UnknownScript_0x1883da, $0000
  5523.  
  5524.  .MapCallbacks:
  5525.     db 0
  5526. @@ -60,7 +60,7 @@ MistyScript_0x188432:
  5527.     writetext UnknownText_0x188674
  5528.     closetext
  5529.     loadmovesprites
  5530.     winlosstext UnknownText_0x18870c, $0000
  5531.     loadtrainer MISTY, 1
  5532.     startbattle
  5533.     returnafterbattle
  5534. @@ -80,7 +80,7 @@ MistyScript_0x188432:
  5535.     end
  5536.  
  5537.  TrainerSwimmerfDiana:
  5538.     trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, $0000, SwimmerfDianaScript
  5539.  
  5540.  SwimmerfDianaScript:
  5541.     talkaftercancel
  5542. @@ -91,7 +91,7 @@ SwimmerfDianaScript:
  5543.     end
  5544.  
  5545.  TrainerSwimmerfBriana:
  5546.     trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, $0000, SwimmerfBrianaScript
  5547.  
  5548.  SwimmerfBrianaScript:
  5549.     talkaftercancel
  5550. @@ -102,7 +102,7 @@ SwimmerfBrianaScript:
  5551.     end
  5552.  
  5553.  TrainerSwimmermParker:
  5554.     trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, $0000, SwimmermParkerScript
  5555.  
  5556.  SwimmermParkerScript:
  5557.     talkaftercancel
  5558. @@ -377,9 +377,9 @@ CeruleanGym_MapEventHeader:
  5559.  
  5560.  .PersonEvents:
  5561.     db 6
  5562. -   person_event SPRITE_ROCKET, 10, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
  5563. -   person_event SPRITE_MISTY, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
  5564. -   person_event SPRITE_SWIMMER_GIRL, 6, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
  5565. -   person_event SPRITE_SWIMMER_GIRL, 9, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
  5566. -   person_event SPRITE_SWIMMER_GUY, 9, 8, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
  5567. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
  5568. +   person_event SPRITE_ROCKET, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
  5569. +   person_event SPRITE_MISTY, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
  5570. +   person_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
  5571. +   person_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
  5572. +   person_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
  5573. +   person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
  5574. diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
  5575. index 6697c42..1df647a 100644
  5576. --- a/maps/CeruleanGymBadgeSpeechHouse.asm
  5577. +++ b/maps/CeruleanGymBadgeSpeechHouse.asm
  5578. @@ -30,4 +30,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
  5579.  
  5580.  .PersonEvents:
  5581.     db 1
  5582. -   person_event SPRITE_POKEFAN_M, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x188002, -1
  5583. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x188002, -1
  5584. diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
  5585. index e1824e5..05b6e3d 100644
  5586. --- a/maps/CeruleanMart.asm
  5587. +++ b/maps/CeruleanMart.asm
  5588. @@ -57,6 +57,6 @@ CeruleanMart_MapEventHeader:
  5589.  
  5590.  .PersonEvents:
  5591.     db 3
  5592. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x188ac0, -1
  5593. -   person_event SPRITE_COOLTRAINER_M, 6, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x188ac7, -1
  5594. -   person_event SPRITE_COOLTRAINER_F, 2, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x188aca, -1
  5595. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x188ac0, -1
  5596. +   person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x188ac7, -1
  5597. +   person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x188aca, -1
  5598. diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm
  5599. index ea636a3..bace05a 100644
  5600. --- a/maps/CeruleanPokeCenter1F.asm
  5601. +++ b/maps/CeruleanPokeCenter1F.asm
  5602. @@ -75,6 +75,6 @@ CeruleanPokeCenter1F_MapEventHeader:
  5603.  
  5604.  .PersonEvents:
  5605.     db 3
  5606. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18820f, -1
  5607. -   person_event SPRITE_SUPER_NERD, 4, 8, $5, 0, 1, -1, -1, 0, 0, 0, SuperNerdScript_0x188212, -1
  5608. -   person_event SPRITE_GYM_GUY, 5, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x18821e, -1
  5609. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18820f, -1
  5610. +   person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SuperNerdScript_0x188212, -1
  5611. +   person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x18821e, -1
  5612. diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
  5613. index a79a679..fff8867 100644
  5614. --- a/maps/CeruleanPoliceStation.asm
  5615. +++ b/maps/CeruleanPoliceStation.asm
  5616. @@ -55,6 +55,6 @@ CeruleanPoliceStation_MapEventHeader:
  5617.  
  5618.  .PersonEvents:
  5619.     db 3
  5620. -   person_event SPRITE_FISHING_GURU, 1, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x18804a, -1
  5621. -   person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x18804d, -1
  5622. -   person_event SPRITE_DIGLETT, 5, 3, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, DiglettScript_0x188050, -1
  5623. +   person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x18804a, -1
  5624. +   person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x18804d, -1
  5625. +   person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, DiglettScript_0x188050, -1
  5626. diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
  5627. index aa063b1..f938f95 100644
  5628. --- a/maps/CeruleanTradeSpeechHouse.asm
  5629. +++ b/maps/CeruleanTradeSpeechHouse.asm
  5630. @@ -64,7 +64,7 @@ CeruleanTradeSpeechHouse_MapEventHeader:
  5631.  
  5632.  .PersonEvents:
  5633.     db 4
  5634. -   person_event SPRITE_GRANNY, 4, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x188133, -1
  5635. -   person_event SPRITE_GRAMPS, 2, 1, $2, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x188136, -1
  5636. -   person_event SPRITE_RHYDON, 2, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, RhydonScript_0x188139, -1
  5637. -   person_event SPRITE_ZUBAT, 6, 5, $16, 0, 0, -1, -1, 0, 0, 0, ZubatScript_0x188143, -1
  5638. +   person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x188133, -1
  5639. +   person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEFN_02, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x188136, -1
  5640. +   person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, RhydonScript_0x188139, -1
  5641. +   person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ZubatScript_0x188143, -1
  5642. diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
  5643. index 7cd0bbc..f2c58a9 100644
  5644. --- a/maps/CharcoalKiln.asm
  5645. +++ b/maps/CharcoalKiln.asm
  5646. @@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader:
  5647.  
  5648.  .PersonEvents:
  5649.     db 3
  5650. -   person_event SPRITE_BLACK_BELT, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
  5651. -   person_event SPRITE_YOUNGSTER, 3, 5, $2, 1, 1, -1, -1, 0, 0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
  5652. -   person_event SPRITE_MOLTRES, 6, 5, $16, 2, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
  5653. +   person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
  5654. +   person_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
  5655. +   person_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEFN_16, 2, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
  5656. diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
  5657. index f90c6f4..9840e40 100644
  5658. --- a/maps/CherrygroveCity.asm
  5659. +++ b/maps/CherrygroveCity.asm
  5660. @@ -3,8 +3,8 @@ CherrygroveCity_MapScriptHeader:
  5661.     db 2
  5662.  
  5663.     ; triggers
  5664.     dw .Trigger1, $0000
  5665.     dw .Trigger2, $0000
  5666.  
  5667.  .MapCallbacks:
  5668.     db 1
  5669. @@ -570,8 +570,8 @@ CherrygroveCity_MapEventHeader:
  5670.  
  5671.  .PersonEvents:
  5672.     db 5
  5673. -   person_event SPRITE_GRAMPS, 6, 32, $6, 0, 0, -1, -1, 0, 0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
  5674. -   person_event SPRITE_SILVER, 6, 39, $3, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
  5675. -   person_event SPRITE_TEACHER, 12, 27, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x19c146, -1
  5676. -   person_event SPRITE_YOUNGSTER, 7, 23, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19c15a, -1
  5677. -   person_event SPRITE_FISHER, 12, 7, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MysticWaterGuy, -1
  5678. +   person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
  5679. +   person_event SPRITE_SILVER, 6, 39, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
  5680. +   person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x19c146, -1
  5681. +   person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19c15a, -1
  5682. +   person_event SPRITE_FISHER, 12, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MysticWaterGuy, -1
  5683. diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
  5684. index 028842e..9559057 100644
  5685. --- a/maps/CherrygroveEvolutionSpeechHouse.asm
  5686. +++ b/maps/CherrygroveEvolutionSpeechHouse.asm
  5687. @@ -56,5 +56,5 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader:
  5688.  
  5689.  .PersonEvents:
  5690.     db 2
  5691. -   person_event SPRITE_LASS, 5, 3, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x196cb9, -1
  5692. -   person_event SPRITE_YOUNGSTER, 5, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196cb2, -1
  5693. +   person_event SPRITE_LASS, 5, 3, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x196cb9, -1
  5694. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196cb2, -1
  5695. diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
  5696. index 852d2c3..73906b1 100644
  5697. --- a/maps/CherrygroveGymSpeechHouse.asm
  5698. +++ b/maps/CherrygroveGymSpeechHouse.asm
  5699. @@ -59,5 +59,5 @@ CherrygroveGymSpeechHouse_MapEventHeader:
  5700.  
  5701.  .PersonEvents:
  5702.     db 2
  5703. -   person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x196ae1, -1
  5704. -   person_event SPRITE_BUG_CATCHER, 5, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x196ae4, -1
  5705. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x196ae1, -1
  5706. +   person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x196ae4, -1
  5707. diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
  5708. index 7c35c3b..2690feb 100644
  5709. --- a/maps/CherrygroveMart.asm
  5710. +++ b/maps/CherrygroveMart.asm
  5711. @@ -9,7 +9,7 @@ ClerkScript_0x19680a:
  5712.     loadfont
  5713.     checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
  5714.     iftrue UnknownScript_0x196817
  5715.     pokemart $0, $0000
  5716.     loadmovesprites
  5717.     end
  5718.  
  5719. @@ -83,6 +83,6 @@ CherrygroveMart_MapEventHeader:
  5720.  
  5721.  .PersonEvents:
  5722.     db 3
  5723. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x19680a, -1
  5724. -   person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x19681d, -1
  5725. -   person_event SPRITE_YOUNGSTER, 5, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196831, -1
  5726. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x19680a, -1
  5727. +   person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x19681d, -1
  5728. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196831, -1
  5729. diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm
  5730. index 4b250f2..fb1a5f4 100644
  5731. --- a/maps/CherrygrovePokeCenter1F.asm
  5732. +++ b/maps/CherrygrovePokeCenter1F.asm
  5733. @@ -80,7 +80,7 @@ CherrygrovePokeCenter1F_MapEventHeader:
  5734.  
  5735.  .PersonEvents:
  5736.     db 4
  5737. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19696d, -1
  5738. -   person_event SPRITE_FISHER, 3, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x196970, -1
  5739. -   person_event SPRITE_GENTLEMAN, 6, 8, $7, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196973, -1
  5740. -   person_event SPRITE_TEACHER, 6, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x196976, -1
  5741. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19696d, -1
  5742. +   person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x196970, -1
  5743. +   person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196973, -1
  5744. +   person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x196976, -1
  5745. diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
  5746. index 1efd4ff..bd8c682 100644
  5747. --- a/maps/CianwoodCity.asm
  5748. +++ b/maps/CianwoodCity.asm
  5749. @@ -3,8 +3,8 @@ CianwoodCity_MapScriptHeader:
  5750.     db 2
  5751.  
  5752.     ; triggers
  5753.     dw .Trigger1, $0000
  5754.     dw .Trigger2, $0000
  5755.  
  5756.  .MapCallbacks:
  5757.     db 1
  5758. @@ -52,7 +52,7 @@ UnknownScript_0x1a001e:
  5759.     writetext UnknownText_0x1a0433
  5760.     closetext
  5761.     loadmovesprites
  5762.     winlosstext UnknownText_0x1a05a1, $0000
  5763.     setlasttalked $c
  5764.     loadtrainer MYSTICALMAN, EUSINE
  5765.     startbattle
  5766. @@ -401,15 +401,15 @@ CianwoodCity_MapEventHeader:
  5767.  
  5768.  .PersonEvents:
  5769.     db 12
  5770. -   person_event SPRITE_STANDING_YOUNGSTER, 37, 21, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, StandingYoungsterScript_0x1a00b3, -1
  5771. -   person_event SPRITE_POKEFAN_M, 33, 17, $5, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x1a00b6, -1
  5772. -   person_event SPRITE_LASS, 42, 14, $4, 2, 0, -1, -1, 0, 0, 0, LassScript_0x1a00b9, -1
  5773. -   person_event SPRITE_ROCK, 16, 8, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5774. -   person_event SPRITE_ROCK, 17, 9, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5775. -   person_event SPRITE_ROCK, 25, 4, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5776. -   person_event SPRITE_ROCK, 29, 5, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5777. -   person_event SPRITE_ROCK, 27, 10, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5778. -   person_event SPRITE_ROCK, 19, 4, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5779. -   person_event SPRITE_POKEFAN_F, 46, 10, $5, 0, 1, -1, -1, 0, 0, 0, PokefanFScript_0x1a0084, -1
  5780. -   person_event SPRITE_SUPER_NERD, 21, 11, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
  5781. -   person_event SPRITE_SUICUNE, 14, 10, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
  5782. +   person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, StandingYoungsterScript_0x1a00b3, -1
  5783. +   person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x1a00b6, -1
  5784. +   person_event SPRITE_LASS, 42, 14, SPRITEMOVEFN_04, 2, 0, -1, -1, 0, 0, 0, LassScript_0x1a00b9, -1
  5785. +   person_event SPRITE_ROCK, 16, 8, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5786. +   person_event SPRITE_ROCK, 17, 9, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5787. +   person_event SPRITE_ROCK, 25, 4, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5788. +   person_event SPRITE_ROCK, 29, 5, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5789. +   person_event SPRITE_ROCK, 27, 10, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5790. +   person_event SPRITE_ROCK, 19, 4, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5791. +   person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, PokefanFScript_0x1a0084, -1
  5792. +   person_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
  5793. +   person_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
  5794. diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm
  5795. index 773c823..977bea2 100644
  5796. --- a/maps/CianwoodCityPhotoStudio.asm
  5797. +++ b/maps/CianwoodCityPhotoStudio.asm
  5798. @@ -62,4 +62,4 @@ CianwoodCityPhotoStudio_MapEventHeader:
  5799.  
  5800.  .PersonEvents:
  5801.     db 1
  5802. -   person_event SPRITE_FISHING_GURU, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x9e0e0, -1
  5803. +   person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x9e0e0, -1
  5804. diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
  5805. index 4f66a26..f4350cd 100644
  5806. --- a/maps/CianwoodGym.asm
  5807. +++ b/maps/CianwoodGym.asm
  5808. @@ -28,7 +28,7 @@ ChuckScript_0x9d60f:
  5809.     writetext UnknownText_0x9d78a
  5810.     closetext
  5811.     loadmovesprites
  5812.     winlosstext UnknownText_0x9d7f6, $0000
  5813.     loadtrainer CHUCK, 1
  5814.     startbattle
  5815.     returnafterbattle
  5816. @@ -76,7 +76,7 @@ CianwoodGymTriggerRockets:
  5817.     jumpstd radiotowerrockets
  5818.  
  5819.  TrainerBlackbeltYoshi:
  5820.     trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, $0000, BlackbeltYoshiScript
  5821.  
  5822.  BlackbeltYoshiScript:
  5823.     talkaftercancel
  5824. @@ -87,7 +87,7 @@ BlackbeltYoshiScript:
  5825.     end
  5826.  
  5827.  TrainerBlackbeltLao:
  5828.     trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, $0000, BlackbeltLaoScript
  5829.  
  5830.  BlackbeltLaoScript:
  5831.     talkaftercancel
  5832. @@ -98,7 +98,7 @@ BlackbeltLaoScript:
  5833.     end
  5834.  
  5835.  TrainerBlackbeltNob:
  5836.     trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, $0000, BlackbeltNobScript
  5837.  
  5838.  BlackbeltNobScript:
  5839.     talkaftercancel
  5840. @@ -109,7 +109,7 @@ BlackbeltNobScript:
  5841.     end
  5842.  
  5843.  TrainerBlackbeltLung:
  5844.     trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, $0000, BlackbeltLungScript
  5845.  
  5846.  BlackbeltLungScript:
  5847.     talkaftercancel
  5848. @@ -313,12 +313,12 @@ CianwoodGym_MapEventHeader:
  5849.  
  5850.  .PersonEvents:
  5851.     db 9
  5852. -   person_event SPRITE_CHUCK, 1, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ChuckScript_0x9d60f, -1
  5853. -   person_event SPRITE_BLACK_BELT, 12, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltYoshi, -1
  5854. -   person_event SPRITE_BLACK_BELT, 12, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltLao, -1
  5855. -   person_event SPRITE_BLACK_BELT, 9, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltNob, -1
  5856. -   person_event SPRITE_BLACK_BELT, 5, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBlackbeltLung, -1
  5857. -   person_event SPRITE_BOULDER, 1, 5, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5858. -   person_event SPRITE_BOULDER, 7, 3, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5859. -   person_event SPRITE_BOULDER, 7, 4, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5860. -   person_event SPRITE_BOULDER, 7, 5, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5861. +   person_event SPRITE_CHUCK, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ChuckScript_0x9d60f, -1
  5862. +   person_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltYoshi, -1
  5863. +   person_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltLao, -1
  5864. +   person_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltNob, -1
  5865. +   person_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBlackbeltLung, -1
  5866. +   person_event SPRITE_BOULDER, 1, 5, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5867. +   person_event SPRITE_BOULDER, 7, 3, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5868. +   person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5869. +   person_event SPRITE_BOULDER, 7, 5, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5870. diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
  5871. index ee69203..0befc7e 100644
  5872. --- a/maps/CianwoodLugiaSpeechHouse.asm
  5873. +++ b/maps/CianwoodLugiaSpeechHouse.asm
  5874. @@ -75,6 +75,6 @@ CianwoodLugiaSpeechHouse_MapEventHeader:
  5875.  
  5876.  .PersonEvents:
  5877.     db 3
  5878. -   person_event SPRITE_TEACHER, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9e1b0, -1
  5879. -   person_event SPRITE_LASS, 5, 6, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9e1b3, -1
  5880. -   person_event SPRITE_TWIN, 2, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TwinScript_0x9e1b6, -1
  5881. +   person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9e1b0, -1
  5882. +   person_event SPRITE_LASS, 5, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9e1b3, -1
  5883. +   person_event SPRITE_TWIN, 2, 0, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TwinScript_0x9e1b6, -1
  5884. diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
  5885. index 8d09c50..a9dedd4 100644
  5886. --- a/maps/CianwoodPharmacy.asm
  5887. +++ b/maps/CianwoodPharmacy.asm
  5888. @@ -3,7 +3,7 @@ CianwoodPharmacy_MapScriptHeader:
  5889.     db 1
  5890.  
  5891.     ; triggers
  5892.     dw CianwoodPharmacyTrigger, $0000
  5893.  
  5894.  .MapCallbacks:
  5895.     db 0
  5896. @@ -90,4 +90,4 @@ CianwoodPharmacy_MapEventHeader:
  5897.  
  5898.  .PersonEvents:
  5899.     db 1
  5900. -   person_event SPRITE_PHARMACIST, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodPharmacist, -1
  5901. +   person_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodPharmacist, -1
  5902. diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm
  5903. index e2c4dce..e21d218 100644
  5904. --- a/maps/CianwoodPokeCenter1F.asm
  5905. +++ b/maps/CianwoodPokeCenter1F.asm
  5906. @@ -143,7 +143,7 @@ CianwoodPokeCenter1F_MapEventHeader:
  5907.  
  5908.  .PersonEvents:
  5909.     db 4
  5910. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9dbcf, -1
  5911. -   person_event SPRITE_LASS, 5, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9dbd2, -1
  5912. -   person_event SPRITE_GYM_GUY, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodGymGuyScript, -1
  5913. -   person_event SPRITE_SUPER_NERD, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x9dbea, -1
  5914. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9dbcf, -1
  5915. +   person_event SPRITE_LASS, 5, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9dbd2, -1
  5916. +   person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodGymGuyScript, -1
  5917. +   person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x9dbea, -1
  5918. diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
  5919. index 871be40..8346adc 100644
  5920. --- a/maps/CinnabarIsland.asm
  5921. +++ b/maps/CinnabarIsland.asm
  5922. @@ -146,4 +146,4 @@ CinnabarIsland_MapEventHeader:
  5923.  
  5924.  .PersonEvents:
  5925.     db 1
  5926. -   person_event SPRITE_BLUE, 6, 9, $3, 0, 0, -1, -1, 0, 0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
  5927. +   person_event SPRITE_BLUE, 6, 9, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
  5928. diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm
  5929. index 14f300c..5d9fd84 100644
  5930. --- a/maps/CinnabarPokeCenter1F.asm
  5931. +++ b/maps/CinnabarPokeCenter1F.asm
  5932. @@ -47,6 +47,6 @@ CinnabarPokeCenter1F_MapEventHeader:
  5933.  
  5934.  .PersonEvents:
  5935.     db 3
  5936. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ab32c, -1
  5937. -   person_event SPRITE_COOLTRAINER_F, 6, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1ab32f, -1
  5938. -   person_event SPRITE_FISHER, 4, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ab332, -1
  5939. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ab32c, -1
  5940. +   person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1ab32f, -1
  5941. +   person_event SPRITE_FISHER, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ab332, -1
  5942. diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
  5943. index c77512f..80028a7 100644
  5944. --- a/maps/Colosseum.asm
  5945. +++ b/maps/Colosseum.asm
  5946. @@ -3,9 +3,9 @@ Colosseum_MapScriptHeader:
  5947.     db 3
  5948.  
  5949.     ; triggers
  5950.     dw .Trigger1, $0000
  5951.     dw .Trigger2, $0000
  5952.     dw .Trigger3, $0000
  5953.  
  5954.  .MapCallbacks:
  5955.     db 2
  5956. @@ -83,5 +83,5 @@ Colosseum_MapEventHeader:
  5957.  
  5958.  .PersonEvents:
  5959.     db 2
  5960. -   person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
  5961. -   person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
  5962. +   person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
  5963. +   person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
  5964. diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
  5965. index 4eb7919..f8aa486 100644
  5966. --- a/maps/CopycatsHouse1F.asm
  5967. +++ b/maps/CopycatsHouse1F.asm
  5968. @@ -85,6 +85,6 @@ CopycatsHouse1F_MapEventHeader:
  5969.  
  5970.  .PersonEvents:
  5971.     db 3
  5972. -   person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x18ad13, -1
  5973. -   person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PokefanFScript_0x18ad16, -1
  5974. -   person_event SPRITE_CLEFAIRY, 6, 6, $16, 0, 0, -1, -1, 0, 0, 0, ClefairyScript_0x18ad2a, -1
  5975. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x18ad13, -1
  5976. +   person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PokefanFScript_0x18ad16, -1
  5977. +   person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ClefairyScript_0x18ad2a, -1
  5978. diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
  5979. index b4e608c..394f201 100644
  5980. --- a/maps/CopycatsHouse2F.asm
  5981. +++ b/maps/CopycatsHouse2F.asm
  5982. @@ -373,9 +373,9 @@ CopycatsHouse2F_MapEventHeader:
  5983.  
  5984.  .PersonEvents:
  5985.     db 6
  5986. -   person_event SPRITE_COPYCAT, 3, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Copycat, EVENT_COPYCAT_1
  5987. -   person_event SPRITE_MOLTRES, 4, 6, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CopycatsDodrio, -1
  5988. -   person_event SPRITE_FAIRY, 1, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
  5989. -   person_event SPRITE_MONSTER, 1, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CopycatsHouse2FDoll, -1
  5990. -   person_event SPRITE_BIRD, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopycatsHouse2FDoll, -1
  5991. -   person_event SPRITE_COPYCAT, 3, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, Copycat, EVENT_COPYCAT_2
  5992. +   person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Copycat, EVENT_COPYCAT_1
  5993. +   person_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CopycatsDodrio, -1
  5994. +   person_event SPRITE_FAIRY, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
  5995. +   person_event SPRITE_MONSTER, 1, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CopycatsHouse2FDoll, -1
  5996. +   person_event SPRITE_BIRD, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopycatsHouse2FDoll, -1
  5997. +   person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, Copycat, EVENT_COPYCAT_2
  5998. diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
  5999. index 4824e67..54ef492 100644
  6000. --- a/maps/DanceTheatre.asm
  6001. +++ b/maps/DanceTheatre.asm
  6002. @@ -6,7 +6,7 @@ DanceTheatre_MapScriptHeader:
  6003.     db 0
  6004.  
  6005.  TrainerKimono_girlNaoko2:
  6006.     trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, $0000, Kimono_girlNaoko2Script
  6007.  
  6008.  Kimono_girlNaoko2Script:
  6009.     talkaftercancel
  6010. @@ -17,7 +17,7 @@ Kimono_girlNaoko2Script:
  6011.     end
  6012.  
  6013.  TrainerKimono_girlSayo:
  6014.     trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, $0000, Kimono_girlSayoScript
  6015.  
  6016.  Kimono_girlSayoScript:
  6017.     talkaftercancel
  6018. @@ -28,7 +28,7 @@ Kimono_girlSayoScript:
  6019.     end
  6020.  
  6021.  TrainerKimono_girlZuki:
  6022.     trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, $0000, Kimono_girlZukiScript
  6023.  
  6024.  Kimono_girlZukiScript:
  6025.     talkaftercancel
  6026. @@ -39,7 +39,7 @@ Kimono_girlZukiScript:
  6027.     end
  6028.  
  6029.  TrainerKimono_girlKuni:
  6030.     trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, $0000, Kimono_girlKuniScript
  6031.  
  6032.  Kimono_girlKuniScript:
  6033.     talkaftercancel
  6034. @@ -50,7 +50,7 @@ Kimono_girlKuniScript:
  6035.     end
  6036.  
  6037.  TrainerKimono_girlMiki:
  6038.     trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, $0000, Kimono_girlMikiScript
  6039.  
  6040.  Kimono_girlMikiScript:
  6041.     talkaftercancel
  6042. @@ -345,12 +345,12 @@ DanceTheatre_MapEventHeader:
  6043.  
  6044.  .PersonEvents:
  6045.     db 9
  6046. -   person_event SPRITE_KIMONO_GIRL, 2, 0, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlNaoko2, -1
  6047. -   person_event SPRITE_KIMONO_GIRL, 1, 2, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlSayo, -1
  6048. -   person_event SPRITE_KIMONO_GIRL, 2, 6, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerKimono_girlZuki, -1
  6049. -   person_event SPRITE_KIMONO_GIRL, 1, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlKuni, -1
  6050. -   person_event SPRITE_KIMONO_GIRL, 2, 11, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlMiki, -1
  6051. -   person_event SPRITE_GENTLEMAN, 10, 7, $7, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x994c6, -1
  6052. -   person_event SPRITE_RHYDON, 8, 6, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RhydonScript_0x9951b, -1
  6053. -   person_event SPRITE_COOLTRAINER_M, 10, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x99525, -1
  6054. -   person_event SPRITE_GRANNY, 6, 3, $7, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99528, -1
  6055. +   person_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlNaoko2, -1
  6056. +   person_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlSayo, -1
  6057. +   person_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerKimono_girlZuki, -1
  6058. +   person_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlKuni, -1
  6059. +   person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlMiki, -1
  6060. +   person_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x994c6, -1
  6061. +   person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RhydonScript_0x9951b, -1
  6062. +   person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x99525, -1
  6063. +   person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99528, -1
  6064. diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
  6065. index 0fdc70f..09ff0b2 100644
  6066. --- a/maps/DarkCaveBlackthornEntrance.asm
  6067. +++ b/maps/DarkCaveBlackthornEntrance.asm
  6068. @@ -73,6 +73,6 @@ DarkCaveBlackthornEntrance_MapEventHeader:
  6069.  
  6070.  .PersonEvents:
  6071.     db 3
  6072. -   person_event SPRITE_PHARMACIST, 3, 7, $3, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x18c720, -1
  6073. -   person_event SPRITE_POKE_BALL, 24, 21, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
  6074. -   person_event SPRITE_POKE_BALL, 22, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
  6075. +   person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x18c720, -1
  6076. +   person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
  6077. +   person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
  6078. diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
  6079. index 9807cce..6fd85b2 100644
  6080. --- a/maps/DarkCaveVioletEntrance.asm
  6081. +++ b/maps/DarkCaveVioletEntrance.asm
  6082. @@ -43,11 +43,11 @@ DarkCaveVioletEntrance_MapEventHeader:
  6083.  
  6084.  .PersonEvents:
  6085.     db 8
  6086. -   person_event SPRITE_POKE_BALL, 8, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
  6087. -   person_event SPRITE_ROCK, 14, 16, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  6088. -   person_event SPRITE_ROCK, 6, 27, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  6089. -   person_event SPRITE_ROCK, 14, 7, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  6090. -   person_event SPRITE_ROCK, 31, 36, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  6091. -   person_event SPRITE_POKE_BALL, 22, 36, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
  6092. -   person_event SPRITE_POKE_BALL, 9, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
  6093. -   person_event SPRITE_POKE_BALL, 28, 30, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
  6094. +   person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
  6095. +   person_event SPRITE_ROCK, 14, 16, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  6096. +   person_event SPRITE_ROCK, 6, 27, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  6097. +   person_event SPRITE_ROCK, 14, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  6098. +   person_event SPRITE_ROCK, 31, 36, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  6099. +   person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
  6100. +   person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
  6101. +   person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
  6102. diff --git a/maps/DayCare.asm b/maps/DayCare.asm
  6103. index 1415c73..0af93ee 100644
  6104. --- a/maps/DayCare.asm
  6105. +++ b/maps/DayCare.asm
  6106. @@ -175,5 +175,5 @@ DayCare_MapEventHeader:
  6107.  
  6108.  .PersonEvents:
  6109.     db 2
  6110. -   person_event SPRITE_GRAMPS, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE
  6111. -   person_event SPRITE_GRANNY, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrannyScript_0x62fc3, -1
  6112. +   person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE
  6113. +   person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrannyScript_0x62fc3, -1
  6114. diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
  6115. index 67d6646..b7d1e00 100644
  6116. --- a/maps/DiglettsCave.asm
  6117. +++ b/maps/DiglettsCave.asm
  6118. @@ -42,4 +42,4 @@ DiglettsCave_MapEventHeader:
  6119.  
  6120.  .PersonEvents:
  6121.     db 1
  6122. -   person_event SPRITE_POKEFAN_M, 31, 3, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x74002, -1
  6123. +   person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x74002, -1
  6124. diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
  6125. index 199b43c..18961a5 100644
  6126. --- a/maps/DragonShrine.asm
  6127. +++ b/maps/DragonShrine.asm
  6128. @@ -3,8 +3,8 @@ DragonShrine_MapScriptHeader:
  6129.     db 2
  6130.  
  6131.     ; triggers
  6132.     dw .Trigger1, $0000
  6133.     dw .Trigger2, $0000
  6134.  
  6135.  .MapCallbacks:
  6136.     db 0
  6137. @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader:
  6138.  
  6139.  .PersonEvents:
  6140.     db 4
  6141. -   person_event SPRITE_ELDER, 1, 5, $6, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
  6142. -   person_event SPRITE_ELDER, 4, 2, $9, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
  6143. -   person_event SPRITE_ELDER, 4, 7, $8, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
  6144. -   person_event SPRITE_CLAIR, 8, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
  6145. +   person_event SPRITE_ELDER, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
  6146. +   person_event SPRITE_ELDER, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
  6147. +   person_event SPRITE_ELDER, 4, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
  6148. +   person_event SPRITE_CLAIR, 8, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
  6149. diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
  6150. index baaa078..b3e2e25 100644
  6151. --- a/maps/DragonsDenB1F.asm
  6152. +++ b/maps/DragonsDenB1F.asm
  6153. @@ -3,8 +3,8 @@ DragonsDenB1F_MapScriptHeader:
  6154.     db 2
  6155.  
  6156.     ; triggers
  6157.     dw UnknownScript_0x18c89d, $0000
  6158.     dw UnknownScript_0x18c89e, $0000
  6159.  
  6160.  .MapCallbacks:
  6161.     db 1
  6162. @@ -78,7 +78,7 @@ UnknownScript_0x18c8f9:
  6163.     end
  6164.  
  6165.  TrainerCooltrainermDarin:
  6166.     trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, $0000, CooltrainermDarinScript
  6167.  
  6168.  CooltrainermDarinScript:
  6169.     talkaftercancel
  6170. @@ -89,7 +89,7 @@ CooltrainermDarinScript:
  6171.     end
  6172.  
  6173.  TrainerCooltrainerfCara:
  6174.     trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, $0000, CooltrainerfCaraScript
  6175.  
  6176.  CooltrainerfCaraScript:
  6177.     talkaftercancel
  6178. @@ -100,7 +100,7 @@ CooltrainerfCaraScript:
  6179.     end
  6180.  
  6181.  TrainerTwinsLeaandpia1:
  6182.     trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, $0000, TwinsLeaandpia1Script
  6183.  
  6184.  TwinsLeaandpia1Script:
  6185.     talkaftercancel
  6186. @@ -111,7 +111,7 @@ TwinsLeaandpia1Script:
  6187.     end
  6188.  
  6189.  TrainerTwinsLeaandpia2:
  6190.     trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, $0000, TwinsLeaandpia2Script
  6191.  
  6192.  TwinsLeaandpia2Script:
  6193.     talkaftercancel
  6194. @@ -419,12 +419,12 @@ DragonsDenB1F_MapEventHeader:
  6195.  
  6196.  .PersonEvents:
  6197.     db 9
  6198. -   person_event SPRITE_POKE_BALL, 16, 35, $1, 0, 0, -1, -1, 0, 0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
  6199. -   person_event SPRITE_CLAIR, 30, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
  6200. -   person_event SPRITE_SILVER, 23, 20, $2, 2, 2, -1, -1, 0, 0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
  6201. -   person_event SPRITE_COOLTRAINER_M, 8, 20, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermDarin, -1
  6202. -   person_event SPRITE_COOLTRAINER_F, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfCara, -1
  6203. -   person_event SPRITE_TWIN, 17, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia1, -1
  6204. -   person_event SPRITE_TWIN, 18, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia2, -1
  6205. -   person_event SPRITE_POKE_BALL, 4, 30, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM
  6206. -   person_event SPRITE_POKE_BALL, 20, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
  6207. +   person_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
  6208. +   person_event SPRITE_CLAIR, 30, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
  6209. +   person_event SPRITE_SILVER, 23, 20, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
  6210. +   person_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermDarin, -1
  6211. +   person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfCara, -1
  6212. +   person_event SPRITE_TWIN, 17, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia1, -1
  6213. +   person_event SPRITE_TWIN, 18, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia2, -1
  6214. +   person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM
  6215. +   person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
  6216. diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
  6217. index 4c5aeef..289046d 100644
  6218. --- a/maps/EarlsPokemonAcademy.asm
  6219. +++ b/maps/EarlsPokemonAcademy.asm
  6220. @@ -106,7 +106,7 @@ AcademyBlackboard:
  6221.     dn 3, 2 ; rows, columns
  6222.     db 5 ; spacing
  6223.     dbw BANK(.Text), .Text
  6224.     dbw $1a, $0000
  6225.  
  6226.  .Text
  6227.     db "PSN@"
  6228. @@ -425,9 +425,9 @@ EarlsPokemonAcademy_MapEventHeader:
  6229.  
  6230.  .PersonEvents:
  6231.     db 6
  6232. -   person_event SPRITE_FISHER, 2, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
  6233. -   person_event SPRITE_YOUNGSTER, 5, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x68a83, -1
  6234. -   person_event SPRITE_GAMEBOY_KID, 11, 3, $6, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x68a86, -1
  6235. -   person_event SPRITE_GAMEBOY_KID, 11, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x68a91, -1
  6236. -   person_event SPRITE_YOUNGSTER, 7, 4, $7, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x68a9c, -1
  6237. -   person_event SPRITE_POKEDEX, 4, 2, $1, 0, 0, -1, -1, 0, 0, 0, AcademyNotebook, -1
  6238. +   person_event SPRITE_FISHER, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
  6239. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x68a83, -1
  6240. +   person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x68a86, -1
  6241. +   person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x68a91, -1
  6242. +   person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x68a9c, -1
  6243. +   person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, AcademyNotebook, -1
  6244. diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
  6245. index 6b072e6..804dd5a 100644
  6246. --- a/maps/EcruteakCity.asm
  6247. +++ b/maps/EcruteakCity.asm
  6248. @@ -290,10 +290,10 @@ EcruteakCity_MapEventHeader:
  6249.  
  6250.  .PersonEvents:
  6251.     db 7
  6252. -   person_event SPRITE_GRAMPS, 15, 18, $2, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a4009, -1
  6253. -   person_event SPRITE_GRAMPS, 21, 20, $3, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a400c, -1
  6254. -   person_event SPRITE_LASS, 29, 21, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1a4012, -1
  6255. -   person_event SPRITE_LASS, 9, 3, $7, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a4015, -1
  6256. -   person_event SPRITE_FISHER, 22, 9, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a4029, -1
  6257. -   person_event SPRITE_YOUNGSTER, 14, 10, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a403d, -1
  6258. -   person_event SPRITE_GRAMPS, 7, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS
  6259. +   person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a4009, -1
  6260. +   person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a400c, -1
  6261. +   person_event SPRITE_LASS, 29, 21, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1a4012, -1
  6262. +   person_event SPRITE_LASS, 9, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a4015, -1
  6263. +   person_event SPRITE_FISHER, 22, 9, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a4029, -1
  6264. +   person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a403d, -1
  6265. +   person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS
  6266. diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
  6267. index 9c012fe..7d153b5 100644
  6268. --- a/maps/EcruteakGym.asm
  6269. +++ b/maps/EcruteakGym.asm
  6270. @@ -3,8 +3,8 @@ EcruteakGym_MapScriptHeader:
  6271.     db 2
  6272.  
  6273.     ; triggers
  6274.     dw UnknownScript_0x99d53, $0000
  6275.     dw UnknownScript_0x99d57, $0000
  6276.  
  6277.  .MapCallbacks:
  6278.     db 0
  6279. @@ -24,7 +24,7 @@ MortyScript_0x99d58:
  6280.     writetext UnknownText_0x99e65
  6281.     closetext
  6282.     loadmovesprites
  6283.     winlosstext UnknownText_0x9a00a, $0000
  6284.     loadtrainer MORTY, 1
  6285.     startbattle
  6286.     returnafterbattle
  6287. @@ -91,7 +91,7 @@ UnknownScript_0x99dc6:
  6288.     end
  6289.  
  6290.  TrainerSageJeffrey:
  6291.     trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, $0000, SageJeffreyScript
  6292.  
  6293.  SageJeffreyScript:
  6294.     talkaftercancel
  6295. @@ -102,7 +102,7 @@ SageJeffreyScript:
  6296.     end
  6297.  
  6298.  TrainerSagePing:
  6299.     trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, $0000, SagePingScript
  6300.  
  6301.  SagePingScript:
  6302.     talkaftercancel
  6303. @@ -113,7 +113,7 @@ SagePingScript:
  6304.     end
  6305.  
  6306.  TrainerMediumMartha:
  6307.     trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, $0000, MediumMarthaScript
  6308.  
  6309.  MediumMarthaScript:
  6310.     talkaftercancel
  6311. @@ -124,7 +124,7 @@ MediumMarthaScript:
  6312.     end
  6313.  
  6314.  TrainerMediumGrace:
  6315.     trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, $0000, MediumGraceScript
  6316.  
  6317.  MediumGraceScript:
  6318.     talkaftercancel
  6319. @@ -429,10 +429,10 @@ EcruteakGym_MapEventHeader:
  6320.  
  6321.  .PersonEvents:
  6322.     db 7
  6323. -   person_event SPRITE_MORTY, 1, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x99d58, -1
  6324. -   person_event SPRITE_SAGE, 7, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSageJeffrey, -1
  6325. -   person_event SPRITE_SAGE, 13, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSagePing, -1
  6326. -   person_event SPRITE_GRANNY, 5, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerMediumMartha, -1
  6327. -   person_event SPRITE_GRANNY, 9, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerMediumGrace, -1
  6328. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, EcruteakGymGuyScript, -1
  6329. -   person_event SPRITE_GRAMPS, 14, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
  6330. +   person_event SPRITE_MORTY, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x99d58, -1
  6331. +   person_event SPRITE_SAGE, 7, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSageJeffrey, -1
  6332. +   person_event SPRITE_SAGE, 13, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSagePing, -1
  6333. +   person_event SPRITE_GRANNY, 5, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerMediumMartha, -1
  6334. +   person_event SPRITE_GRANNY, 9, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerMediumGrace, -1
  6335. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, EcruteakGymGuyScript, -1
  6336. +   person_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
  6337. diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm
  6338. index b410f7d..7eb175d 100644
  6339. --- a/maps/EcruteakHouse.asm
  6340. +++ b/maps/EcruteakHouse.asm
  6341. @@ -3,8 +3,8 @@ EcruteakHouse_MapScriptHeader:
  6342.     db 2
  6343.  
  6344.     ; triggers
  6345.     dw .Trigger1, $0000
  6346.     dw .Trigger2, $0000
  6347.  
  6348.  .MapCallbacks:
  6349.     db 1
  6350. @@ -298,7 +298,7 @@ EcruteakHouse_MapEventHeader:
  6351.  
  6352.  .PersonEvents:
  6353.     db 4
  6354. -   person_event SPRITE_SAGE, 6, 4, $6, 0, 0, -1, -1, 0, 0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
  6355. -   person_event SPRITE_SAGE, 6, 5, $6, 0, 0, -1, -1, 0, 0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
  6356. -   person_event SPRITE_SAGE, 9, 6, $2, 1, 1, -1, -1, 0, 0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
  6357. -   person_event SPRITE_GRAMPS, 11, 3, $2, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
  6358. +   person_event SPRITE_SAGE, 6, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
  6359. +   person_event SPRITE_SAGE, 6, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
  6360. +   person_event SPRITE_SAGE, 9, 6, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
  6361. +   person_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
  6362. diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
  6363. index bc1b679..98d85bb 100644
  6364. --- a/maps/EcruteakItemfinderHouse.asm
  6365. +++ b/maps/EcruteakItemfinderHouse.asm
  6366. @@ -176,5 +176,5 @@ EcruteakItemfinderHouse_MapEventHeader:
  6367.  
  6368.  .PersonEvents:
  6369.     db 2
  6370. -   person_event SPRITE_COOLTRAINER_M, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x9a5fb, -1
  6371. -   person_event SPRITE_POKEDEX, 3, 3, $1, 0, 0, -1, -1, 0, 0, 0, PokedexScript_0x9a620, -1
  6372. +   person_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x9a5fb, -1
  6373. +   person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, PokedexScript_0x9a620, -1
  6374. diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
  6375. index d3218b2..6e54322 100644
  6376. --- a/maps/EcruteakLugiaSpeechHouse.asm
  6377. +++ b/maps/EcruteakLugiaSpeechHouse.asm
  6378. @@ -58,5 +58,5 @@ EcruteakLugiaSpeechHouse_MapEventHeader:
  6379.  
  6380.  .PersonEvents:
  6381.     db 2
  6382. -   person_event SPRITE_GRAMPS, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x99334, -1
  6383. -   person_event SPRITE_YOUNGSTER, 4, 5, $8, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x99337, -1
  6384. +   person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x99334, -1
  6385. +   person_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x99337, -1
  6386. diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
  6387. index e382615..5b34631 100644
  6388. --- a/maps/EcruteakMart.asm
  6389. +++ b/maps/EcruteakMart.asm
  6390. @@ -57,6 +57,6 @@ EcruteakMart_MapEventHeader:
  6391.  
  6392.  .PersonEvents:
  6393.     db 3
  6394. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x99c3b, -1
  6395. -   person_event SPRITE_SUPER_NERD, 2, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x99c42, -1
  6396. -   person_event SPRITE_GRANNY, 6, 6, $7, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99c45, -1
  6397. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x99c3b, -1
  6398. +   person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x99c42, -1
  6399. +   person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99c45, -1
  6400. diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm
  6401. index 66acfaa..4e8071e 100644
  6402. --- a/maps/EcruteakPokeCenter1F.asm
  6403. +++ b/maps/EcruteakPokeCenter1F.asm
  6404. @@ -3,8 +3,8 @@ EcruteakPokeCenter1F_MapScriptHeader:
  6405.     db 2
  6406.  
  6407.     ; triggers
  6408.     dw UnknownScript_0x98e5f, $0000
  6409.     dw UnknownScript_0x98e63, $0000
  6410.  
  6411.  .MapCallbacks:
  6412.     db 0
  6413. @@ -219,8 +219,8 @@ EcruteakPokeCenter1F_MapEventHeader:
  6414.  
  6415.  .PersonEvents:
  6416.     db 5
  6417. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x98eb0, -1
  6418. -   person_event SPRITE_POKEFAN_M, 6, 7, $a, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x98eb3, -1
  6419. -   person_event SPRITE_COOLTRAINER_F, 4, 1, $3, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x98ebf, -1
  6420. -   person_event SPRITE_GYM_GUY, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x98ec2, -1
  6421. -   person_event SPRITE_BILL, 7, 0, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
  6422. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x98eb0, -1
  6423. +   person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEFN_0A, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x98eb3, -1
  6424. +   person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x98ebf, -1
  6425. +   person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x98ec2, -1
  6426. +   person_event SPRITE_BILL, 7, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
  6427. diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
  6428. index e8673a6..68376ca 100644
  6429. --- a/maps/ElmsHouse.asm
  6430. +++ b/maps/ElmsHouse.asm
  6431. @@ -99,5 +99,5 @@ ElmsHouse_MapEventHeader:
  6432.  
  6433.  .PersonEvents:
  6434.     db 2
  6435. -   person_event SPRITE_TEACHER, 5, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ElmsWife, -1
  6436. -   person_event SPRITE_BUG_CATCHER, 4, 5, $7, 0, 0, -1, -1, 0, 0, 0, ElmsSon, -1
  6437. +   person_event SPRITE_TEACHER, 5, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ElmsWife, -1
  6438. +   person_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ElmsSon, -1
  6439. diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
  6440. index 45e0c23..7abd783 100644
  6441. --- a/maps/ElmsLab.asm
  6442. +++ b/maps/ElmsLab.asm
  6443. @@ -3,12 +3,12 @@ ElmsLab_MapScriptHeader:
  6444.     db 6
  6445.  
  6446.     ; triggers
  6447.     dw UnknownScript_0x78b7a, $0000
  6448.     dw UnknownScript_0x78b7e, $0000
  6449.     dw UnknownScript_0x78b7f, $0000
  6450.     dw UnknownScript_0x78b80, $0000
  6451.     dw UnknownScript_0x78b81, $0000
  6452.     dw UnknownScript_0x78b82, $0000
  6453.  
  6454.  .MapCallbacks:
  6455.     db 1
  6456. @@ -1408,9 +1408,9 @@ ElmsLab_MapEventHeader:
  6457.  
  6458.  .PersonEvents:
  6459.     db 6
  6460. -   person_event SPRITE_ELM, 2, 5, $6, 0, 0, -1, -1, 0, 0, 0, ProfElmScript, -1
  6461. -   person_event SPRITE_SCIENTIST, 9, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
  6462. -   person_event SPRITE_POKE_BALL, 3, 6, $1, 0, 0, -1, -1, 0, 0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
  6463. -   person_event SPRITE_POKE_BALL, 3, 7, $1, 0, 0, -1, -1, 0, 0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
  6464. -   person_event SPRITE_POKE_BALL, 3, 8, $1, 0, 0, -1, -1, 0, 0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
  6465. -   person_event SPRITE_OFFICER, 3, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopScript, EVENT_COP_IN_ELMS_LAB
  6466. +   person_event SPRITE_ELM, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ProfElmScript, -1
  6467. +   person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
  6468. +   person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
  6469. +   person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
  6470. +   person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
  6471. +   person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopScript, EVENT_COP_IN_ELMS_LAB
  6472. diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
  6473. index 5e3f3a0..7596674 100644
  6474. --- a/maps/FastShip1F.asm
  6475. +++ b/maps/FastShip1F.asm
  6476. @@ -3,9 +3,9 @@ FastShip1F_MapScriptHeader:
  6477.     db 3
  6478.  
  6479.     ; triggers
  6480.     dw .Trigger1, $0000
  6481.     dw .Trigger2, $0000
  6482.     dw .Trigger3, $0000
  6483.  
  6484.  .MapCallbacks:
  6485.     db 0
  6486. @@ -310,7 +310,7 @@ FastShip1F_MapEventHeader:
  6487.  
  6488.  .PersonEvents:
  6489.     db 4
  6490. -   person_event SPRITE_SAILOR, 2, 25, $6, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x75160, -1
  6491. -   person_event SPRITE_SAILOR, 7, 14, $9, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x751d0, -1
  6492. -   person_event SPRITE_SAILOR, 17, 22, $5, 0, 2, -1, -1, 0, 0, 0, SailorScript_0x751e4, -1
  6493. -   person_event SPRITE_GENTLEMAN, 6, 19, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
  6494. +   person_event SPRITE_SAILOR, 2, 25, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x75160, -1
  6495. +   person_event SPRITE_SAILOR, 7, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x751d0, -1
  6496. +   person_event SPRITE_SAILOR, 17, 22, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, SailorScript_0x751e4, -1
  6497. +   person_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
  6498. diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
  6499. index 735ad6e..b094f58 100644
  6500. --- a/maps/FastShipB1F.asm
  6501. +++ b/maps/FastShipB1F.asm
  6502. @@ -3,8 +3,8 @@ FastShipB1F_MapScriptHeader:
  6503.     db 2
  6504.  
  6505.     ; triggers
  6506.     dw UnknownScript_0x7673a, $0000
  6507.     dw UnknownScript_0x7673b, $0000
  6508.  
  6509.  .MapCallbacks:
  6510.     db 0
  6511. @@ -82,7 +82,7 @@ UnknownScript_0x767a0:
  6512.     end
  6513.  
  6514.  TrainerSailorJeff:
  6515.     trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, $0000, SailorJeffScript
  6516.  
  6517.  SailorJeffScript:
  6518.     talkaftercancel
  6519. @@ -93,7 +93,7 @@ SailorJeffScript:
  6520.     end
  6521.  
  6522.  TrainerPicnickerDebra:
  6523.     trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, $0000, PicnickerDebraScript
  6524.  
  6525.  PicnickerDebraScript:
  6526.     talkaftercancel
  6527. @@ -104,7 +104,7 @@ PicnickerDebraScript:
  6528.     end
  6529.  
  6530.  TrainerJugglerFritz:
  6531.     trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, $0000, JugglerFritzScript
  6532.  
  6533.  JugglerFritzScript:
  6534.     talkaftercancel
  6535. @@ -115,7 +115,7 @@ JugglerFritzScript:
  6536.     end
  6537.  
  6538.  TrainerSailorGarrett:
  6539.     trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, $0000, SailorGarrettScript
  6540.  
  6541.  SailorGarrettScript:
  6542.     talkaftercancel
  6543. @@ -126,7 +126,7 @@ SailorGarrettScript:
  6544.     end
  6545.  
  6546.  TrainerFisherJonah:
  6547.     trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, $0000, FisherJonahScript
  6548.  
  6549.  FisherJonahScript:
  6550.     talkaftercancel
  6551. @@ -137,7 +137,7 @@ FisherJonahScript:
  6552.     end
  6553.  
  6554.  TrainerBlackbeltWai:
  6555.     trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, $0000, BlackbeltWaiScript
  6556.  
  6557.  BlackbeltWaiScript:
  6558.     talkaftercancel
  6559. @@ -148,7 +148,7 @@ BlackbeltWaiScript:
  6560.     end
  6561.  
  6562.  TrainerSailorKenneth:
  6563.     trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, $0000, SailorKennethScript
  6564.  
  6565.  SailorKennethScript:
  6566.     talkaftercancel
  6567. @@ -159,7 +159,7 @@ SailorKennethScript:
  6568.     end
  6569.  
  6570.  TrainerTeacherShirley:
  6571.     trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, $0000, TeacherShirleyScript
  6572.  
  6573.  TeacherShirleyScript:
  6574.     talkaftercancel
  6575. @@ -170,7 +170,7 @@ TeacherShirleyScript:
  6576.     end
  6577.  
  6578.  TrainerSchoolboyNate:
  6579.     trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, $0000, SchoolboyNateScript
  6580.  
  6581.  SchoolboyNateScript:
  6582.     talkaftercancel
  6583. @@ -181,7 +181,7 @@ SchoolboyNateScript:
  6584.     end
  6585.  
  6586.  TrainerSchoolboyRicky:
  6587.     trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, $0000, SchoolboyRickyScript
  6588.  
  6589.  SchoolboyRickyScript:
  6590.     talkaftercancel
  6591. @@ -456,15 +456,15 @@ FastShipB1F_MapEventHeader:
  6592.  
  6593.  .PersonEvents:
  6594.     db 12
  6595. -   person_event SPRITE_SAILOR, 6, 30, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
  6596. -   person_event SPRITE_SAILOR, 6, 31, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
  6597. -   person_event SPRITE_SAILOR, 11, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6598. -   person_event SPRITE_LASS, 4, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6599. -   person_event SPRITE_SUPER_NERD, 9, 26, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6600. -   person_event SPRITE_SAILOR, 4, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6601. -   person_event SPRITE_FISHER, 8, 25, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6602. -   person_event SPRITE_BLACK_BELT, 11, 15, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6603. -   person_event SPRITE_SAILOR, 4, 23, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6604. -   person_event SPRITE_TEACHER, 11, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6605. -   person_event SPRITE_YOUNGSTER, 9, 14, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6606. -   person_event SPRITE_YOUNGSTER, 11, 14, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6607. +   person_event SPRITE_SAILOR, 6, 30, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
  6608. +   person_event SPRITE_SAILOR, 6, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
  6609. +   person_event SPRITE_SAILOR, 11, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6610. +   person_event SPRITE_LASS, 4, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6611. +   person_event SPRITE_SUPER_NERD, 9, 26, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6612. +   person_event SPRITE_SAILOR, 4, 17, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6613. +   person_event SPRITE_FISHER, 8, 25, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6614. +   person_event SPRITE_BLACK_BELT, 11, 15, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6615. +   person_event SPRITE_SAILOR, 4, 23, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6616. +   person_event SPRITE_TEACHER, 11, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6617. +   person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6618. +   person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6619. diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
  6620. index 4f1e4be..b66181f 100644
  6621. --- a/maps/FastShipCabins_NNW_NNE_NE.asm
  6622. +++ b/maps/FastShipCabins_NNW_NNE_NE.asm
  6623. @@ -6,7 +6,7 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader:
  6624.     db 0
  6625.  
  6626.  TrainerCooltrainermSean:
  6627.     trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, $0000, CooltrainermSeanScript
  6628.  
  6629.  CooltrainermSeanScript:
  6630.     talkaftercancel
  6631. @@ -17,7 +17,7 @@ CooltrainermSeanScript:
  6632.     end
  6633.  
  6634.  TrainerCooltrainerfCarol:
  6635.     trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, $0000, CooltrainerfCarolScript
  6636.  
  6637.  CooltrainerfCarolScript:
  6638.     talkaftercancel
  6639. @@ -28,7 +28,7 @@ CooltrainerfCarolScript:
  6640.     end
  6641.  
  6642.  TrainerPokemaniacEthan:
  6643.     trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, $0000, PokemaniacEthanScript
  6644.  
  6645.  PokemaniacEthanScript:
  6646.     talkaftercancel
  6647. @@ -39,7 +39,7 @@ PokemaniacEthanScript:
  6648.     end
  6649.  
  6650.  TrainerHikerNoland:
  6651.     trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, $0000, HikerNolandScript
  6652.  
  6653.  HikerNolandScript:
  6654.     talkaftercancel
  6655. @@ -50,7 +50,7 @@ HikerNolandScript:
  6656.     end
  6657.  
  6658.  TrainerGentlemanEdward:
  6659.     trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, $0000, GentlemanEdwardScript
  6660.  
  6661.  GentlemanEdwardScript:
  6662.     talkaftercancel
  6663. @@ -61,7 +61,7 @@ GentlemanEdwardScript:
  6664.     end
  6665.  
  6666.  TrainerBurglarCorey:
  6667.     trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, $0000, BurglarCoreyScript
  6668.  
  6669.  BurglarCoreyScript:
  6670.     talkaftercancel
  6671. @@ -78,7 +78,7 @@ SailorScript_0x755f1:
  6672.     writetext UnknownText_0x75812
  6673.     closetext
  6674.     loadmovesprites
  6675.     winlosstext UnknownText_0x75897, $0000
  6676.     loadtrainer SAILOR, STANLY
  6677.     startbattle
  6678.     reloadmap
  6679. @@ -278,10 +278,10 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader:
  6680.  
  6681.  .PersonEvents:
  6682.     db 7
  6683. -   person_event SPRITE_COOLTRAINER_M, 3, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6684. -   person_event SPRITE_COOLTRAINER_F, 5, 1, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6685. -   person_event SPRITE_SUPER_NERD, 5, 1, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6686. -   person_event SPRITE_POKEFAN_M, 17, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6687. -   person_event SPRITE_SAILOR, 26, 4, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
  6688. -   person_event SPRITE_GENTLEMAN, 30, 7, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6689. -   person_event SPRITE_PHARMACIST, 30, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6690. +   person_event SPRITE_COOLTRAINER_M, 3, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6691. +   person_event SPRITE_COOLTRAINER_F, 5, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6692. +   person_event SPRITE_SUPER_NERD, 5, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6693. +   person_event SPRITE_POKEFAN_M, 17, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6694. +   person_event SPRITE_SAILOR, 26, 4, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
  6695. +   person_event SPRITE_GENTLEMAN, 30, 7, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6696. +   person_event SPRITE_PHARMACIST, 30, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6697. diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
  6698. index cd49d5a..7e75998 100644
  6699. --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
  6700. +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
  6701. @@ -128,7 +128,7 @@ TwinScript_0x75f6d:
  6702.     end
  6703.  
  6704.  TrainerPokefanmColin:
  6705.     trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, $0000, PokefanmColinScript
  6706.  
  6707.  PokefanmColinScript:
  6708.     talkaftercancel
  6709. @@ -139,7 +139,7 @@ PokefanmColinScript:
  6710.     end
  6711.  
  6712.  TrainerTwinsMegandpeg1:
  6713.     trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, $0000, TwinsMegandpeg1Script
  6714.  
  6715.  TwinsMegandpeg1Script:
  6716.     talkaftercancel
  6717. @@ -150,7 +150,7 @@ TwinsMegandpeg1Script:
  6718.     end
  6719.  
  6720.  TrainerTwinsMegandpeg2:
  6721.     trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, $0000, TwinsMegandpeg2Script
  6722.  
  6723.  TwinsMegandpeg2Script:
  6724.     talkaftercancel
  6725. @@ -161,7 +161,7 @@ TwinsMegandpeg2Script:
  6726.     end
  6727.  
  6728.  TrainerPsychicRodney:
  6729.     trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, $0000, PsychicRodneyScript
  6730.  
  6731.  PsychicRodneyScript:
  6732.     talkaftercancel
  6733. @@ -172,7 +172,7 @@ PsychicRodneyScript:
  6734.     end
  6735.  
  6736.  TrainerPokefanmJeremy:
  6737.     trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, $0000, PokefanmJeremyScript
  6738.  
  6739.  PokefanmJeremyScript:
  6740.     talkaftercancel
  6741. @@ -183,7 +183,7 @@ PokefanmJeremyScript:
  6742.     end
  6743.  
  6744.  TrainerPokefanfGeorgia:
  6745.     trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, $0000, PokefanfGeorgiaScript
  6746.  
  6747.  PokefanfGeorgiaScript:
  6748.     talkaftercancel
  6749. @@ -194,7 +194,7 @@ PokefanfGeorgiaScript:
  6750.     end
  6751.  
  6752.  TrainerSupernerdShawn:
  6753.     trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, $0000, SupernerdShawnScript
  6754.  
  6755.  SupernerdShawnScript:
  6756.     talkaftercancel
  6757. @@ -471,14 +471,14 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
  6758.  
  6759.  .PersonEvents:
  6760.     db 11
  6761. -   person_event SPRITE_CAPTAIN, 25, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CaptainScript_0x75ea7, -1
  6762. -   person_event SPRITE_GENTLEMAN, 17, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
  6763. -   person_event SPRITE_TWIN, 17, 3, $a, 0, 0, -1, -1, 0, 0, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
  6764. -   person_event SPRITE_TWIN, 25, 2, $a, 0, 0, -1, -1, 0, 0, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
  6765. -   person_event SPRITE_POKEFAN_M, 6, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6766. -   person_event SPRITE_TWIN, 4, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6767. -   person_event SPRITE_TWIN, 4, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6768. -   person_event SPRITE_SUPER_NERD, 5, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6769. -   person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6770. -   person_event SPRITE_POKEFAN_F, 5, 5, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6771. -   person_event SPRITE_SUPER_NERD, 15, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6772. +   person_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CaptainScript_0x75ea7, -1
  6773. +   person_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
  6774. +   person_event SPRITE_TWIN, 17, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, 0, 0, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
  6775. +   person_event SPRITE_TWIN, 25, 2, SPRITEMOVEFN_0A, 0, 0, -1, -1, 0, 0, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
  6776. +   person_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6777. +   person_event SPRITE_TWIN, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6778. +   person_event SPRITE_TWIN, 4, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6779. +   person_event SPRITE_SUPER_NERD, 5, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6780. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6781. +   person_event SPRITE_POKEFAN_F, 5, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6782. +   person_event SPRITE_SUPER_NERD, 15, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6783. diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
  6784. index 0c610e5..298bdfc 100644
  6785. --- a/maps/FastShipCabins_SW_SSW_NW.asm
  6786. +++ b/maps/FastShipCabins_SW_SSW_NW.asm
  6787. @@ -6,7 +6,7 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader:
  6788.     db 0
  6789.  
  6790.  TrainerFirebreatherLyle:
  6791.     trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, $0000, FirebreatherLyleScript
  6792.  
  6793.  FirebreatherLyleScript:
  6794.     talkaftercancel
  6795. @@ -17,7 +17,7 @@ FirebreatherLyleScript:
  6796.     end
  6797.  
  6798.  TrainerBug_catcherKen:
  6799.     trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, $0000, Bug_catcherKenScript
  6800.  
  6801.  Bug_catcherKenScript:
  6802.     talkaftercancel
  6803. @@ -28,7 +28,7 @@ Bug_catcherKenScript:
  6804.     end
  6805.  
  6806.  TrainerBeautyCassie:
  6807.     trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, $0000, BeautyCassieScript
  6808.  
  6809.  BeautyCassieScript:
  6810.     talkaftercancel
  6811. @@ -39,7 +39,7 @@ BeautyCassieScript:
  6812.     end
  6813.  
  6814.  TrainerGuitaristClyde:
  6815.     trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, $0000, GuitaristClydeScript
  6816.  
  6817.  GuitaristClydeScript:
  6818.     talkaftercancel
  6819. @@ -239,7 +239,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader:
  6820.  
  6821.  .PersonEvents:
  6822.     db 4
  6823. -   person_event SPRITE_FISHER, 15, 1, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6824. -   person_event SPRITE_BUG_CATCHER, 15, 6, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6825. -   person_event SPRITE_BUENA, 26, 1, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6826. -   person_event SPRITE_ROCKER, 28, 3, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6827. +   person_event SPRITE_FISHER, 15, 1, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
  6828. +   person_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6829. +   person_event SPRITE_BUENA, 26, 1, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6830. +   person_event SPRITE_ROCKER, 28, 3, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6831. diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
  6832. index 8b6869c..deadc00 100644
  6833. --- a/maps/FightingDojo.asm
  6834. +++ b/maps/FightingDojo.asm
  6835. @@ -57,5 +57,5 @@ FightingDojo_MapEventHeader:
  6836.  
  6837.  .PersonEvents:
  6838.     db 2
  6839. -   person_event SPRITE_BLACK_BELT, 4, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x189b61, -1
  6840. -   person_event SPRITE_POKE_BALL, 1, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND
  6841. +   person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x189b61, -1
  6842. +   person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND
  6843. diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm
  6844. index d523e58..c6ef1df 100644
  6845. --- a/maps/FuchsiaBillSpeechHouse.asm
  6846. +++ b/maps/FuchsiaBillSpeechHouse.asm
  6847. @@ -40,5 +40,5 @@ FuchsiaBillSpeechHouse_MapEventHeader:
  6848.  
  6849.  .PersonEvents:
  6850.     db 2
  6851. -   person_event SPRITE_POKEFAN_F, 3, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x1963bd, -1
  6852. -   person_event SPRITE_YOUNGSTER, 4, 6, $4, 1, 0, -1, -1, 0, 0, 0, YoungsterScript_0x1963c0, -1
  6853. +   person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x1963bd, -1
  6854. +   person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, YoungsterScript_0x1963c0, -1
  6855. diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
  6856. index 5f8bfd8..d083db4 100644
  6857. --- a/maps/FuchsiaCity.asm
  6858. +++ b/maps/FuchsiaCity.asm
  6859. @@ -154,7 +154,7 @@ FuchsiaCity_MapEventHeader:
  6860.  
  6861.  .PersonEvents:
  6862.     db 4
  6863. -   person_event SPRITE_YOUNGSTER, 18, 23, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x194b22, -1
  6864. -   person_event SPRITE_POKEFAN_M, 8, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x194b25, -1
  6865. -   person_event SPRITE_TEACHER, 14, 16, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x194b28, -1
  6866. -   person_event SPRITE_FRUIT_TREE, 1, 8, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x194b43, -1
  6867. +   person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x194b22, -1
  6868. +   person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x194b25, -1
  6869. +   person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x194b28, -1
  6870. +   person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x194b43, -1
  6871. diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
  6872. index 360783a..46bab76 100644
  6873. --- a/maps/FuchsiaGym.asm
  6874. +++ b/maps/FuchsiaGym.asm
  6875. @@ -14,7 +14,7 @@ JanineScript_0x195db9:
  6876.     writetext UnknownText_0x195f35
  6877.     closetext
  6878.     loadmovesprites
  6879.     winlosstext UnknownText_0x195fa1, $0000
  6880.     loadtrainer JANINE, 1
  6881.     startbattle
  6882.     returnafterbattle
  6883. @@ -66,7 +66,7 @@ UnknownScript_0x195e2c:
  6884.     writetext UnknownText_0x1960e6
  6885.     closetext
  6886.     loadmovesprites
  6887.     winlosstext UnknownText_0x196126, $0000
  6888.     loadtrainer LASS, ALICE
  6889.     startbattle
  6890.     iftrue UnknownScript_0x195e4a
  6891. @@ -100,7 +100,7 @@ UnknownScript_0x195e66:
  6892.     writetext UnknownText_0x196166
  6893.     closetext
  6894.     loadmovesprites
  6895.     winlosstext UnknownText_0x19617b, $0000
  6896.     loadtrainer LASS, LINDA
  6897.     startbattle
  6898.     iftrue UnknownScript_0x195e84
  6899. @@ -134,7 +134,7 @@ UnknownScript_0x195ea0:
  6900.     writetext UnknownText_0x1961bb
  6901.     closetext
  6902.     loadmovesprites
  6903.     winlosstext UnknownText_0x1961f1, $0000
  6904.     loadtrainer PICNICKER, CINDY
  6905.     startbattle
  6906.     iftrue UnknownScript_0x195ebe
  6907. @@ -168,7 +168,7 @@ UnknownScript_0x195eda:
  6908.     writetext UnknownText_0x196228
  6909.     closetext
  6910.     loadmovesprites
  6911.     winlosstext UnknownText_0x19624a, $0000
  6912.     loadtrainer CAMPER, BARRY
  6913.     startbattle
  6914.     iftrue UnknownScript_0x195ef8
  6915. @@ -391,9 +391,9 @@ FuchsiaGym_MapEventHeader:
  6916.  
  6917.  .PersonEvents:
  6918.     db 6
  6919. -   person_event SPRITE_JANINE, 10, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineScript_0x195db9, -1
  6920. -   person_event SPRITE_FUCHSIA_GYM_1, 7, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym1Script_0x195e1b, -1
  6921. -   person_event SPRITE_FUCHSIA_GYM_2, 11, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym2Script_0x195e55, -1
  6922. -   person_event SPRITE_FUCHSIA_GYM_3, 4, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym3Script_0x195e8f, -1
  6923. -   person_event SPRITE_FUCHSIA_GYM_4, 2, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym4Script_0x195ec9, -1
  6924. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuchsiaGymGuyScript, -1
  6925. +   person_event SPRITE_JANINE, 10, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineScript_0x195db9, -1
  6926. +   person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym1Script_0x195e1b, -1
  6927. +   person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym2Script_0x195e55, -1
  6928. +   person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym3Script_0x195e8f, -1
  6929. +   person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym4Script_0x195ec9, -1
  6930. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuchsiaGymGuyScript, -1
  6931. diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
  6932. index 6b240ac..92905d8 100644
  6933. --- a/maps/FuchsiaMart.asm
  6934. +++ b/maps/FuchsiaMart.asm
  6935. @@ -49,6 +49,6 @@ FuchsiaMart_MapEventHeader:
  6936.  
  6937.  .PersonEvents:
  6938.     db 3
  6939. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195ce8, -1
  6940. -   person_event SPRITE_FISHER, 2, 3, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x195cef, -1
  6941. -   person_event SPRITE_COOLTRAINER_F, 6, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x195cf2, -1
  6942. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195ce8, -1
  6943. +   person_event SPRITE_FISHER, 2, 3, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x195cef, -1
  6944. +   person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x195cf2, -1
  6945. diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm
  6946. index 183ec42..739db16 100644
  6947. --- a/maps/FuchsiaPokeCenter1F.asm
  6948. +++ b/maps/FuchsiaPokeCenter1F.asm
  6949. @@ -3,7 +3,7 @@ FuchsiaPokeCenter1F_MapScriptHeader:
  6950.     db 1
  6951.  
  6952.     ; triggers
  6953.     dw UnknownScript_0x196458, $0000
  6954.  
  6955.  .MapCallbacks:
  6956.     db 0
  6957. @@ -102,7 +102,7 @@ FuchsiaPokeCenter1F_MapEventHeader:
  6958.  
  6959.  .PersonEvents:
  6960.     db 4
  6961. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, NurseScript_0x196459, -1
  6962. -   person_event SPRITE_COOLTRAINER_M, 4, 8, $5, 0, 1, -1, -1, 0, 0, 0, CooltrainerMScript_0x19645c, -1
  6963. -   person_event SPRITE_COOLTRAINER_F, 4, 1, $5, 0, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x19645f, -1
  6964. -   person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineImpersonatorScript_0x196462, -1
  6965. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, NurseScript_0x196459, -1
  6966. +   person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, CooltrainerMScript_0x19645c, -1
  6967. +   person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x19645f, -1
  6968. +   person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineImpersonatorScript_0x196462, -1
  6969. diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
  6970. index 39a3313..28aeb9e 100644
  6971. --- a/maps/GoldenrodBikeShop.asm
  6972. +++ b/maps/GoldenrodBikeShop.asm
  6973. @@ -125,4 +125,4 @@ GoldenrodBikeShop_MapEventHeader:
  6974.  
  6975.  .PersonEvents:
  6976.     db 1
  6977. -   person_event SPRITE_CLERK, 2, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ClerkScript_0x54750, -1
  6978. +   person_event SPRITE_CLERK, 2, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ClerkScript_0x54750, -1
  6979. diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm
  6980. index e8fcd76..8a8a7dc 100644
  6981. --- a/maps/GoldenrodBillsHouse.asm
  6982. +++ b/maps/GoldenrodBillsHouse.asm
  6983. @@ -257,6 +257,6 @@ GoldenrodBillsHouse_MapEventHeader:
  6984.  
  6985.  .PersonEvents:
  6986.     db 3
  6987. -   person_event SPRITE_BILL, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, BillsHouseBill, EVENT_MET_BILL
  6988. -   person_event SPRITE_POKEFAN_F, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, BillsMom, -1
  6989. -   person_event SPRITE_TWIN, 4, 5, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BillsSister, -1
  6990. +   person_event SPRITE_BILL, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BillsHouseBill, EVENT_MET_BILL
  6991. +   person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BillsMom, -1
  6992. +   person_event SPRITE_TWIN, 4, 5, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BillsSister, -1
  6993. diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
  6994. index e08d75d..8f8a1a3 100644
  6995. --- a/maps/GoldenrodCity.asm
  6996. +++ b/maps/GoldenrodCity.asm
  6997. @@ -581,18 +581,18 @@ GoldenrodCity_MapEventHeader:
  6998.  
  6999.  .PersonEvents:
  7000.     db 15
  7001. -   person_event SPRITE_POKEFAN_M, 18, 7, $7, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS
  7002. -   person_event SPRITE_YOUNGSTER, 17, 30, $2, 1, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS
  7003. -   person_event SPRITE_COOLTRAINER_F, 16, 12, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
  7004. -   person_event SPRITE_COOLTRAINER_F, 26, 20, $2, 2, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
  7005. -   person_event SPRITE_YOUNGSTER, 17, 19, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS
  7006. -   person_event SPRITE_LASS, 10, 17, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS
  7007. -   person_event SPRITE_GRAMPS, 27, 11, $5, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS
  7008. -   person_event SPRITE_ROCKET, 16, 4, $7, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
  7009. -   person_event SPRITE_ROCKET, 20, 28, $7, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
  7010. -   person_event SPRITE_ROCKET, 15, 8, $6, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
  7011. -   person_event SPRITE_ROCKET, 23, 16, $9, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  7012. -   person_event SPRITE_ROCKET, 20, 29, $7, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  7013. -   person_event SPRITE_ROCKET, 7, 29, $6, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  7014. -   person_event SPRITE_ROCKET, 10, 31, $8, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  7015. -   person_event SPRITE_POKEFAN_M, 22, 12, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR
  7016. +   person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS
  7017. +   person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS
  7018. +   person_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
  7019. +   person_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
  7020. +   person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS
  7021. +   person_event SPRITE_LASS, 10, 17, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS
  7022. +   person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS
  7023. +   person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
  7024. +   person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
  7025. +   person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
  7026. +   person_event SPRITE_ROCKET, 23, 16, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  7027. +   person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  7028. +   person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  7029. +   person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  7030. +   person_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR
  7031. diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
  7032. index fc4064c..66d90f7 100644
  7033. --- a/maps/GoldenrodDeptStore1F.asm
  7034. +++ b/maps/GoldenrodDeptStore1F.asm
  7035. @@ -93,7 +93,7 @@ GoldenrodDeptStore1F_MapEventHeader:
  7036.  
  7037.  .PersonEvents:
  7038.     db 4
  7039. -   person_event SPRITE_RECEPTIONIST, 1, 10, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x55981, -1
  7040. -   person_event SPRITE_POKEFAN_F, 4, 5, $6, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x55987, -1
  7041. -   person_event SPRITE_BUG_CATCHER, 5, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x5598a, -1
  7042. -   person_event SPRITE_GENTLEMAN, 5, 11, $2, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x55984, -1
  7043. +   person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x55981, -1
  7044. +   person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x55987, -1
  7045. +   person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x5598a, -1
  7046. +   person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x55984, -1
  7047. diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
  7048. index 61f8e76..112023b 100644
  7049. --- a/maps/GoldenrodDeptStore2F.asm
  7050. +++ b/maps/GoldenrodDeptStore2F.asm
  7051. @@ -113,8 +113,8 @@ GoldenrodDeptStore2F_MapEventHeader:
  7052.  
  7053.  .PersonEvents:
  7054.     db 5
  7055. -   person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55b5d, -1
  7056. -   person_event SPRITE_CLERK, 6, 13, $8, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55b65, -1
  7057. -   person_event SPRITE_YOUNGSTER, 6, 9, $4, 1, 0, -1, -1, 0, 0, 0, YoungsterScript_0x55b6d, -1
  7058. -   person_event SPRITE_COOLTRAINER_F, 2, 6, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x55b70, -1
  7059. -   person_event SPRITE_GENTLEMAN, 6, 2, $3, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x55b73, -1
  7060. +   person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55b5d, -1
  7061. +   person_event SPRITE_CLERK, 6, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55b65, -1
  7062. +   person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, YoungsterScript_0x55b6d, -1
  7063. +   person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x55b70, -1
  7064. +   person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x55b73, -1
  7065. diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
  7066. index 40e3c50..4363ae7 100644
  7067. --- a/maps/GoldenrodDeptStore3F.asm
  7068. +++ b/maps/GoldenrodDeptStore3F.asm
  7069. @@ -71,6 +71,6 @@ GoldenrodDeptStore3F_MapEventHeader:
  7070.  
  7071.  .PersonEvents:
  7072.     db 3
  7073. -   person_event SPRITE_CLERK, 1, 6, $6, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55db8, -1
  7074. -   person_event SPRITE_SUPER_NERD, 5, 12, $a, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x55dc0, -1
  7075. -   person_event SPRITE_ROCKER, 5, 2, $4, 1, 0, -1, -1, 0, 0, 0, RockerScript_0x55dc3, -1
  7076. +   person_event SPRITE_CLERK, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55db8, -1
  7077. +   person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEFN_0A, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x55dc0, -1
  7078. +   person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, RockerScript_0x55dc3, -1
  7079. diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
  7080. index d26263e..74d2138 100644
  7081. --- a/maps/GoldenrodDeptStore4F.asm
  7082. +++ b/maps/GoldenrodDeptStore4F.asm
  7083. @@ -91,7 +91,7 @@ GoldenrodDeptStore4F_MapEventHeader:
  7084.  
  7085.  .PersonEvents:
  7086.     db 4
  7087. -   person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55ee9, -1
  7088. -   person_event SPRITE_COOLTRAINER_M, 7, 11, $9, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x55ef1, -1
  7089. -   person_event SPRITE_BUG_CATCHER, 2, 7, $5, 0, 1, -1, -1, 0, 0, 0, BugCatcherScript_0x55ef4, -1
  7090. -   person_event SPRITE_GAMEBOY_KID, 1, 5, $6, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x55ef7, -1
  7091. +   person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55ee9, -1
  7092. +   person_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x55ef1, -1
  7093. +   person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, BugCatcherScript_0x55ef4, -1
  7094. +   person_event SPRITE_GAMEBOY_KID, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x55ef7, -1
  7095. diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
  7096. index 94b1933..741b37a 100644
  7097. --- a/maps/GoldenrodDeptStore5F.asm
  7098. +++ b/maps/GoldenrodDeptStore5F.asm
  7099. @@ -232,9 +232,9 @@ GoldenrodDeptStore5F_MapEventHeader:
  7100.  
  7101.  .PersonEvents:
  7102.     db 6
  7103. -   person_event SPRITE_CLERK, 5, 8, $7, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x5609c, -1
  7104. -   person_event SPRITE_LASS, 6, 3, $2, 1, 1, -1, -1, 0, 0, 0, LassScript_0x56130, -1
  7105. -   person_event SPRITE_COOLTRAINER_M, 3, 6, $3, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x56133, -1
  7106. -   person_event SPRITE_POKEFAN_M, 5, 13, $2, 2, 2, -1, -1, 0, 0, 0, PokefanMScript_0x5613a, -1
  7107. -   person_event SPRITE_TWIN, 1, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x56118, -1
  7108. -   person_event SPRITE_RECEPTIONIST, 5, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
  7109. +   person_event SPRITE_CLERK, 5, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x5609c, -1
  7110. +   person_event SPRITE_LASS, 6, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, LassScript_0x56130, -1
  7111. +   person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x56133, -1
  7112. +   person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, PokefanMScript_0x5613a, -1
  7113. +   person_event SPRITE_TWIN, 1, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x56118, -1
  7114. +   person_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
  7115. diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
  7116. index e64e1db..efc0166 100644
  7117. --- a/maps/GoldenrodDeptStore6F.asm
  7118. +++ b/maps/GoldenrodDeptStore6F.asm
  7119. @@ -169,5 +169,5 @@ GoldenrodDeptStore6F_MapEventHeader:
  7120.  
  7121.  .PersonEvents:
  7122.     db 2
  7123. -   person_event SPRITE_LASS, 2, 10, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x564bf, -1
  7124. -   person_event SPRITE_SUPER_NERD, 2, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x564c2, -1
  7125. +   person_event SPRITE_LASS, 2, 10, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x564bf, -1
  7126. +   person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x564c2, -1
  7127. diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
  7128. index e0606ed..b19ef75 100644
  7129. --- a/maps/GoldenrodDeptStoreB1F.asm
  7130. +++ b/maps/GoldenrodDeptStoreB1F.asm
  7131. @@ -121,11 +121,11 @@ GoldenrodDeptStoreB1F_MapEventHeader:
  7132.  
  7133.  .PersonEvents:
  7134.     db 8
  7135. -   person_event SPRITE_POKE_BALL, 15, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
  7136. -   person_event SPRITE_POKE_BALL, 2, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
  7137. -   person_event SPRITE_POKE_BALL, 3, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
  7138. -   person_event SPRITE_POKE_BALL, 15, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
  7139. -   person_event SPRITE_BLACK_BELT, 10, 9, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x7d7b0, -1
  7140. -   person_event SPRITE_BLACK_BELT, 8, 4, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackBeltScript_0x7d7b3, -1
  7141. -   person_event SPRITE_BLACK_BELT, 13, 6, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x7d7b6, -1
  7142. -   person_event SPRITE_MACHOP, 7, 7, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MachopScript_0x7d7b9, -1
  7143. +   person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
  7144. +   person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
  7145. +   person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
  7146. +   person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
  7147. +   person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x7d7b0, -1
  7148. +   person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackBeltScript_0x7d7b3, -1
  7149. +   person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x7d7b6, -1
  7150. +   person_event SPRITE_MACHOP, 7, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MachopScript_0x7d7b9, -1
  7151. diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
  7152. index 9e65e1b..bb72df1 100644
  7153. --- a/maps/GoldenrodDeptStoreRoof.asm
  7154. +++ b/maps/GoldenrodDeptStoreRoof.asm
  7155. @@ -35,7 +35,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
  7156.  
  7157.  ClerkScript_0x5673f:
  7158.     loadfont
  7159.     pokemart $4, $0000
  7160.     loadmovesprites
  7161.     end
  7162.  
  7163. @@ -225,11 +225,11 @@ GoldenrodDeptStoreRoof_MapEventHeader:
  7164.  
  7165.  .PersonEvents:
  7166.     db 8
  7167. -   person_event SPRITE_CLERK, 4, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
  7168. -   person_event SPRITE_POKEFAN_F, 3, 10, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x56746, -1
  7169. -   person_event SPRITE_FISHER, 1, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x56749, -1
  7170. -   person_event SPRITE_TWIN, 4, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON
  7171. -   person_event SPRITE_SUPER_NERD, 6, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
  7172. -   person_event SPRITE_POKEFAN_M, 0, 7, $5, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF
  7173. -   person_event SPRITE_TEACHER, 3, 5, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF
  7174. -   person_event SPRITE_BUG_CATCHER, 6, 1, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF
  7175. +   person_event SPRITE_CLERK, 4, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
  7176. +   person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x56746, -1
  7177. +   person_event SPRITE_FISHER, 1, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x56749, -1
  7178. +   person_event SPRITE_TWIN, 4, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON
  7179. +   person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
  7180. +   person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF
  7181. +   person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF
  7182. +   person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF
  7183. diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
  7184. index 4ff95dd..a22fd2a 100644
  7185. --- a/maps/GoldenrodFlowerShop.asm
  7186. +++ b/maps/GoldenrodFlowerShop.asm
  7187. @@ -172,5 +172,5 @@ GoldenrodFlowerShop_MapEventHeader:
  7188.  
  7189.  .PersonEvents:
  7190.     db 2
  7191. -   person_event SPRITE_TEACHER, 4, 2, $9, 0, 0, -1, -1, 0, 0, 0, FlowerShopTeacherScript, -1
  7192. -   person_event SPRITE_LASS, 6, 5, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
  7193. +   person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FlowerShopTeacherScript, -1
  7194. +   person_event SPRITE_LASS, 6, 5, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
  7195. diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
  7196. index 6fcd393..1972ebd 100644
  7197. --- a/maps/GoldenrodGameCorner.asm
  7198. +++ b/maps/GoldenrodGameCorner.asm
  7199. @@ -479,15 +479,15 @@ GoldenrodGameCorner_MapEventHeader:
  7200.  
  7201.  .PersonEvents:
  7202.     db 12
  7203. -   person_event SPRITE_CLERK, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ClerkScript_0x56c25, -1
  7204. -   person_event SPRITE_RECEPTIONIST, 2, 16, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x56c28, -1
  7205. -   person_event SPRITE_RECEPTIONIST, 2, 18, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x56d01, -1
  7206. -   person_event SPRITE_PHARMACIST, 7, 8, $8, 0, 0, -1, 2, (1 << 3) | PAL_OW_BLUE, 0, 0, PharmacistScript_0x56df1, -1
  7207. -   person_event SPRITE_PHARMACIST, 7, 8, $8, 0, 0, -1, 4, (1 << 3) | PAL_OW_BLUE, 0, 0, PharmacistScript_0x56df1, -1
  7208. -   person_event SPRITE_POKEFAN_M, 10, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x56dfc, -1
  7209. -   person_event SPRITE_COOLTRAINER_M, 8, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x56e07, -1
  7210. -   person_event SPRITE_POKEFAN_F, 6, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x56e12, -1
  7211. -   person_event SPRITE_COOLTRAINER_F, 3, 10, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x56e1d, -1
  7212. -   person_event SPRITE_GENTLEMAN, 10, 5, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x56e20, -1
  7213. -   person_event SPRITE_POKEFAN_M, 9, 2, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x56e2b, -1
  7214. -   person_event SPRITE_POKEFAN_M, 10, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x56c1a, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
  7215. +   person_event SPRITE_CLERK, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ClerkScript_0x56c25, -1
  7216. +   person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x56c28, -1
  7217. +   person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x56d01, -1
  7218. +   person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEFN_08, 0, 0, -1, 2, (1 << 3) | PAL_OW_BLUE, 0, 0, PharmacistScript_0x56df1, -1
  7219. +   person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEFN_08, 0, 0, -1, 4, (1 << 3) | PAL_OW_BLUE, 0, 0, PharmacistScript_0x56df1, -1
  7220. +   person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x56dfc, -1
  7221. +   person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x56e07, -1
  7222. +   person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x56e12, -1
  7223. +   person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEFN_02, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x56e1d, -1
  7224. +   person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x56e20, -1
  7225. +   person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x56e2b, -1
  7226. +   person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x56c1a, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
  7227. diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
  7228. index fc30ac0..1bd93b1 100644
  7229. --- a/maps/GoldenrodGym.asm
  7230. +++ b/maps/GoldenrodGym.asm
  7231. @@ -3,8 +3,8 @@ GoldenrodGym_MapScriptHeader:
  7232.     db 2
  7233.  
  7234.     ; triggers
  7235.     dw UnknownScript_0x5400a, $0000
  7236.     dw UnknownScript_0x5400b, $0000
  7237.  
  7238.  .MapCallbacks:
  7239.     db 0
  7240. @@ -23,7 +23,7 @@ WhitneyScript_0x5400c:
  7241.     writetext UnknownText_0x54122
  7242.     closetext
  7243.     loadmovesprites
  7244.     winlosstext UnknownText_0x541a5, $0000
  7245.     loadtrainer WHITNEY, 1
  7246.     startbattle
  7247.     returnafterbattle
  7248. @@ -87,7 +87,7 @@ GoldenrodGymTriggerRockets:
  7249.     jumpstd radiotowerrockets
  7250.  
  7251.  TrainerLassCarrie:
  7252.     trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, $0000, LassCarrieScript
  7253.  
  7254.  LassCarrieScript:
  7255.     talkaftercancel
  7256. @@ -111,7 +111,7 @@ WhitneyCriesScript:
  7257.     end
  7258.  
  7259.  TrainerLassBridget:
  7260.     trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, $0000, LassBridgetScript
  7261.  
  7262.  LassBridgetScript:
  7263.     talkaftercancel
  7264. @@ -122,7 +122,7 @@ LassBridgetScript:
  7265.     end
  7266.  
  7267.  TrainerBeautyVictoria:
  7268.     trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, $0000, BeautyVictoriaScript
  7269.  
  7270.  BeautyVictoriaScript:
  7271.     talkaftercancel
  7272. @@ -133,7 +133,7 @@ BeautyVictoriaScript:
  7273.     end
  7274.  
  7275.  TrainerBeautySamantha:
  7276.     trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, $0000, BeautySamanthaScript
  7277.  
  7278.  BeautySamanthaScript:
  7279.     talkaftercancel
  7280. @@ -393,9 +393,9 @@ GoldenrodGym_MapEventHeader:
  7281.  
  7282.  .PersonEvents:
  7283.     db 6
  7284. -   person_event SPRITE_WHITNEY, 3, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, WhitneyScript_0x5400c, -1
  7285. -   person_event SPRITE_LASS, 13, 9, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerLassCarrie, -1
  7286. -   person_event SPRITE_LASS, 6, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassBridget, -1
  7287. -   person_event SPRITE_BUENA, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautyVictoria, -1
  7288. -   person_event SPRITE_BUENA, 5, 19, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautySamantha, -1
  7289. -   person_event SPRITE_GYM_GUY, 15, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GoldenrodGymGuyScript, -1
  7290. +   person_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, WhitneyScript_0x5400c, -1
  7291. +   person_event SPRITE_LASS, 13, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerLassCarrie, -1
  7292. +   person_event SPRITE_LASS, 6, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassBridget, -1
  7293. +   person_event SPRITE_BUENA, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautyVictoria, -1
  7294. +   person_event SPRITE_BUENA, 5, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautySamantha, -1
  7295. +   person_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GoldenrodGymGuyScript, -1
  7296. diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
  7297. index 5987e88..b04b99f 100644
  7298. --- a/maps/GoldenrodHappinessRater.asm
  7299. +++ b/maps/GoldenrodHappinessRater.asm
  7300. @@ -151,6 +151,6 @@ GoldenrodHappinessRater_MapEventHeader:
  7301.  
  7302.  .PersonEvents:
  7303.     db 3
  7304. -   person_event SPRITE_TEACHER, 4, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x54953, -1
  7305. -   person_event SPRITE_POKEFAN_M, 3, 5, $8, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x54997, -1
  7306. -   person_event SPRITE_TWIN, 6, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x5499a, -1
  7307. +   person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x54953, -1
  7308. +   person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x54997, -1
  7309. +   person_event SPRITE_TWIN, 6, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x5499a, -1
  7310. diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
  7311. index 218ca08..acc0bd9 100644
  7312. --- a/maps/GoldenrodMagnetTrainStation.asm
  7313. +++ b/maps/GoldenrodMagnetTrainStation.asm
  7314. @@ -3,7 +3,7 @@ GoldenrodMagnetTrainStation_MapScriptHeader:
  7315.     db 1
  7316.  
  7317.     ; triggers
  7318.     dw .Trigger1, $0000
  7319.  
  7320.  .MapCallbacks:
  7321.     db 0
  7322. @@ -182,5 +182,5 @@ GoldenrodMagnetTrainStation_MapEventHeader:
  7323.  
  7324.  .PersonEvents:
  7325.     db 2
  7326. -   person_event SPRITE_OFFICER, 9, 9, $6, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x550ec, -1
  7327. -   person_event SPRITE_GENTLEMAN, 14, 11, $2, 2, 2, -1, -1, 0, 0, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
  7328. +   person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x550ec, -1
  7329. +   person_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
  7330. diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm
  7331. index ff13bb6..e4228f4 100644
  7332. --- a/maps/GoldenrodNameRatersHouse.asm
  7333. +++ b/maps/GoldenrodNameRatersHouse.asm
  7334. @@ -41,4 +41,4 @@ GoldenrodNameRatersHouse_MapEventHeader:
  7335.  
  7336.  .PersonEvents:
  7337.     db 1
  7338. -   person_event SPRITE_GENTLEMAN, 4, 2, $6, 0, 2, -1, -1, 0, 0, 0, GentlemanScript_0x5577c, -1
  7339. +   person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEFN_06, 0, 2, -1, -1, 0, 0, 0, GentlemanScript_0x5577c, -1
  7340. diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
  7341. index 294849c..402e6e5 100644
  7342. --- a/maps/GoldenrodPPSpeechHouse.asm
  7343. +++ b/maps/GoldenrodPPSpeechHouse.asm
  7344. @@ -67,5 +67,5 @@ GoldenrodPPSpeechHouse_MapEventHeader:
  7345.  
  7346.  .PersonEvents:
  7347.     db 2
  7348. -   person_event SPRITE_FISHER, 4, 2, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x5564a, -1
  7349. -   person_event SPRITE_LASS, 3, 5, $8, 1, 0, -1, -1, 0, 0, 0, LassScript_0x5564d, -1
  7350. +   person_event SPRITE_FISHER, 4, 2, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x5564a, -1
  7351. +   person_event SPRITE_LASS, 3, 5, SPRITEMOVEFN_08, 1, 0, -1, -1, 0, 0, 0, LassScript_0x5564d, -1
  7352. diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm
  7353. index e36bc90..f43a0e6 100644
  7354. --- a/maps/GoldenrodPokeCenter1F.asm
  7355. +++ b/maps/GoldenrodPokeCenter1F.asm
  7356. @@ -818,8 +818,8 @@ GoldenrodPokeCenter1F_MapEventHeader:
  7357.  
  7358.  .PersonEvents:
  7359.     db 5
  7360. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x60f91, -1
  7361. -   person_event SPRITE_LINK_RECEPTIONIST, 8, 16, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, -1
  7362. -   person_event SPRITE_GAMEBOY_KID, 1, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GameboyKidScript_0x6101e, -1
  7363. -   person_event SPRITE_LASS, 4, 1, $5, 0, 1, -1, -1, 0, 0, 0, LassScript_0x61021, -1
  7364. -   person_event SPRITE_POKEFAN_F, 5, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanFScript_0x61024, -1
  7365. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x60f91, -1
  7366. +   person_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, -1
  7367. +   person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GameboyKidScript_0x6101e, -1
  7368. +   person_event SPRITE_LASS, 4, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, LassScript_0x61021, -1
  7369. +   person_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanFScript_0x61024, -1
  7370. diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm
  7371. index 30fb9e7..0bc664e 100644
  7372. --- a/maps/GoldenrodPokeComCenter2FMobile.asm
  7373. +++ b/maps/GoldenrodPokeComCenter2FMobile.asm
  7374. @@ -283,6 +283,6 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader:
  7375.  
  7376.  .PersonEvents:
  7377.     db 3
  7378. -   person_event SPRITE_SCIENTIST, 28, 4, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ScientistScript_0x625d1, -1
  7379. -   person_event SPRITE_SCIENTIST, 27, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x625d4, -1
  7380. -   person_event SPRITE_SCIENTIST, 29, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ScientistScript_0x625d7, -1
  7381. +   person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ScientistScript_0x625d1, -1
  7382. +   person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x625d4, -1
  7383. +   person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ScientistScript_0x625d7, -1
  7384. diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
  7385. index eb6c156..c4d3832 100644
  7386. --- a/maps/GuideGentsHouse.asm
  7387. +++ b/maps/GuideGentsHouse.asm
  7388. @@ -43,4 +43,4 @@ GuideGentsHouse_MapEventHeader:
  7389.  
  7390.  .PersonEvents:
  7391.     db 1
  7392. -   person_event SPRITE_GRAMPS, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
  7393. +   person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
  7394. diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
  7395. index 00ea547..4160fed 100644
  7396. --- a/maps/HallOfFame.asm
  7397. +++ b/maps/HallOfFame.asm
  7398. @@ -3,8 +3,8 @@ HallOfFame_MapScriptHeader:
  7399.     db 2
  7400.  
  7401.     ; triggers
  7402.     dw .Trigger1, $0000
  7403.     dw .Trigger2, $0000
  7404.  
  7405.  .MapCallbacks:
  7406.     db 0
  7407. @@ -126,4 +126,4 @@ HallOfFame_MapEventHeader:
  7408.  
  7409.  .PersonEvents:
  7410.     db 1
  7411. -   person_event SPRITE_LANCE, 12, 4, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
  7412. +   person_event SPRITE_LANCE, 12, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
  7413. diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
  7414. index 5e8dc3a..7a07191 100644
  7415. --- a/maps/IcePath1F.asm
  7416. +++ b/maps/IcePath1F.asm
  7417. @@ -33,6 +33,6 @@ IcePath1F_MapEventHeader:
  7418.  
  7419.  .PersonEvents:
  7420.     db 3
  7421. -   person_event SPRITE_POKE_BALL, 7, 31, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL
  7422. -   person_event SPRITE_POKE_BALL, 23, 32, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP
  7423. -   person_event SPRITE_POKE_BALL, 9, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN
  7424. +   person_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL
  7425. +   person_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP
  7426. +   person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN
  7427. diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
  7428. index 74ec802..6056195 100644
  7429. --- a/maps/IcePathB1F.asm
  7430. +++ b/maps/IcePathB1F.asm
  7431. @@ -107,8 +107,8 @@ IcePathB1F_MapEventHeader:
  7432.  
  7433.  .PersonEvents:
  7434.     db 5
  7435. -   person_event SPRITE_BOULDER, 7, 11, $19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
  7436. -   person_event SPRITE_BOULDER, 8, 7, $19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
  7437. -   person_event SPRITE_BOULDER, 9, 8, $19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
  7438. -   person_event SPRITE_BOULDER, 7, 17, $19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
  7439. -   person_event SPRITE_POKE_BALL, 35, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON
  7440. +   person_event SPRITE_BOULDER, 7, 11, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
  7441. +   person_event SPRITE_BOULDER, 8, 7, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
  7442. +   person_event SPRITE_BOULDER, 9, 8, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
  7443. +   person_event SPRITE_BOULDER, 7, 17, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
  7444. +   person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON
  7445. diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
  7446. index 5e31ea6..803e129 100644
  7447. --- a/maps/IcePathB2FBlackthornSide.asm
  7448. +++ b/maps/IcePathB2FBlackthornSide.asm
  7449. @@ -30,4 +30,4 @@ IcePathB2FBlackthornSide_MapEventHeader:
  7450.  
  7451.  .PersonEvents:
  7452.     db 1
  7453. -   person_event SPRITE_POKE_BALL, 16, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e646, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
  7454. +   person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e646, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
  7455. diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
  7456. index 09d3766..5669f86 100644
  7457. --- a/maps/IcePathB2FMahoganySide.asm
  7458. +++ b/maps/IcePathB2FMahoganySide.asm
  7459. @@ -45,9 +45,9 @@ IcePathB2FMahoganySide_MapEventHeader:
  7460.  
  7461.  .PersonEvents:
  7462.     db 6
  7463. -   person_event SPRITE_BOULDER, 3, 11, $1, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A
  7464. -   person_event SPRITE_BOULDER, 7, 4, $1, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A
  7465. -   person_event SPRITE_BOULDER, 12, 3, $1, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A
  7466. -   person_event SPRITE_BOULDER, 13, 12, $1, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A
  7467. -   person_event SPRITE_POKE_BALL, 9, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e5a6, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
  7468. -   person_event SPRITE_POKE_BALL, 2, 0, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e5a8, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
  7469. +   person_event SPRITE_BOULDER, 3, 11, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A
  7470. +   person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A
  7471. +   person_event SPRITE_BOULDER, 12, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A
  7472. +   person_event SPRITE_BOULDER, 13, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A
  7473. +   person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e5a6, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
  7474. +   person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e5a8, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
  7475. diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
  7476. index 1be274d..97a474f 100644
  7477. --- a/maps/IcePathB3F.asm
  7478. +++ b/maps/IcePathB3F.asm
  7479. @@ -28,5 +28,5 @@ IcePathB3F_MapEventHeader:
  7480.  
  7481.  .PersonEvents:
  7482.     db 2
  7483. -   person_event SPRITE_POKE_BALL, 7, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE
  7484. -   person_event SPRITE_ROCK, 6, 6, $18, 0, 0, -1, -1, 0, 0, 0, IcePathB3FRock, -1
  7485. +   person_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE
  7486. +   person_event SPRITE_ROCK, 6, 6, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, IcePathB3FRock, -1
  7487. diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
  7488. index cab0b66..2372e5d 100644
  7489. --- a/maps/IlexForest.asm
  7490. +++ b/maps/IlexForest.asm
  7491. @@ -376,7 +376,7 @@ UnknownScript_0x6edf7:
  7492.     end
  7493.  
  7494.  TrainerBug_catcherWayne:
  7495.     trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, $0000, Bug_catcherWayneScript
  7496.  
  7497.  Bug_catcherWayneScript:
  7498.     talkaftercancel
  7499. @@ -950,14 +950,14 @@ IlexForest_MapEventHeader:
  7500.  
  7501.  .PersonEvents:
  7502.     db 11
  7503. -   person_event SPRITE_BIRD, 31, 14, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD
  7504. -   person_event SPRITE_YOUNGSTER, 28, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE
  7505. -   person_event SPRITE_BLACK_BELT, 28, 5, $9, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER
  7506. -   person_event SPRITE_ROCKER, 14, 15, $9, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x6edde, -1
  7507. -   person_event SPRITE_POKE_BALL, 32, 20, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE
  7508. -   person_event SPRITE_KURT, 29, 8, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
  7509. -   person_event SPRITE_LASS, 24, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x6ee0d, EVENT_ILEX_FOREST_LASS
  7510. -   person_event SPRITE_YOUNGSTER, 1, 12, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerBug_catcherWayne, -1
  7511. -   person_event SPRITE_POKE_BALL, 17, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK
  7512. -   person_event SPRITE_POKE_BALL, 7, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE
  7513. -   person_event SPRITE_POKE_BALL, 1, 27, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER
  7514. +   person_event SPRITE_BIRD, 31, 14, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD
  7515. +   person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE
  7516. +   person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER
  7517. +   person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x6edde, -1
  7518. +   person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE
  7519. +   person_event SPRITE_KURT, 29, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
  7520. +   person_event SPRITE_LASS, 24, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x6ee0d, EVENT_ILEX_FOREST_LASS
  7521. +   person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerBug_catcherWayne, -1
  7522. +   person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK
  7523. +   person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE
  7524. +   person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER
  7525. diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
  7526. index 57034a7..df938a2 100644
  7527. --- a/maps/IlexForestAzaleaGate.asm
  7528. +++ b/maps/IlexForestAzaleaGate.asm
  7529. @@ -45,5 +45,5 @@ IlexForestAzaleaGate_MapEventHeader:
  7530.  
  7531.  .PersonEvents:
  7532.     db 2
  7533. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x62c7a, -1
  7534. -   person_event SPRITE_GRANNY, 3, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x62c7d, -1
  7535. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x62c7a, -1
  7536. +   person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x62c7d, -1
  7537. diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm
  7538. index c4ab11a..eca25c3 100644
  7539. --- a/maps/IndigoPlateauPokeCenter1F.asm
  7540. +++ b/maps/IndigoPlateauPokeCenter1F.asm
  7541. @@ -3,7 +3,7 @@ IndigoPlateauPokeCenter1F_MapScriptHeader:
  7542.     db 1
  7543.  
  7544.     ; triggers
  7545.     dw UnknownScript_0x180009, $0000
  7546.  
  7547.  .MapCallbacks:
  7548.     db 1
  7549. @@ -319,9 +319,9 @@ IndigoPlateauPokeCenter1F_MapEventHeader:
  7550.  
  7551.  .PersonEvents:
  7552.     db 6
  7553. -   person_event SPRITE_NURSE, 7, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18012c, -1
  7554. -   person_event SPRITE_CLERK, 7, 11, $6, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18012f, -1
  7555. -   person_event SPRITE_COOLTRAINER_M, 11, 11, $2, 2, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x180136, -1
  7556. -   person_event SPRITE_SILVER, 9, 16, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
  7557. -   person_event SPRITE_GRAMPS, 9, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
  7558. -   person_event SPRITE_JYNX, 9, 0, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, AbraScript, EVENT_TELEPORT_GUY
  7559. +   person_event SPRITE_NURSE, 7, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18012c, -1
  7560. +   person_event SPRITE_CLERK, 7, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18012f, -1
  7561. +   person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x180136, -1
  7562. +   person_event SPRITE_SILVER, 9, 16, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
  7563. +   person_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
  7564. +   person_event SPRITE_JYNX, 9, 0, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, AbraScript, EVENT_TELEPORT_GUY
  7565. diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
  7566. index 978aaac..5ca7145 100644
  7567. --- a/maps/KarensRoom.asm
  7568. +++ b/maps/KarensRoom.asm
  7569. @@ -3,8 +3,8 @@ KarensRoom_MapScriptHeader:
  7570.     db 2
  7571.  
  7572.     ; triggers
  7573.     dw UnknownScript_0x180bbc, $0000
  7574.     dw UnknownScript_0x180bc0, $0000
  7575.  
  7576.  .MapCallbacks:
  7577.     db 1
  7578. @@ -52,7 +52,7 @@ KarenScript_0x180bee:
  7579.     writetext UnknownText_0x180c27
  7580.     closetext
  7581.     loadmovesprites
  7582.     winlosstext UnknownText_0x180cf8, $0000
  7583.     loadtrainer KAREN, 1
  7584.     startbattle
  7585.     returnafterbattle
  7586. @@ -153,4 +153,4 @@ KarensRoom_MapEventHeader:
  7587.  
  7588.  .PersonEvents:
  7589.     db 1
  7590. -   person_event SPRITE_KAREN, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KarenScript_0x180bee, -1
  7591. +   person_event SPRITE_KAREN, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KarenScript_0x180bee, -1
  7592. diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
  7593. index 0b2dfa8..42e8eb9 100644
  7594. --- a/maps/KogasRoom.asm
  7595. +++ b/maps/KogasRoom.asm
  7596. @@ -3,8 +3,8 @@ KogasRoom_MapScriptHeader:
  7597.     db 2
  7598.  
  7599.     ; triggers
  7600.     dw UnknownScript_0x180728, $0000
  7601.     dw UnknownScript_0x18072c, $0000
  7602.  
  7603.  .MapCallbacks:
  7604.     db 1
  7605. @@ -52,7 +52,7 @@ KogaScript_0x18075a:
  7606.     writetext UnknownText_0x180793
  7607.     closetext
  7608.     loadmovesprites
  7609.     winlosstext UnknownText_0x1808a9, $0000
  7610.     loadtrainer KOGA, 1
  7611.     startbattle
  7612.     returnafterbattle
  7613. @@ -150,4 +150,4 @@ KogasRoom_MapEventHeader:
  7614.  
  7615.  .PersonEvents:
  7616.     db 1
  7617. -   person_event SPRITE_KOGA, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, KogaScript_0x18075a, -1
  7618. +   person_event SPRITE_KOGA, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, KogaScript_0x18075a, -1
  7619. diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm
  7620. index 50f32a5..3388d9e 100644
  7621. --- a/maps/KrissHouse1F.asm
  7622. +++ b/maps/KrissHouse1F.asm
  7623. @@ -3,8 +3,8 @@ KrissHouse1F_MapScriptHeader:
  7624.     db 2
  7625.  
  7626.     ; triggers
  7627.     dw UnknownScript_0x7a4d6, $0000
  7628.     dw UnknownScript_0x7a4d7, $0000
  7629.  
  7630.  .MapCallbacks:
  7631.     db 0
  7632. @@ -404,8 +404,8 @@ KrissHouse1F_MapEventHeader:
  7633.  
  7634.  .PersonEvents:
  7635.     db 5
  7636. -   person_event SPRITE_MOM, 4, 7, $8, 0, 0, -1, -1, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
  7637. -   person_event SPRITE_MOM, 2, 2, $7, 0, 0, -1, 1, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7638. -   person_event SPRITE_MOM, 4, 7, $8, 0, 0, -1, 2, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7639. -   person_event SPRITE_MOM, 2, 0, $7, 0, 0, -1, 4, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7640. -   person_event SPRITE_POKEFAN_F, 4, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR
  7641. +   person_event SPRITE_MOM, 4, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
  7642. +   person_event SPRITE_MOM, 2, 2, SPRITEMOVEFN_07, 0, 0, -1, 1, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7643. +   person_event SPRITE_MOM, 4, 7, SPRITEMOVEFN_08, 0, 0, -1, 2, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7644. +   person_event SPRITE_MOM, 2, 0, SPRITEMOVEFN_07, 0, 0, -1, 4, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7645. +   person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR
  7646. diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm
  7647. index 62ec48b..2106585 100644
  7648. --- a/maps/KrissHouse2F.asm
  7649. +++ b/maps/KrissHouse2F.asm
  7650. @@ -132,7 +132,7 @@ KrissHouse2F_MapEventHeader:
  7651.  
  7652.  .PersonEvents:
  7653.     db 4
  7654. -   person_event SPRITE_CONSOLE, 2, 4, $1, 0, 0, -1, -1, 0, 0, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
  7655. -   person_event SPRITE_DOLL_1, 4, 4, $1, 0, 0, -1, -1, 0, 0, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
  7656. -   person_event SPRITE_DOLL_2, 4, 5, $1, 0, 0, -1, -1, 0, 0, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
  7657. -   person_event SPRITE_BIG_DOLL, 1, 0, $21, 0, 0, -1, -1, 0, 0, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
  7658. +   person_event SPRITE_CONSOLE, 2, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
  7659. +   person_event SPRITE_DOLL_1, 4, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
  7660. +   person_event SPRITE_DOLL_2, 4, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
  7661. +   person_event SPRITE_BIG_DOLL, 1, 0, SPRITEMOVEFN_21, 0, 0, -1, -1, 0, 0, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
  7662. diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm
  7663. index defaf84..5226bca 100644
  7664. --- a/maps/KrissNeighborsHouse.asm
  7665. +++ b/maps/KrissNeighborsHouse.asm
  7666. @@ -114,5 +114,5 @@ KrissNeighborsHouse_MapEventHeader:
  7667.  
  7668.  .PersonEvents:
  7669.     db 2
  7670. -   person_event SPRITE_COOLTRAINER_F, 3, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KrissNeighborsDaughter, -1
  7671. -   person_event SPRITE_POKEFAN_F, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
  7672. +   person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KrissNeighborsDaughter, -1
  7673. +   person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
  7674. diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
  7675. index 5a43e1e..54b4902 100644
  7676. --- a/maps/KurtsHouse.asm
  7677. +++ b/maps/KurtsHouse.asm
  7678. @@ -696,8 +696,8 @@ KurtsHouse_MapEventHeader:
  7679.  
  7680.  .PersonEvents:
  7681.     db 5
  7682. -   person_event SPRITE_KURT, 2, 3, $6, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
  7683. -   person_event SPRITE_TWIN, 3, 5, $3, 0, 0, -1, -1, 0, 0, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
  7684. -   person_event SPRITE_SLOWPOKE, 3, 6, $1, 0, 0, -1, -1, 0, 0, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
  7685. -   person_event SPRITE_KURT, 3, 14, $7, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
  7686. -   person_event SPRITE_TWIN, 4, 11, $9, 0, 0, -1, -1, 0, 0, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
  7687. +   person_event SPRITE_KURT, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
  7688. +   person_event SPRITE_TWIN, 3, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
  7689. +   person_event SPRITE_SLOWPOKE, 3, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
  7690. +   person_event SPRITE_KURT, 3, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
  7691. +   person_event SPRITE_TWIN, 4, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
  7692. diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm
  7693. index 8fabac5..7e90e9f 100644
  7694. --- a/maps/LakeofRage.asm
  7695. +++ b/maps/LakeofRage.asm
  7696. @@ -3,8 +3,8 @@ LakeofRage_MapScriptHeader:
  7697.     db 2
  7698.  
  7699.     ; triggers
  7700.     dw .Trigger1, $0000
  7701.     dw .Trigger2, $0000
  7702.  
  7703.  .MapCallbacks:
  7704.     db 2
  7705. @@ -137,7 +137,7 @@ UnknownScript_0x700b8:
  7706.     end
  7707.  
  7708.  TrainerFisherAndre:
  7709.     trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, $0000, FisherAndreScript
  7710.  
  7711.  FisherAndreScript:
  7712.     talkaftercancel
  7713. @@ -148,7 +148,7 @@ FisherAndreScript:
  7714.     end
  7715.  
  7716.  TrainerFisherRaymond:
  7717.     trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, $0000, FisherRaymondScript
  7718.  
  7719.  FisherRaymondScript:
  7720.     talkaftercancel
  7721. @@ -159,7 +159,7 @@ FisherRaymondScript:
  7722.     end
  7723.  
  7724.  TrainerCooltrainermAaron:
  7725.     trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, $0000, CooltrainermAaronScript
  7726.  
  7727.  CooltrainermAaronScript:
  7728.     talkaftercancel
  7729. @@ -170,7 +170,7 @@ CooltrainermAaronScript:
  7730.     end
  7731.  
  7732.  TrainerCooltrainerfLois:
  7733.     trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, $0000, CooltrainerfLoisScript
  7734.  
  7735.  CooltrainerfLoisScript:
  7736.     talkaftercancel
  7737. @@ -509,15 +509,15 @@ LakeofRage_MapEventHeader:
  7738.  
  7739.  .PersonEvents:
  7740.     db 12
  7741. -   person_event SPRITE_LANCE, 28, 21, $7, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
  7742. -   person_event SPRITE_GRAMPS, 26, 20, $7, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x7008e, -1
  7743. -   person_event SPRITE_SUPER_NERD, 13, 36, $8, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x700a2, -1
  7744. -   person_event SPRITE_COOLTRAINER_F, 29, 25, $5, 0, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x700a5, -1
  7745. -   person_event SPRITE_FISHER, 23, 30, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
  7746. -   person_event SPRITE_FISHER, 26, 24, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
  7747. -   person_event SPRITE_COOLTRAINER_M, 15, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
  7748. -   person_event SPRITE_COOLTRAINER_F, 7, 36, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
  7749. -   person_event SPRITE_GYARADOS, 22, 18, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
  7750. -   person_event SPRITE_SUPER_NERD, 4, 4, $6, 0, 0, -1, -1, 0, 0, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
  7751. -   person_event SPRITE_POKE_BALL, 10, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER
  7752. -   person_event SPRITE_POKE_BALL, 2, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT
  7753. +   person_event SPRITE_LANCE, 28, 21, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
  7754. +   person_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x7008e, -1
  7755. +   person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x700a2, -1
  7756. +   person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x700a5, -1
  7757. +   person_event SPRITE_FISHER, 23, 30, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
  7758. +   person_event SPRITE_FISHER, 26, 24, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
  7759. +   person_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
  7760. +   person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
  7761. +   person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
  7762. +   person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
  7763. +   person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER
  7764. +   person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT
  7765. diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm
  7766. index caf510f..a61c7bd 100644
  7767. --- a/maps/LakeofRageHiddenPowerHouse.asm
  7768. +++ b/maps/LakeofRageHiddenPowerHouse.asm
  7769. @@ -83,4 +83,4 @@ LakeofRageHiddenPowerHouse_MapEventHeader:
  7770.  
  7771.  .PersonEvents:
  7772.     db 1
  7773. -   person_event SPRITE_FISHER, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, HiddenPowerGuy, -1
  7774. +   person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, HiddenPowerGuy, -1
  7775. diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm
  7776. index 42b3ffa..85f776d 100644
  7777. --- a/maps/LakeofRageMagikarpHouse.asm
  7778. +++ b/maps/LakeofRageMagikarpHouse.asm
  7779. @@ -221,4 +221,4 @@ LakeofRageMagikarpHouse_MapEventHeader:
  7780.  
  7781.  .PersonEvents:
  7782.     db 1
  7783. -   person_event SPRITE_FISHING_GURU, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x19a6ae, -1
  7784. +   person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x19a6ae, -1
  7785. diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
  7786. index aaa239c..5d6b388 100644
  7787. --- a/maps/LancesRoom.asm
  7788. +++ b/maps/LancesRoom.asm
  7789. @@ -3,8 +3,8 @@ LancesRoom_MapScriptHeader:
  7790.     db 2
  7791.  
  7792.     ; triggers
  7793.     dw UnknownScript_0x180e39, $0000
  7794.     dw UnknownScript_0x180e3d, $0000
  7795.  
  7796.  .MapCallbacks:
  7797.     db 1
  7798. @@ -57,7 +57,7 @@ LanceScript_0x180e7b:
  7799.     writetext UnknownText_0x180f67
  7800.     closetext
  7801.     loadmovesprites
  7802.     winlosstext UnknownText_0x1810a4, $0000
  7803.     setlasttalked $2
  7804.     loadtrainer CHAMPION, LANCE
  7805.     startbattle
  7806. @@ -358,6 +358,6 @@ LancesRoom_MapEventHeader:
  7807.  
  7808.  .PersonEvents:
  7809.     db 3
  7810. -   person_event SPRITE_LANCE, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x180e7b, -1
  7811. -   person_event SPRITE_TEACHER, 7, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
  7812. -   person_event SPRITE_OAK, 7, 4, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
  7813. +   person_event SPRITE_LANCE, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x180e7b, -1
  7814. +   person_event SPRITE_TEACHER, 7, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
  7815. +   person_event SPRITE_OAK, 7, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
  7816. diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
  7817. index 7f7d82d..aa9082e 100644
  7818. --- a/maps/LavRadioTower1F.asm
  7819. +++ b/maps/LavRadioTower1F.asm
  7820. @@ -233,8 +233,8 @@ LavRadioTower1F_MapEventHeader:
  7821.  
  7822.  .PersonEvents:
  7823.     db 5
  7824. -   person_event SPRITE_RECEPTIONIST, 6, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x7ee63, -1
  7825. -   person_event SPRITE_OFFICER, 1, 15, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x7ee66, -1
  7826. -   person_event SPRITE_SUPER_NERD, 3, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x7ee69, -1
  7827. -   person_event SPRITE_GENTLEMAN, 1, 9, $7, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x7ee6c, -1
  7828. -   person_event SPRITE_SUPER_NERD, 6, 14, $9, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7eea2, -1
  7829. +   person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x7ee63, -1
  7830. +   person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x7ee66, -1
  7831. +   person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x7ee69, -1
  7832. +   person_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x7ee6c, -1
  7833. +   person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7eea2, -1
  7834. diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
  7835. index f6b7823..119bee6 100644
  7836. --- a/maps/LavenderMart.asm
  7837. +++ b/maps/LavenderMart.asm
  7838. @@ -59,6 +59,6 @@ LavenderMart_MapEventHeader:
  7839.  
  7840.  .PersonEvents:
  7841.     db 3
  7842. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x7eb1c, -1
  7843. -   person_event SPRITE_POKEFAN_M, 6, 6, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x7eb23, -1
  7844. -   person_event SPRITE_ROCKER, 2, 9, $3, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x7eb26, -1
  7845. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x7eb1c, -1
  7846. +   person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x7eb23, -1
  7847. +   person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x7eb26, -1
  7848. diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
  7849. index e00fab6..fd72806 100644
  7850. --- a/maps/LavenderNameRater.asm
  7851. +++ b/maps/LavenderNameRater.asm
  7852. @@ -3,7 +3,7 @@ LavenderNameRater_MapScriptHeader:
  7853.     db 1
  7854.  
  7855.     ; triggers
  7856.     dw UnknownScript_0x7eaf1, $0000
  7857.  
  7858.  .MapCallbacks:
  7859.     db 0
  7860. @@ -40,4 +40,4 @@ LavenderNameRater_MapEventHeader:
  7861.  
  7862.  .PersonEvents:
  7863.     db 1
  7864. -   person_event SPRITE_GENTLEMAN, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LavenderNameRater, -1
  7865. +   person_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LavenderNameRater, -1
  7866. diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm
  7867. index ee1a4bf..f297376 100644
  7868. --- a/maps/LavenderPokeCenter1F.asm
  7869. +++ b/maps/LavenderPokeCenter1F.asm
  7870. @@ -92,7 +92,7 @@ LavenderPokeCenter1F_MapEventHeader:
  7871.  
  7872.  .PersonEvents:
  7873.     db 4
  7874. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x7e6a0, -1
  7875. -   person_event SPRITE_GENTLEMAN, 6, 7, $5, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x7e6a3, -1
  7876. -   person_event SPRITE_TEACHER, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7e6a6, -1
  7877. -   person_event SPRITE_YOUNGSTER, 5, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7e6a9, -1
  7878. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x7e6a0, -1
  7879. +   person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x7e6a3, -1
  7880. +   person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7e6a6, -1
  7881. +   person_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7e6a9, -1
  7882. diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
  7883. index 65b6054..275cae7 100644
  7884. --- a/maps/LavenderTown.asm
  7885. +++ b/maps/LavenderTown.asm
  7886. @@ -129,7 +129,7 @@ LavenderTown_MapEventHeader:
  7887.  
  7888.  .PersonEvents:
  7889.     db 4
  7890. -   person_event SPRITE_POKEFAN_M, 7, 12, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1ad6e4, -1
  7891. -   person_event SPRITE_TEACHER, 15, 2, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1ad6e7, -1
  7892. -   person_event SPRITE_GRAMPS, 12, 14, $7, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1ad6ea, -1
  7893. -   person_event SPRITE_YOUNGSTER, 11, 6, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 1, YoungsterScript_0x1ad6ed, -1
  7894. +   person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1ad6e4, -1
  7895. +   person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1ad6e7, -1
  7896. +   person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1ad6ea, -1
  7897. +   person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 1, YoungsterScript_0x1ad6ed, -1
  7898. diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm
  7899. index 37d0677..9f0cb0f 100644
  7900. --- a/maps/LavenderTownSpeechHouse.asm
  7901. +++ b/maps/LavenderTownSpeechHouse.asm
  7902. @@ -44,4 +44,4 @@ LavenderTownSpeechHouse_MapEventHeader:
  7903.  
  7904.  .PersonEvents:
  7905.     db 1
  7906. -   person_event SPRITE_POKEFAN_F, 3, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x7ea47, -1
  7907. +   person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x7ea47, -1
  7908. diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
  7909. index 9616d1a..fd30455 100644
  7910. --- a/maps/MahoganyGym.asm
  7911. +++ b/maps/MahoganyGym.asm
  7912. @@ -13,7 +13,7 @@ PryceScript_0x199a9e:
  7913.     writetext UnknownText_0x199b8d
  7914.     closetext
  7915.     loadmovesprites
  7916.     winlosstext UnknownText_0x199cb3, $0000
  7917.     loadtrainer PRYCE, 1
  7918.     startbattle
  7919.     returnafterbattle
  7920. @@ -62,7 +62,7 @@ MahoganyGymTriggerRockets:
  7921.     jumpstd radiotowerrockets
  7922.  
  7923.  TrainerSkierRoxanne:
  7924.     trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, $0000, SkierRoxanneScript
  7925.  
  7926.  SkierRoxanneScript:
  7927.     talkaftercancel
  7928. @@ -73,7 +73,7 @@ SkierRoxanneScript:
  7929.     end
  7930.  
  7931.  TrainerSkierClarissa:
  7932.     trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, $0000, SkierClarissaScript
  7933.  
  7934.  SkierClarissaScript:
  7935.     talkaftercancel
  7936. @@ -84,7 +84,7 @@ SkierClarissaScript:
  7937.     end
  7938.  
  7939.  TrainerBoarderRonald:
  7940.     trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, $0000, BoarderRonaldScript
  7941.  
  7942.  BoarderRonaldScript:
  7943.     talkaftercancel
  7944. @@ -95,7 +95,7 @@ BoarderRonaldScript:
  7945.     end
  7946.  
  7947.  TrainerBoarderBrad:
  7948.     trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, $0000, BoarderBradScript
  7949.  
  7950.  BoarderBradScript:
  7951.     talkaftercancel
  7952. @@ -106,7 +106,7 @@ BoarderBradScript:
  7953.     end
  7954.  
  7955.  TrainerBoarderDouglas:
  7956.     trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, $0000, BoarderDouglasScript
  7957.  
  7958.  BoarderDouglasScript:
  7959.     talkaftercancel
  7960. @@ -382,10 +382,10 @@ MahoganyGym_MapEventHeader:
  7961.  
  7962.  .PersonEvents:
  7963.     db 7
  7964. -   person_event SPRITE_PRYCE, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PryceScript_0x199a9e, -1
  7965. -   person_event SPRITE_BUENA, 6, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerSkierRoxanne, -1
  7966. -   person_event SPRITE_ROCKER, 17, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderRonald, -1
  7967. -   person_event SPRITE_BUENA, 17, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerSkierClarissa, -1
  7968. -   person_event SPRITE_ROCKER, 9, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderBrad, -1
  7969. -   person_event SPRITE_ROCKER, 4, 2, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderDouglas, -1
  7970. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MahoganyGymGuyScript, -1
  7971. +   person_event SPRITE_PRYCE, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PryceScript_0x199a9e, -1
  7972. +   person_event SPRITE_BUENA, 6, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerSkierRoxanne, -1
  7973. +   person_event SPRITE_ROCKER, 17, 0, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderRonald, -1
  7974. +   person_event SPRITE_BUENA, 17, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerSkierClarissa, -1
  7975. +   person_event SPRITE_ROCKER, 9, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderBrad, -1
  7976. +   person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderDouglas, -1
  7977. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MahoganyGymGuyScript, -1
  7978. diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
  7979. index 815e53b..caadee4 100644
  7980. --- a/maps/MahoganyMart1F.asm
  7981. +++ b/maps/MahoganyMart1F.asm
  7982. @@ -3,8 +3,8 @@ MahoganyMart1F_MapScriptHeader:
  7983.     db 2
  7984.  
  7985.     ; triggers
  7986.     dw UnknownScript_0x6c356, $0000
  7987.     dw UnknownScript_0x6c357, $0000
  7988.  
  7989.  .MapCallbacks:
  7990.     db 1
  7991. @@ -236,8 +236,8 @@ MahoganyMart1F_MapEventHeader:
  7992.  
  7993.  .PersonEvents:
  7994.     db 5
  7995. -   person_event SPRITE_PHARMACIST, 3, 4, $6, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
  7996. -   person_event SPRITE_BLACK_BELT, 6, 1, $3, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
  7997. -   person_event SPRITE_LANCE, 6, 4, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
  7998. -   person_event SPRITE_DRAGON, 6, 3, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
  7999. -   person_event SPRITE_GRANNY, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
  8000. +   person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
  8001. +   person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
  8002. +   person_event SPRITE_LANCE, 6, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
  8003. +   person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
  8004. +   person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
  8005. diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm
  8006. index f7f8a39..406fee8 100644
  8007. --- a/maps/MahoganyPokeCenter1F.asm
  8008. +++ b/maps/MahoganyPokeCenter1F.asm
  8009. @@ -65,7 +65,7 @@ MahoganyPokeCenter1F_MapEventHeader:
  8010.  
  8011.  .PersonEvents:
  8012.     db 4
  8013. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19a356, -1
  8014. -   person_event SPRITE_POKEFAN_M, 2, 7, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x19a359, -1
  8015. -   person_event SPRITE_YOUNGSTER, 3, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x19a35c, -1
  8016. -   person_event SPRITE_COOLTRAINER_F, 3, 2, $8, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x19a35f, -1
  8017. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19a356, -1
  8018. +   person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x19a359, -1
  8019. +   person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x19a35c, -1
  8020. +   person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x19a35f, -1
  8021. diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
  8022. index e8f3f71..f4590e1 100644
  8023. --- a/maps/MahoganyRedGyaradosSpeechHouse.asm
  8024. +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
  8025. @@ -73,5 +73,5 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader:
  8026.  
  8027.  .PersonEvents:
  8028.     db 2
  8029. -   person_event SPRITE_BLACK_BELT, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x19997f, -1
  8030. -   person_event SPRITE_TEACHER, 5, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x199982, -1
  8031. +   person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x19997f, -1
  8032. +   person_event SPRITE_TEACHER, 5, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x199982, -1
  8033. diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
  8034. index fd58269..7f48aa2 100644
  8035. --- a/maps/MahoganyTown.asm
  8036. +++ b/maps/MahoganyTown.asm
  8037. @@ -3,8 +3,8 @@ MahoganyTown_MapScriptHeader:
  8038.     db 2
  8039.  
  8040.     ; triggers
  8041.     dw .Trigger1, $0000
  8042.     dw .Trigger2, $0000
  8043.  
  8044.  .MapCallbacks:
  8045.     db 1
  8046. @@ -268,7 +268,7 @@ MahoganyTown_MapEventHeader:
  8047.  
  8048.  .PersonEvents:
  8049.     db 4
  8050. -   person_event SPRITE_POKEFAN_M, 8, 19, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
  8051. -   person_event SPRITE_GRAMPS, 9, 6, $5, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1
  8052. -   person_event SPRITE_FISHER, 14, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
  8053. -   person_event SPRITE_LASS, 8, 12, $6, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS
  8054. +   person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
  8055. +   person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1
  8056. +   person_event SPRITE_FISHER, 14, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
  8057. +   person_event SPRITE_LASS, 8, 12, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS
  8058. diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
  8059. index 3b68cfc..503db4e 100644
  8060. --- a/maps/ManiasHouse.asm
  8061. +++ b/maps/ManiasHouse.asm
  8062. @@ -5,90 +5,90 @@ ManiasHouse_MapScriptHeader:
  8063.  .MapCallbacks:
  8064.     db 0
  8065.  
  8066. -RockerScript_0x9d278:
  8067. +ManiaScript:
  8068.     faceplayer
  8069.     loadfont
  8070.     checkevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
  8071. -   iftrue UnknownScript_0x9d2fa
  8072. +   iftrue .default_postevent
  8073.     checkevent EVENT_GOT_SHUCKIE
  8074. -   iftrue UnknownScript_0x9d2a4
  8075. -   writetext UnknownText_0x9d303
  8076. +   iftrue .alreadyhaveshuckie
  8077. +   writetext ManiaText_AskLookAfterShuckle
  8078.     yesorno
  8079. -   iffalse UnknownScript_0x9d2b6
  8080. +   iffalse .refusetotakeshuckie
  8081.     special SpecialGiveShuckle
  8082. -   iffalse UnknownScript_0x9d2b0
  8083. -   writetext UnknownText_0x9d3ed
  8084. +   iffalse .partyfull
  8085. +   writetext ManiaText_TakeCareOfShuckle
  8086.     keeptextopen
  8087.     waitbutton
  8088. -   writetext UnknownText_0x9d41b
  8089. +   writetext ManiaText_GotShuckle
  8090.     playsound SFX_KEY_ITEM
  8091.     waitbutton
  8092.     loadmovesprites
  8093.     setevent EVENT_GOT_SHUCKIE
  8094.     end
  8095.  
  8096. -UnknownScript_0x9d2a4:
  8097. +.alreadyhaveshuckie:
  8098.     checkflag ENGINE_SHUCKLE_GIVEN
  8099. -   iffalse UnknownScript_0x9d2bc
  8100. -   writetext UnknownText_0x9d3ed
  8101. +   iffalse .returnshuckie
  8102. +   writetext ManiaText_TakeCareOfShuckle
  8103.     closetext
  8104.     loadmovesprites
  8105.     end
  8106.  
  8107. -UnknownScript_0x9d2b0:
  8108. -   writetext UnknownText_0x9d42f
  8109. +.partyfull:
  8110. +   writetext ManiaText_PartyFull
  8111.     closetext
  8112.     loadmovesprites
  8113.     end
  8114.  
  8115. -UnknownScript_0x9d2b6:
  8116. -   writetext UnknownText_0x9d449
  8117. +.refusetotakeshuckie:
  8118. +   writetext ManiaText_IfHeComesBack
  8119.     closetext
  8120.     loadmovesprites
  8121.     end
  8122.  
  8123. -UnknownScript_0x9d2bc:
  8124. -   writetext UnknownText_0x9d470
  8125. +.returnshuckie:
  8126. +   writetext ManiaText_CanIHaveMyMonBack
  8127.     yesorno
  8128. -   iffalse UnknownScript_0x9d2ee
  8129. +   iffalse .refused
  8130.     special SpecialReturnShuckle
  8131. -   if_equal $0, UnknownScript_0x9d2df
  8132. -   if_equal $1, UnknownScript_0x9d2ee
  8133. -   if_equal $3, UnknownScript_0x9d2e5
  8134. -   if_equal $4, UnknownScript_0x9d2fa
  8135. -   writetext UnknownText_0x9d4b1
  8136. +   if_equal $0, .wrong
  8137. +   if_equal $1, .refused
  8138. +   if_equal $3, .superhappy
  8139. +   if_equal $4, .default_postevent
  8140. +   writetext ManiaText_ThankYou
  8141.     closetext
  8142.     loadmovesprites
  8143.     setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
  8144.     end
  8145.  
  8146. -UnknownScript_0x9d2df:
  8147. -   writetext UnknownText_0x9d4bd
  8148. +.wrong:
  8149. +   writetext ManiaText_ShuckleNotThere
  8150.     closetext
  8151.     loadmovesprites
  8152.     end
  8153.  
  8154. -UnknownScript_0x9d2e5:
  8155. -   writetext UnknownText_0x9d4e3
  8156. +.superhappy:
  8157. +   writetext ManiaText_ShuckleLikesYou
  8158.     closetext
  8159.     loadmovesprites
  8160.     setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
  8161.     end
  8162.  
  8163. -UnknownScript_0x9d2ee:
  8164. -   writetext UnknownText_0x9d53f
  8165. +.refused:
  8166. +   writetext ManiaText_SameAsBeingRobbed
  8167.     closetext
  8168.     loadmovesprites
  8169.     end
  8170.  
  8171. -UnknownScript_0x9d2f4:
  8172. -   writetext UnknownText_0x9d5b0
  8173. +.nothingleft:
  8174. +   writetext ManiaText_ShuckleIsYourLastMon
  8175.     closetext
  8176.     loadmovesprites
  8177.     end
  8178.  
  8179. -UnknownScript_0x9d2fa:
  8180. -   writetext UnknownText_0x9d56c
  8181. +.default_postevent:
  8182. +   writetext ManiaText_HappinessSpeech
  8183.     closetext
  8184.     loadmovesprites
  8185.     end
  8186. @@ -96,7 +96,7 @@ UnknownScript_0x9d2fa:
  8187.  UnknownScript_0x9d300:
  8188.     jumpstd picturebookshelf
  8189.  
  8190. -UnknownText_0x9d303:
  8191. +ManiaText_AskLookAfterShuckle:
  8192.     text "I, I'm in shock!"
  8193.  
  8194.     para "A guy about your"
  8195. @@ -120,30 +120,30 @@ UnknownText_0x9d303:
  8196.     line "for a while?"
  8197.     done
  8198.  
  8199. -UnknownText_0x9d3ed:
  8200. +ManiaText_TakeCareOfShuckle:
  8201.     text "Oh, thank you!"
  8202.  
  8203.     para "Take good care of"
  8204.     line "it, please!"
  8205.     done
  8206.  
  8207. -UnknownText_0x9d41b:
  8208. +ManiaText_GotShuckle:
  8209.     text "<PLAYER> received a"
  8210.     line "#MON."
  8211.     done
  8212.  
  8213. -UnknownText_0x9d42f:
  8214. +ManiaText_PartyFull:
  8215.     text "Your #MON party"
  8216.     line "is full."
  8217.     done
  8218.  
  8219. -UnknownText_0x9d449:
  8220. +ManiaText_IfHeComesBack:
  8221.     text "Oh, no… What'll"
  8222.     line "I do if he comes"
  8223.     cont "back?"
  8224.     done
  8225.  
  8226. -UnknownText_0x9d470:
  8227. +ManiaText_CanIHaveMyMonBack:
  8228.     text "Hi! How's my #-"
  8229.     line "MON?"
  8230.  
  8231. @@ -152,17 +152,17 @@ UnknownText_0x9d470:
  8232.     cont "it back?"
  8233.     done
  8234.  
  8235. -UnknownText_0x9d4b1:
  8236. +ManiaText_ThankYou:
  8237.     text "Thank you!"
  8238.     done
  8239.  
  8240. -UnknownText_0x9d4bd:
  8241. +ManiaText_ShuckleNotThere:
  8242.     text "Hey, you don't"
  8243.     line "have my #MON"
  8244.     cont "with you."
  8245.     done
  8246.  
  8247. -UnknownText_0x9d4e3:
  8248. +ManiaText_ShuckleLikesYou:
  8249.     text "My #MON has"
  8250.     line "come to like you."
  8251.  
  8252. @@ -173,13 +173,13 @@ UnknownText_0x9d4e3:
  8253.     line "be good to it!"
  8254.     done
  8255.  
  8256. -UnknownText_0x9d53f:
  8257. +ManiaText_SameAsBeingRobbed:
  8258.     text "Oh, no, no… That's"
  8259.     line "the same as being"
  8260.     cont "robbed."
  8261.     done
  8262.  
  8263. -UnknownText_0x9d56c:
  8264. +ManiaText_HappinessSpeech:
  8265.     text "For #MON, hap-"
  8266.     line "piness is being"
  8267.  
  8268. @@ -187,7 +187,7 @@ UnknownText_0x9d56c:
  8269.     line "treats them well."
  8270.     done
  8271.  
  8272. -UnknownText_0x9d5b0:
  8273. +ManiaText_ShuckleIsYourLastMon:
  8274.     text "If I take my #-"
  8275.     line "MON back, what are"
  8276.  
  8277. @@ -212,4 +212,4 @@ ManiasHouse_MapEventHeader:
  8278.  
  8279.  .PersonEvents:
  8280.     db 1
  8281. -   person_event SPRITE_ROCKER, 4, 2, $3, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x9d278, -1
  8282. +   person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, ManiaScript, -1
  8283. diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
  8284. index 06dd75a..cd792b4 100644
  8285. --- a/maps/MobileBattleRoom.asm
  8286. +++ b/maps/MobileBattleRoom.asm
  8287. @@ -3,8 +3,8 @@ MobileBattleRoom_MapScriptHeader:
  8288.     db 2
  8289.  
  8290.     ; triggers
  8291.     dw .Trigger1, $0000
  8292.     dw .Trigger2, $0000
  8293.  
  8294.  .MapCallbacks:
  8295.     db 0
  8296. diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
  8297. index bebb824..09837e1 100644
  8298. --- a/maps/MobileTradeRoomMobile.asm
  8299. +++ b/maps/MobileTradeRoomMobile.asm
  8300. @@ -3,8 +3,8 @@ MobileTradeRoomMobile_MapScriptHeader:
  8301.     db 2
  8302.  
  8303.     ; triggers
  8304.     dw .Trigger1, $0000
  8305.     dw .Trigger2, $0000
  8306.  
  8307.  .MapCallbacks:
  8308.     db 0
  8309. diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
  8310. index b8ad92a..b5b0fcd 100644
  8311. --- a/maps/MountMoon.asm
  8312. +++ b/maps/MountMoon.asm
  8313. @@ -3,8 +3,8 @@ MountMoon_MapScriptHeader:
  8314.     db 2
  8315.  
  8316.     ; triggers
  8317.     dw UnknownScript_0x74089, $0000
  8318.     dw UnknownScript_0x7408d, $0000
  8319.  
  8320.  .MapCallbacks:
  8321.     db 0
  8322. @@ -182,4 +182,4 @@ MountMoon_MapEventHeader:
  8323.  
  8324.  .PersonEvents:
  8325.     db 1
  8326. -   person_event SPRITE_SILVER, 3, 7, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
  8327. +   person_event SPRITE_SILVER, 3, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
  8328. diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
  8329. index 29f8ff6..66cf07e 100644
  8330. --- a/maps/MountMoonGiftShop.asm
  8331. +++ b/maps/MountMoonGiftShop.asm
  8332. @@ -38,7 +38,7 @@ MountMoonGiftShop_MapEventHeader:
  8333.  
  8334.  .PersonEvents:
  8335.     db 4
  8336. -   person_event SPRITE_GRAMPS, 3, 4, $6, 0, 0, -1, 1, 0, 0, 0, GrampsScript_0x771a8, -1
  8337. -   person_event SPRITE_GRAMPS, 2, 1, $9, 0, 0, -1, 2, 0, 0, 0, GrampsScript_0x771a8, -1
  8338. -   person_event SPRITE_LASS, 6, 1, $5, 0, 1, -1, 1, 0, 0, 0, LassScript_0x771b0, -1
  8339. -   person_event SPRITE_LASS, 4, 5, $4, 1, 0, -1, 2, 0, 0, 0, LassScript_0x771b0, -1
  8340. +   person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEFN_06, 0, 0, -1, 1, 0, 0, 0, GrampsScript_0x771a8, -1
  8341. +   person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, 2, 0, 0, 0, GrampsScript_0x771a8, -1
  8342. +   person_event SPRITE_LASS, 6, 1, SPRITEMOVEFN_05, 0, 1, -1, 1, 0, 0, 0, LassScript_0x771b0, -1
  8343. +   person_event SPRITE_LASS, 4, 5, SPRITEMOVEFN_04, 1, 0, -1, 2, 0, 0, 0, LassScript_0x771b0, -1
  8344. diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
  8345. index b371ae4..5895143 100644
  8346. --- a/maps/MountMoonSquare.asm
  8347. +++ b/maps/MountMoonSquare.asm
  8348. @@ -3,7 +3,7 @@ MountMoonSquare_MapScriptHeader:
  8349.     db 1
  8350.  
  8351.     ; triggers
  8352.     dw UnknownScript_0x77092, $0000
  8353.  
  8354.  .MapCallbacks:
  8355.     db 2
  8356. @@ -155,6 +155,6 @@ MountMoonSquare_MapEventHeader:
  8357.  
  8358.  .PersonEvents:
  8359.     db 3
  8360. -   person_event SPRITE_FAIRY, 6, 6, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
  8361. -   person_event SPRITE_FAIRY, 6, 7, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
  8362. -   person_event SPRITE_ROCK, 7, 7, $18, 0, 0, -1, -1, 0, 0, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
  8363. +   person_event SPRITE_FAIRY, 6, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
  8364. +   person_event SPRITE_FAIRY, 6, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
  8365. +   person_event SPRITE_ROCK, 7, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
  8366. diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
  8367. index f830f56..6f4c4cc 100644
  8368. --- a/maps/MountMortar1FInside.asm
  8369. +++ b/maps/MountMortar1FInside.asm
  8370. @@ -6,7 +6,7 @@ MountMortar1FInside_MapScriptHeader:
  8371.     db 0
  8372.  
  8373.  TrainerPokemaniacMiller:
  8374.     trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, $0000, PokemaniacMillerScript
  8375.  
  8376.  PokemaniacMillerScript:
  8377.     talkaftercancel
  8378. @@ -17,7 +17,7 @@ PokemaniacMillerScript:
  8379.     end
  8380.  
  8381.  TrainerSupernerdMarkus:
  8382.     trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, $0000, SupernerdMarkusScript
  8383.  
  8384.  SupernerdMarkusScript:
  8385.     talkaftercancel
  8386. @@ -127,13 +127,13 @@ MountMortar1FInside_MapEventHeader:
  8387.  
  8388.  .PersonEvents:
  8389.     db 10
  8390. -   person_event SPRITE_BOULDER, 43, 21, $19, 0, 0, -1, -1, 0, 0, 0, MountMortar1FBoulder, -1
  8391. -   person_event SPRITE_POKE_BALL, 38, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
  8392. -   person_event SPRITE_POKE_BALL, 10, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
  8393. -   person_event SPRITE_POKE_BALL, 27, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
  8394. -   person_event SPRITE_POKE_BALL, 20, 22, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
  8395. -   person_event SPRITE_POKE_BALL, 19, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
  8396. -   person_event SPRITE_SUPER_NERD, 43, 33, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacMiller, -1
  8397. -   person_event SPRITE_SUPER_NERD, 28, 24, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdMarkus, -1
  8398. -   person_event SPRITE_POKE_BALL, 16, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
  8399. -   person_event SPRITE_POKE_BALL, 17, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
  8400. +   person_event SPRITE_BOULDER, 43, 21, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, MountMortar1FBoulder, -1
  8401. +   person_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
  8402. +   person_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
  8403. +   person_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
  8404. +   person_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
  8405. +   person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
  8406. +   person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacMiller, -1
  8407. +   person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdMarkus, -1
  8408. +   person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
  8409. +   person_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
  8410. diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
  8411. index f9c4271..51a87ad 100644
  8412. --- a/maps/MountMortar1FOutside.asm
  8413. +++ b/maps/MountMortar1FOutside.asm
  8414. @@ -40,5 +40,5 @@ MountMortar1FOutside_MapEventHeader:
  8415.  
  8416.  .PersonEvents:
  8417.     db 2
  8418. -   person_event SPRITE_POKE_BALL, 15, 13, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
  8419. -   person_event SPRITE_POKE_BALL, 18, 31, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
  8420. +   person_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
  8421. +   person_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
  8422. diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
  8423. index 5580a35..6c3197a 100644
  8424. --- a/maps/MountMortar2FInside.asm
  8425. +++ b/maps/MountMortar2FInside.asm
  8426. @@ -6,7 +6,7 @@ MountMortar2FInside_MapScriptHeader:
  8427.     db 0
  8428.  
  8429.  TrainerSupernerdHugh:
  8430.     trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, $0000, SupernerdHughScript
  8431.  
  8432.  SupernerdHughScript:
  8433.     talkaftercancel
  8434. @@ -76,10 +76,10 @@ MountMortar2FInside_MapEventHeader:
  8435.  
  8436.  .PersonEvents:
  8437.     db 7
  8438. -   person_event SPRITE_POKE_BALL, 22, 28, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
  8439. -   person_event SPRITE_POKE_BALL, 33, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
  8440. -   person_event SPRITE_POKE_BALL, 17, 19, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e2, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
  8441. -   person_event SPRITE_POKE_BALL, 5, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
  8442. -   person_event SPRITE_POKE_BALL, 11, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
  8443. -   person_event SPRITE_POKE_BALL, 5, 28, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
  8444. -   person_event SPRITE_SUPER_NERD, 26, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdHugh, -1
  8445. +   person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
  8446. +   person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
  8447. +   person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e2, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
  8448. +   person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
  8449. +   person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
  8450. +   person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
  8451. +   person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdHugh, -1
  8452. diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
  8453. index 5ed95af..0c7ae8c 100644
  8454. --- a/maps/MountMortarB1F.asm
  8455. +++ b/maps/MountMortarB1F.asm
  8456. @@ -15,7 +15,7 @@ BlackBeltScript_0x7e1f6:
  8457.     writetext UnknownText_0x7e24d
  8458.     closetext
  8459.     loadmovesprites
  8460.     winlosstext UnknownText_0x7e2a9, $0000
  8461.     loadtrainer BLACKBELT_T, KIYO
  8462.     startbattle
  8463.     returnafterbattle
  8464. @@ -144,10 +144,10 @@ MountMortarB1F_MapEventHeader:
  8465.  
  8466.  .PersonEvents:
  8467.     db 7
  8468. -   person_event SPRITE_POKE_BALL, 12, 29, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
  8469. -   person_event SPRITE_POKE_BALL, 16, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS
  8470. -   person_event SPRITE_BOULDER, 10, 9, $19, 0, 0, -1, -1, 0, 0, 0, MountMortarB1FBoulder, -1
  8471. -   person_event SPRITE_BLACK_BELT, 4, 16, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BlackBeltScript_0x7e1f6, -1
  8472. -   person_event SPRITE_POKE_BALL, 24, 34, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
  8473. -   person_event SPRITE_POKE_BALL, 3, 32, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
  8474. -   person_event SPRITE_POKE_BALL, 26, 21, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP
  8475. +   person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
  8476. +   person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS
  8477. +   person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, MountMortarB1FBoulder, -1
  8478. +   person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BlackBeltScript_0x7e1f6, -1
  8479. +   person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
  8480. +   person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
  8481. +   person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP
  8482. diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
  8483. index f16f6af..ada363a 100644
  8484. --- a/maps/MoveDeletersHouse.asm
  8485. +++ b/maps/MoveDeletersHouse.asm
  8486. @@ -35,4 +35,4 @@ MoveDeletersHouse_MapEventHeader:
  8487.  
  8488.  .PersonEvents:
  8489.     db 1
  8490. -   person_event SPRITE_SUPER_NERD, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, MoveDeleter, -1
  8491. +   person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, MoveDeleter, -1
  8492. diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
  8493. index a3bc193..2874f7b 100644
  8494. --- a/maps/MrFujisHouse.asm
  8495. +++ b/maps/MrFujisHouse.asm
  8496. @@ -91,8 +91,8 @@ MrFujisHouse_MapEventHeader:
  8497.  
  8498.  .PersonEvents:
  8499.     db 5
  8500. -   person_event SPRITE_SUPER_NERD, 1, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x7e8ca, -1
  8501. -   person_event SPRITE_LASS, 4, 3, $2, 1, 1, -1, -1, 0, 0, 0, LassScript_0x7e8cd, -1
  8502. -   person_event SPRITE_RHYDON, 4, 7, $16, 0, 0, -1, -1, 0, 0, 0, MrFujisPsyduck, -1
  8503. -   person_event SPRITE_GROWLITHE, 5, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MrFujisNidorino, -1
  8504. -   person_event SPRITE_MOLTRES, 3, 1, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MrFujisPidgey, -1
  8505. +   person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x7e8ca, -1
  8506. +   person_event SPRITE_LASS, 4, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, LassScript_0x7e8cd, -1
  8507. +   person_event SPRITE_RHYDON, 4, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, MrFujisPsyduck, -1
  8508. +   person_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MrFujisNidorino, -1
  8509. +   person_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MrFujisPidgey, -1
  8510. diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
  8511. index 2600801..d06b3c7 100644
  8512. --- a/maps/MrPokemonsHouse.asm
  8513. +++ b/maps/MrPokemonsHouse.asm
  8514. @@ -3,8 +3,8 @@ MrPokemonsHouse_MapScriptHeader:
  8515.     db 2
  8516.  
  8517.     ; triggers
  8518.     dw UnknownScript_0x196e51, $0000
  8519.     dw UnknownScript_0x196e55, $0000
  8520.  
  8521.  .MapCallbacks:
  8522.     db 0
  8523. @@ -392,5 +392,5 @@ MrPokemonsHouse_MapEventHeader:
  8524.  
  8525.  .PersonEvents:
  8526.     db 2
  8527. -   person_event SPRITE_GENTLEMAN, 5, 3, $9, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196e97, -1
  8528. -   person_event SPRITE_OAK, 5, 6, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
  8529. +   person_event SPRITE_GENTLEMAN, 5, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196e97, -1
  8530. +   person_event SPRITE_OAK, 5, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
  8531. diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
  8532. index 63177f8..9c2e2e9 100644
  8533. --- a/maps/MrPsychicsHouse.asm
  8534. +++ b/maps/MrPsychicsHouse.asm
  8535. @@ -63,4 +63,4 @@ MrPsychicsHouse_MapEventHeader:
  8536.  
  8537.  .PersonEvents:
  8538.     db 1
  8539. -   person_event SPRITE_FISHING_GURU, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MrPsychic, -1
  8540. +   person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MrPsychic, -1
  8541. diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
  8542. index 3c326d1..4f5833a 100644
  8543. --- a/maps/NationalPark.asm
  8544. +++ b/maps/NationalPark.asm
  8545. @@ -56,7 +56,7 @@ GameboyKidScript_0x5c037:
  8546.     end
  8547.  
  8548.  TrainerSchoolboyJack1:
  8549.     trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, $0000, SchoolboyJack1Script
  8550.  
  8551.  SchoolboyJack1Script:
  8552.     writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK
  8553. @@ -86,7 +86,7 @@ UnknownScript_0x5c074:
  8554.  
  8555.  UnknownScript_0x5c088:
  8556.     scall UnknownScript_0x5c114
  8557.     winlosstext SchoolboyJack1BeatenText, $0000
  8558.     copybytetovar wJackFightCount
  8559.     if_equal 4, .Fight4
  8560.     if_equal 3, .Fight3
  8561. @@ -173,7 +173,7 @@ UnknownScript_0x5c114:
  8562.     end
  8563.  
  8564.  TrainerPokefanmWilliam:
  8565.     trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, $0000, PokefanmWilliamScript
  8566.  
  8567.  PokefanmWilliamScript:
  8568.     talkaftercancel
  8569. @@ -184,7 +184,7 @@ PokefanmWilliamScript:
  8570.     end
  8571.  
  8572.  TrainerPokefanfBeverly1:
  8573.     trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, $0000, PokefanfBeverly1Script
  8574.  
  8575.  PokefanfBeverly1Script:
  8576.     writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY
  8577. @@ -263,7 +263,7 @@ UnknownScript_0x5c1ab:
  8578.     end
  8579.  
  8580.  TrainerLassKrise:
  8581.     trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, $0000, LassKriseScript
  8582.  
  8583.  LassKriseScript:
  8584.     talkaftercancel
  8585. @@ -521,17 +521,17 @@ NationalPark_MapEventHeader:
  8586.  
  8587.  .PersonEvents:
  8588.     db 14
  8589. -   person_event SPRITE_LASS, 24, 15, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x5c002, -1
  8590. -   person_event SPRITE_POKEFAN_F, 4, 14, $6, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x5c005, -1
  8591. -   person_event SPRITE_TEACHER, 40, 27, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5c008, -1
  8592. -   person_event SPRITE_YOUNGSTER, 41, 11, $8, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x5c023, -1
  8593. -   person_event SPRITE_YOUNGSTER, 41, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c026, -1
  8594. -   person_event SPRITE_TEACHER, 41, 17, $2, 2, 1, -1, -1, 0, 0, 0, TeacherScript_0x5c029, -1
  8595. -   person_event SPRITE_GROWLITHE, 40, 26, $16, 0, 0, -1, -1, 0, 0, 0, GrowlitheScript_0x5c02c, -1
  8596. -   person_event SPRITE_YOUNGSTER, 23, 27, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyJack1, -1
  8597. -   person_event SPRITE_POKEFAN_F, 29, 18, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerPokefanfBeverly1, -1
  8598. -   person_event SPRITE_POKEFAN_M, 9, 16, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerPokefanmWilliam, -1
  8599. -   person_event SPRITE_LASS, 14, 8, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassKrise, -1
  8600. -   person_event SPRITE_POKE_BALL, 12, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL
  8601. -   person_event SPRITE_GAMEBOY_KID, 6, 26, $6, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x5c037, -1
  8602. -   person_event SPRITE_POKE_BALL, 43, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG
  8603. +   person_event SPRITE_LASS, 24, 15, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x5c002, -1
  8604. +   person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x5c005, -1
  8605. +   person_event SPRITE_TEACHER, 40, 27, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5c008, -1
  8606. +   person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x5c023, -1
  8607. +   person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c026, -1
  8608. +   person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, TeacherScript_0x5c029, -1
  8609. +   person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, GrowlitheScript_0x5c02c, -1
  8610. +   person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyJack1, -1
  8611. +   person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerPokefanfBeverly1, -1
  8612. +   person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerPokefanmWilliam, -1
  8613. +   person_event SPRITE_LASS, 14, 8, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassKrise, -1
  8614. +   person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL
  8615. +   person_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x5c037, -1
  8616. +   person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG
  8617. diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
  8618. index 5e67aac..e0fd05f 100644
  8619. --- a/maps/NationalParkBugContest.asm
  8620. +++ b/maps/NationalParkBugContest.asm
  8621. @@ -230,15 +230,15 @@ NationalParkBugContest_MapEventHeader:
  8622.  
  8623.  .PersonEvents:
  8624.     db 12
  8625. -   person_event SPRITE_YOUNGSTER, 29, 19, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
  8626. -   person_event SPRITE_YOUNGSTER, 22, 28, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
  8627. -   person_event SPRITE_ROCKER, 18, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
  8628. -   person_event SPRITE_POKEFAN_M, 13, 7, $4, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
  8629. -   person_event SPRITE_YOUNGSTER, 9, 23, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
  8630. -   person_event SPRITE_YOUNGSTER, 13, 27, $2, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A
  8631. -   person_event SPRITE_LASS, 23, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
  8632. -   person_event SPRITE_YOUNGSTER, 27, 11, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
  8633. -   person_event SPRITE_YOUNGSTER, 8, 16, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
  8634. -   person_event SPRITE_YOUNGSTER, 34, 17, $2, 3, 3, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
  8635. -   person_event SPRITE_POKE_BALL, 12, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL
  8636. -   person_event SPRITE_POKE_BALL, 43, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG
  8637. +   person_event SPRITE_YOUNGSTER, 29, 19, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
  8638. +   person_event SPRITE_YOUNGSTER, 22, 28, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
  8639. +   person_event SPRITE_ROCKER, 18, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
  8640. +   person_event SPRITE_POKEFAN_M, 13, 7, SPRITEMOVEFN_04, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
  8641. +   person_event SPRITE_YOUNGSTER, 9, 23, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
  8642. +   person_event SPRITE_YOUNGSTER, 13, 27, SPRITEMOVEFN_02, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A
  8643. +   person_event SPRITE_LASS, 23, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
  8644. +   person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
  8645. +   person_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
  8646. +   person_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEFN_02, 3, 3, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
  8647. +   person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL
  8648. +   person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG
  8649. diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
  8650. index 49788b9..f0ab81b 100644
  8651. --- a/maps/NewBarkTown.asm
  8652. +++ b/maps/NewBarkTown.asm
  8653. @@ -3,8 +3,8 @@ NewBarkTown_MapScriptHeader:
  8654.     db 2
  8655.  
  8656.     ; triggers
  8657.     dw .Trigger1, $0000
  8658.     dw .Trigger2, $0000
  8659.  
  8660.  .MapCallbacks:
  8661.     db 1
  8662. @@ -305,6 +305,6 @@ NewBarkTown_MapEventHeader:
  8663.  
  8664.  .PersonEvents:
  8665.     db 3
  8666. -   person_event SPRITE_TEACHER, 8, 6, $3, 0, 1, -1, -1, 0, 0, 0, TeacherScript_0x1a806f, -1
  8667. -   person_event SPRITE_FISHER, 9, 12, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a809b, -1
  8668. -   person_event SPRITE_SILVER, 2, 3, $9, 0, 0, -1, -1, 0, 0, 0, SilverScript_0x1a809e, EVENT_RIVAL_NEW_BARK_TOWN
  8669. +   person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEFN_03, 0, 1, -1, -1, 0, 0, 0, TeacherScript_0x1a806f, -1
  8670. +   person_event SPRITE_FISHER, 9, 12, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a809b, -1
  8671. +   person_event SPRITE_SILVER, 2, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SilverScript_0x1a809e, EVENT_RIVAL_NEW_BARK_TOWN
  8672. diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
  8673. index b5f1f30..69b0608 100644
  8674. --- a/maps/OaksLab.asm
  8675. +++ b/maps/OaksLab.asm
  8676. @@ -283,7 +283,7 @@ OaksLab_MapEventHeader:
  8677.  
  8678.  .PersonEvents:
  8679.     db 4
  8680. -   person_event SPRITE_OAK, 2, 4, $6, 0, 0, -1, -1, 0, 0, 0, Oak, -1
  8681. -   person_event SPRITE_SCIENTIST, 8, 1, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b40f, -1
  8682. -   person_event SPRITE_SCIENTIST, 9, 8, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b412, -1
  8683. -   person_event SPRITE_SCIENTIST, 4, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b415, -1
  8684. +   person_event SPRITE_OAK, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, Oak, -1
  8685. +   person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b40f, -1
  8686. +   person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b412, -1
  8687. +   person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b415, -1
  8688. diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
  8689. index 94747e3..43c6d24 100644
  8690. --- a/maps/OlivineCafe.asm
  8691. +++ b/maps/OlivineCafe.asm
  8692. @@ -90,6 +90,6 @@ OlivineCafe_MapEventHeader:
  8693.  
  8694.  .PersonEvents:
  8695.     db 3
  8696. -   person_event SPRITE_SAILOR, 3, 4, $8, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x9c8c1, -1
  8697. -   person_event SPRITE_FISHING_GURU, 3, 7, $4, 1, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x9c8d9, -1
  8698. -   person_event SPRITE_SAILOR, 6, 6, $7, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x9c8dc, -1
  8699. +   person_event SPRITE_SAILOR, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x9c8c1, -1
  8700. +   person_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x9c8d9, -1
  8701. +   person_event SPRITE_SAILOR, 6, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x9c8dc, -1
  8702. diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
  8703. index a3d67a0..f05bfdc 100644
  8704. --- a/maps/OlivineCity.asm
  8705. +++ b/maps/OlivineCity.asm
  8706. @@ -3,8 +3,8 @@ OlivineCity_MapScriptHeader:
  8707.     db 2
  8708.  
  8709.     ; triggers
  8710.     dw .Trigger1, $0000
  8711.     dw .Trigger2, $0000
  8712.  
  8713.  .MapCallbacks:
  8714.     db 1
  8715. @@ -320,7 +320,7 @@ OlivineCity_MapEventHeader:
  8716.  
  8717.  .PersonEvents:
  8718.     db 4
  8719. -   person_event SPRITE_SAILOR, 27, 26, $4, 1, 0, -1, -1, 0, 0, 0, SailorScript_0x1a88a3, -1
  8720. -   person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x1a88a6, -1
  8721. -   person_event SPRITE_SAILOR, 21, 17, $2, 1, 1, -1, -1, 0, 0, 0, SailorScript_0x1a88ba, -1
  8722. -   person_event SPRITE_OLIVINE_RIVAL, 11, 10, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY
  8723. +   person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, SailorScript_0x1a88a3, -1
  8724. +   person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x1a88a6, -1
  8725. +   person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, SailorScript_0x1a88ba, -1
  8726. +   person_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY
  8727. diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
  8728. index 3fea640..1a59718 100644
  8729. --- a/maps/OlivineGoodRodHouse.asm
  8730. +++ b/maps/OlivineGoodRodHouse.asm
  8731. @@ -96,4 +96,4 @@ OlivineGoodRodHouse_MapEventHeader:
  8732.  
  8733.  .PersonEvents:
  8734.     db 1
  8735. -   person_event SPRITE_FISHING_GURU, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GoodRodGuru, -1
  8736. +   person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GoodRodGuru, -1
  8737. diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
  8738. index a1ae6dc..5539729 100644
  8739. --- a/maps/OlivineGym.asm
  8740. +++ b/maps/OlivineGym.asm
  8741. @@ -13,7 +13,7 @@ JasmineScript_0x9c12f:
  8742.     writetext UnknownText_0x9c1b9
  8743.     closetext
  8744.     loadmovesprites
  8745.     winlosstext UnknownText_0x9c2bb, $0000
  8746.     loadtrainer JASMINE, 1
  8747.     startbattle
  8748.     returnafterbattle
  8749. @@ -212,5 +212,5 @@ OlivineGym_MapEventHeader:
  8750.  
  8751.  .PersonEvents:
  8752.     db 2
  8753. -   person_event SPRITE_JASMINE, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
  8754. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OlivineGymGuyScript, -1
  8755. +   person_event SPRITE_JASMINE, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
  8756. +   person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OlivineGymGuyScript, -1
  8757. diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
  8758. index 7e4f955..b6b2cb9 100644
  8759. --- a/maps/OlivineHouseBeta.asm
  8760. +++ b/maps/OlivineHouseBeta.asm
  8761. @@ -54,5 +54,5 @@ OlivineHouseBeta_MapEventHeader:
  8762.  
  8763.  .PersonEvents:
  8764.     db 2
  8765. -   person_event SPRITE_TEACHER, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9c58f, -1
  8766. -   person_event SPRITE_RHYDON, 4, 6, $4, 2, 0, -1, -1, 0, 0, 0, RhydonScript_0x9c592, -1
  8767. +   person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9c58f, -1
  8768. +   person_event SPRITE_RHYDON, 4, 6, SPRITEMOVEFN_04, 2, 0, -1, -1, 0, 0, 0, RhydonScript_0x9c592, -1
  8769. diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
  8770. index 10fdf1b..8d4b57b 100644
  8771. --- a/maps/OlivineLighthouse1F.asm
  8772. +++ b/maps/OlivineLighthouse1F.asm
  8773. @@ -52,5 +52,5 @@ OlivineLighthouse1F_MapEventHeader:
  8774.  
  8775.  .PersonEvents:
  8776.     db 2
  8777. -   person_event SPRITE_SAILOR, 2, 8, $6, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x5ae67, -1
  8778. -   person_event SPRITE_POKEFAN_F, 9, 16, $4, 2, 0, -1, -1, 0, 0, 0, PokefanFScript_0x5ae6a, -1
  8779. +   person_event SPRITE_SAILOR, 2, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x5ae67, -1
  8780. +   person_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEFN_04, 2, 0, -1, -1, 0, 0, 0, PokefanFScript_0x5ae6a, -1
  8781. diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
  8782. index 7603357..d29774b 100644
  8783. --- a/maps/OlivineLighthouse2F.asm
  8784. +++ b/maps/OlivineLighthouse2F.asm
  8785. @@ -6,7 +6,7 @@ OlivineLighthouse2F_MapScriptHeader:
  8786.     db 0
  8787.  
  8788.  TrainerGentlemanAlfred:
  8789.     trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, $0000, GentlemanAlfredScript
  8790.  
  8791.  GentlemanAlfredScript:
  8792.     talkaftercancel
  8793. @@ -17,7 +17,7 @@ GentlemanAlfredScript:
  8794.     end
  8795.  
  8796.  TrainerSailorHuey1:
  8797.     trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, $0000, SailorHuey1Script
  8798.  
  8799.  SailorHuey1Script:
  8800.     writecode VAR_CALLERID, PHONE_SAILOR_HUEY
  8801. @@ -45,7 +45,7 @@ UnknownScript_0x5afb3:
  8802.  
  8803.  UnknownScript_0x5afc7:
  8804.     scall UnknownScript_0x5b06b
  8805.     winlosstext SailorHuey1BeatenText, $0000
  8806.     copybytetovar wHueyFightCount
  8807.     if_equal 3, .Fight3
  8808.     if_equal 2, .Fight2
  8809. @@ -221,5 +221,5 @@ OlivineLighthouse2F_MapEventHeader:
  8810.  
  8811.  .PersonEvents:
  8812.     db 2
  8813. -   person_event SPRITE_SAILOR, 3, 9, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorHuey1, -1
  8814. -   person_event SPRITE_GENTLEMAN, 8, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerGentlemanAlfred, -1
  8815. +   person_event SPRITE_SAILOR, 3, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorHuey1, -1
  8816. +   person_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerGentlemanAlfred, -1
  8817. diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
  8818. index dd39a63..9f81a49 100644
  8819. --- a/maps/OlivineLighthouse3F.asm
  8820. +++ b/maps/OlivineLighthouse3F.asm
  8821. @@ -6,7 +6,7 @@ OlivineLighthouse3F_MapScriptHeader:
  8822.     db 0
  8823.  
  8824.  TrainerBird_keeperTheo:
  8825.     trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, $0000, Bird_keeperTheoScript
  8826.  
  8827.  Bird_keeperTheoScript:
  8828.     talkaftercancel
  8829. @@ -17,7 +17,7 @@ Bird_keeperTheoScript:
  8830.     end
  8831.  
  8832.  TrainerGentlemanPreston:
  8833.     trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, $0000, GentlemanPrestonScript
  8834.  
  8835.  GentlemanPrestonScript:
  8836.     talkaftercancel
  8837. @@ -28,7 +28,7 @@ GentlemanPrestonScript:
  8838.     end
  8839.  
  8840.  TrainerSailorTerrell:
  8841.     trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, $0000, SailorTerrellScript
  8842.  
  8843.  SailorTerrellScript:
  8844.     talkaftercancel
  8845. @@ -130,7 +130,7 @@ OlivineLighthouse3F_MapEventHeader:
  8846.  
  8847.  .PersonEvents:
  8848.     db 4
  8849. -   person_event SPRITE_SAILOR, 2, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSailorTerrell, -1
  8850. -   person_event SPRITE_GENTLEMAN, 5, 13, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerGentlemanPreston, -1
  8851. -   person_event SPRITE_YOUNGSTER, 9, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperTheo, -1
  8852. -   person_event SPRITE_POKE_BALL, 2, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
  8853. +   person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSailorTerrell, -1
  8854. +   person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerGentlemanPreston, -1
  8855. +   person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperTheo, -1
  8856. +   person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
  8857. diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
  8858. index 6b66621..2be5e12 100644
  8859. --- a/maps/OlivineLighthouse4F.asm
  8860. +++ b/maps/OlivineLighthouse4F.asm
  8861. @@ -6,7 +6,7 @@ OlivineLighthouse4F_MapScriptHeader:
  8862.     db 0
  8863.  
  8864.  TrainerLassConnie:
  8865.     trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, $0000, LassConnie1Script
  8866.  
  8867.  LassConnie1Script:
  8868.     talkaftercancel
  8869. @@ -17,7 +17,7 @@ LassConnie1Script:
  8870.     end
  8871.  
  8872.  TrainerSailorKent:
  8873.     trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, $0000, SailorKentScript
  8874.  
  8875.  SailorKentScript:
  8876.     talkaftercancel
  8877. @@ -102,5 +102,5 @@ OlivineLighthouse4F_MapEventHeader:
  8878.  
  8879.  .PersonEvents:
  8880.     db 2
  8881. -   person_event SPRITE_SAILOR, 14, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorKent, -1
  8882. -   person_event SPRITE_LASS, 2, 11, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassConnie, -1
  8883. +   person_event SPRITE_SAILOR, 14, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorKent, -1
  8884. +   person_event SPRITE_LASS, 2, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassConnie, -1
  8885. diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
  8886. index 4915ee4..378c25c 100644
  8887. --- a/maps/OlivineLighthouse5F.asm
  8888. +++ b/maps/OlivineLighthouse5F.asm
  8889. @@ -6,7 +6,7 @@ OlivineLighthouse5F_MapScriptHeader:
  8890.     db 0
  8891.  
  8892.  TrainerBird_keeperDenis:
  8893.     trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, $0000, Bird_keeperDenisScript
  8894.  
  8895.  Bird_keeperDenisScript:
  8896.     talkaftercancel
  8897. @@ -17,7 +17,7 @@ Bird_keeperDenisScript:
  8898.     end
  8899.  
  8900.  TrainerSailorErnest:
  8901.     trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, $0000, SailorErnestScript
  8902.  
  8903.  SailorErnestScript:
  8904.     talkaftercancel
  8905. @@ -107,8 +107,8 @@ OlivineLighthouse5F_MapEventHeader:
  8906.  
  8907.  .PersonEvents:
  8908.     db 5
  8909. -   person_event SPRITE_SAILOR, 11, 8, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorErnest, -1
  8910. -   person_event SPRITE_YOUNGSTER, 3, 8, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerBird_keeperDenis, -1
  8911. -   person_event SPRITE_POKE_BALL, 12, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
  8912. -   person_event SPRITE_POKE_BALL, 15, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
  8913. -   person_event SPRITE_POKE_BALL, 13, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
  8914. +   person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorErnest, -1
  8915. +   person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerBird_keeperDenis, -1
  8916. +   person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
  8917. +   person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
  8918. +   person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
  8919. diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
  8920. index 71934fe..143b041 100644
  8921. --- a/maps/OlivineLighthouse6F.asm
  8922. +++ b/maps/OlivineLighthouse6F.asm
  8923. @@ -270,6 +270,6 @@ OlivineLighthouse6F_MapEventHeader:
  8924.  
  8925.  .PersonEvents:
  8926.     db 3
  8927. -   person_event SPRITE_JASMINE, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
  8928. -   person_event SPRITE_MONSTER, 8, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MonsterScript_0x60c3a, -1
  8929. -   person_event SPRITE_POKE_BALL, 4, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
  8930. +   person_event SPRITE_JASMINE, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
  8931. +   person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MonsterScript_0x60c3a, -1
  8932. +   person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
  8933. diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
  8934. index 3b0546e..f4c55ea 100644
  8935. --- a/maps/OlivineMart.asm
  8936. +++ b/maps/OlivineMart.asm
  8937. @@ -57,6 +57,6 @@ OlivineMart_MapEventHeader:
  8938.  
  8939.  .PersonEvents:
  8940.     db 3
  8941. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x9cac7, -1
  8942. -   person_event SPRITE_COOLTRAINER_F, 2, 6, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x9cace, -1
  8943. -   person_event SPRITE_LASS, 6, 1, $8, 0, 0, -1, -1, 0, 0, 0, LassScript_0x9cad1, -1
  8944. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x9cac7, -1
  8945. +   person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x9cace, -1
  8946. +   person_event SPRITE_LASS, 6, 1, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, LassScript_0x9cad1, -1
  8947. diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm
  8948. index 63c8509..816775a 100644
  8949. --- a/maps/OlivinePokeCenter1F.asm
  8950. +++ b/maps/OlivinePokeCenter1F.asm
  8951. @@ -59,7 +59,7 @@ OlivinePokeCenter1F_MapEventHeader:
  8952.  
  8953.  .PersonEvents:
  8954.     db 4
  8955. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9c002, -1
  8956. -   person_event SPRITE_FISHING_GURU, 4, 8, $5, 0, 1, -1, -1, 0, 0, 0, FishingGuruScript_0x9c005, -1
  8957. -   person_event SPRITE_FISHER, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x9c008, -1
  8958. -   person_event SPRITE_TEACHER, 1, 7, $6, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9c00b, -1
  8959. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9c002, -1
  8960. +   person_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, FishingGuruScript_0x9c005, -1
  8961. +   person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x9c008, -1
  8962. +   person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9c00b, -1
  8963. diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
  8964. index ab1307f..6ac458c 100644
  8965. --- a/maps/OlivinePort.asm
  8966. +++ b/maps/OlivinePort.asm
  8967. @@ -3,8 +3,8 @@ OlivinePort_MapScriptHeader:
  8968.     db 2
  8969.  
  8970.     ; triggers
  8971.     dw UnknownScript_0x748ac, $0000
  8972.     dw UnknownScript_0x748ad, $0000
  8973.  
  8974.  .MapCallbacks:
  8975.     db 0
  8976. @@ -397,10 +397,10 @@ OlivinePort_MapEventHeader:
  8977.  
  8978.  .PersonEvents:
  8979.     db 7
  8980. -   person_event SPRITE_SAILOR, 23, 7, $7, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
  8981. -   person_event SPRITE_SAILOR, 15, 7, $7, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
  8982. -   person_event SPRITE_SAILOR, 15, 6, $9, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
  8983. -   person_event SPRITE_FISHING_GURU, 14, 4, $7, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
  8984. -   person_event SPRITE_FISHING_GURU, 14, 13, $7, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
  8985. -   person_event SPRITE_YOUNGSTER, 15, 4, $6, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
  8986. -   person_event SPRITE_COOLTRAINER_F, 15, 11, $6, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
  8987. +   person_event SPRITE_SAILOR, 23, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
  8988. +   person_event SPRITE_SAILOR, 15, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
  8989. +   person_event SPRITE_SAILOR, 15, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
  8990. +   person_event SPRITE_FISHING_GURU, 14, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
  8991. +   person_event SPRITE_FISHING_GURU, 14, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
  8992. +   person_event SPRITE_YOUNGSTER, 15, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
  8993. +   person_event SPRITE_COOLTRAINER_F, 15, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
  8994. diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
  8995. index f5f95d3..37c42d9 100644
  8996. --- a/maps/OlivinePortPassage.asm
  8997. +++ b/maps/OlivinePortPassage.asm
  8998. @@ -36,4 +36,4 @@ OlivinePortPassage_MapEventHeader:
  8999.  
  9000.  .PersonEvents:
  9001.     db 1
  9002. -   person_event SPRITE_POKEFAN_M, 1, 17, $8, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
  9003. +   person_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
  9004. diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
  9005. index e968dd1..2f209b8 100644
  9006. --- a/maps/OlivinePunishmentSpeechHouse.asm
  9007. +++ b/maps/OlivinePunishmentSpeechHouse.asm
  9008. @@ -54,5 +54,5 @@ OlivinePunishmentSpeechHouse_MapEventHeader:
  9009.  
  9010.  .PersonEvents:
  9011.     db 2
  9012. -   person_event SPRITE_POKEFAN_M, 2, 1, $3, 0, 0, -1, -1, 0, 0, 0, OlivinePunishmentSpeechHouseDad, -1
  9013. -   person_event SPRITE_LASS, 5, 5, $5, 0, 2, -1, -1, 0, 0, 0, OlivinePunishmentSpeechHouseDaughter, -1
  9014. +   person_event SPRITE_POKEFAN_M, 2, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, OlivinePunishmentSpeechHouseDad, -1
  9015. +   person_event SPRITE_LASS, 5, 5, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, OlivinePunishmentSpeechHouseDaughter, -1
  9016. diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm
  9017. index 717abfe..82a3037 100644
  9018. --- a/maps/OlivineVoltorbHouse.asm
  9019. +++ b/maps/OlivineVoltorbHouse.asm
  9020. @@ -35,4 +35,4 @@ OlivineVoltorbHouse_MapEventHeader:
  9021.  
  9022.  .PersonEvents:
  9023.     db 1
  9024. -   person_event SPRITE_FISHING_GURU, 3, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Tim, -1
  9025. +   person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Tim, -1
  9026. diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
  9027. index efaae10..fc92d50 100644
  9028. --- a/maps/PalletTown.asm
  9029. +++ b/maps/PalletTown.asm
  9030. @@ -89,5 +89,5 @@ PalletTown_MapEventHeader:
  9031.  
  9032.  .PersonEvents:
  9033.     db 2
  9034. -   person_event SPRITE_TEACHER, 8, 3, $2, 2, 2, -1, -1, 0, 0, 0, TeacherScript_0x1ac6d5, -1
  9035. -   person_event SPRITE_FISHER, 14, 12, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ac6d8, -1
  9036. +   person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, TeacherScript_0x1ac6d5, -1
  9037. +   person_event SPRITE_FISHER, 14, 12, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ac6d8, -1
  9038. diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
  9039. index 2b74bea..50e8348 100644
  9040. --- a/maps/PewterCity.asm
  9041. +++ b/maps/PewterCity.asm
  9042. @@ -174,8 +174,8 @@ PewterCity_MapEventHeader:
  9043.  
  9044.  .PersonEvents:
  9045.     db 5
  9046. -   person_event SPRITE_COOLTRAINER_F, 11, 19, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18c009, -1
  9047. -   person_event SPRITE_BUG_CATCHER, 29, 14, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18c00c, -1
  9048. -   person_event SPRITE_GRAMPS, 17, 29, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x18c00f, -1
  9049. -   person_event SPRITE_FRUIT_TREE, 3, 32, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x18c03e, -1
  9050. -   person_event SPRITE_FRUIT_TREE, 3, 30, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x18c040, -1
  9051. +   person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18c009, -1
  9052. +   person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18c00c, -1
  9053. +   person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x18c00f, -1
  9054. +   person_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x18c03e, -1
  9055. +   person_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x18c040, -1
  9056. diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
  9057. index 3f5b734..cd12ded 100644
  9058. --- a/maps/PewterGym.asm
  9059. +++ b/maps/PewterGym.asm
  9060. @@ -13,7 +13,7 @@ BrockScript_0x1a2864:
  9061.     writetext UnknownText_0x1a28d0
  9062.     closetext
  9063.     loadmovesprites
  9064.     winlosstext UnknownText_0x1a29bb, $0000
  9065.     loadtrainer BROCK, 1
  9066.     startbattle
  9067.     returnafterbattle
  9068. @@ -36,7 +36,7 @@ BrockScript_0x1a2864:
  9069.     end
  9070.  
  9071.  TrainerCamperJerry:
  9072.     trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, $0000, CamperJerryScript
  9073.  
  9074.  CamperJerryScript:
  9075.     talkaftercancel
  9076. @@ -222,6 +222,6 @@ PewterGym_MapEventHeader:
  9077.  
  9078.  .PersonEvents:
  9079.     db 3
  9080. -   person_event SPRITE_BROCK, 1, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrockScript_0x1a2864, -1
  9081. -   person_event SPRITE_YOUNGSTER, 5, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperJerry, -1
  9082. -   person_event SPRITE_GYM_GUY, 11, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, PewterGymGuyScript, -1
  9083. +   person_event SPRITE_BROCK, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrockScript_0x1a2864, -1
  9084. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperJerry, -1
  9085. +   person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, PewterGymGuyScript, -1
  9086. diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
  9087. index 557f0d5..431b854 100644
  9088. --- a/maps/PewterMart.asm
  9089. +++ b/maps/PewterMart.asm
  9090. @@ -57,6 +57,6 @@ PewterMart_MapEventHeader:
  9091.  
  9092.  .PersonEvents:
  9093.     db 3
  9094. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x1a2dcb, -1
  9095. -   person_event SPRITE_YOUNGSTER, 2, 9, $5, 0, 2, -1, -1, 0, 0, 0, YoungsterScript_0x1a2dd2, -1
  9096. -   person_event SPRITE_SUPER_NERD, 6, 6, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a2dd5, -1
  9097. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x1a2dcb, -1
  9098. +   person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, YoungsterScript_0x1a2dd2, -1
  9099. +   person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a2dd5, -1
  9100. diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
  9101. index 773871d..9fa9c29 100644
  9102. --- a/maps/PewterNidoranSpeechHouse.asm
  9103. +++ b/maps/PewterNidoranSpeechHouse.asm
  9104. @@ -41,5 +41,5 @@ PewterNidoranSpeechHouse_MapEventHeader:
  9105.  
  9106.  .PersonEvents:
  9107.     db 2
  9108. -   person_event SPRITE_SUPER_NERD, 5, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x1a2807, -1
  9109. -   person_event SPRITE_GROWLITHE, 5, 4, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrowlitheScript_0x1a280a, -1
  9110. +   person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x1a2807, -1
  9111. +   person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrowlitheScript_0x1a280a, -1
  9112. diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm
  9113. index 0cbb4bb..2ae1d39 100644
  9114. --- a/maps/PewterPokeCenter1F.asm
  9115. +++ b/maps/PewterPokeCenter1F.asm
  9116. @@ -78,8 +78,8 @@ PewterPokeCenter1F_MapEventHeader:
  9117.  
  9118.  .PersonEvents:
  9119.     db 5
  9120. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1a2ee7, -1
  9121. -   person_event SPRITE_TEACHER, 6, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a2eea, -1
  9122. -   person_event SPRITE_JIGGLYPUFF, 3, 1, $16, 0, 0, -1, -1, 0, 0, 0, JigglypuffScript_0x1a2eed, -1
  9123. -   person_event SPRITE_BUG_CATCHER, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x1a2ef7, -1
  9124. -   person_event SPRITE_POKEFAN_M, 2, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1a2efa, -1
  9125. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1a2ee7, -1
  9126. +   person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a2eea, -1
  9127. +   person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, JigglypuffScript_0x1a2eed, -1
  9128. +   person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x1a2ef7, -1
  9129. +   person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1a2efa, -1
  9130. diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
  9131. index 1284ec3..575d782 100644
  9132. --- a/maps/PewterSnoozeSpeechHouse.asm
  9133. +++ b/maps/PewterSnoozeSpeechHouse.asm
  9134. @@ -36,4 +36,4 @@ PewterSnoozeSpeechHouse_MapEventHeader:
  9135.  
  9136.  .PersonEvents:
  9137.     db 1
  9138. -   person_event SPRITE_GRAMPS, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x1a3059, -1
  9139. +   person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x1a3059, -1
  9140. diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
  9141. index 9a6e307..cba746f 100644
  9142. --- a/maps/PokeCenter2F.asm
  9143. +++ b/maps/PokeCenter2F.asm
  9144. @@ -3,12 +3,12 @@ PokeCenter2F_MapScriptHeader:
  9145.     db 6
  9146.  
  9147.     ; triggers
  9148.     dw .Trigger1, $0000
  9149.     dw .Trigger2, $0000
  9150.     dw .Trigger3, $0000
  9151.     dw .Trigger4, $0000
  9152.     dw .Trigger5, $0000
  9153.     dw .Trigger6, $0000
  9154.  
  9155.  .MapCallbacks:
  9156.     db 0
  9157. @@ -1040,7 +1040,7 @@ PokeCenter2F_MapEventHeader:
  9158.  
  9159.  .PersonEvents:
  9160.     db 4
  9161. -   person_event SPRITE_LINK_RECEPTIONIST, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_Trade, -1
  9162. -   person_event SPRITE_LINK_RECEPTIONIST, 2, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_Battle, -1
  9163. -   person_event SPRITE_LINK_RECEPTIONIST, 3, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_TimeCapsule, -1
  9164. -   person_event SPRITE_OFFICER, 1, 1, $6, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
  9165. +   person_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_Trade, -1
  9166. +   person_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_Battle, -1
  9167. +   person_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_TimeCapsule, -1
  9168. +   person_event SPRITE_OFFICER, 1, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
  9169. diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
  9170. index ef5130d..3945c1e 100644
  9171. --- a/maps/PokeSeersHouse.asm
  9172. +++ b/maps/PokeSeersHouse.asm
  9173. @@ -30,4 +30,4 @@ PokeSeersHouse_MapEventHeader:
  9174.  
  9175.  .PersonEvents:
  9176.     db 1
  9177. -   person_event SPRITE_GRANNY, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SeerScript, -1
  9178. +   person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SeerScript, -1
  9179. diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
  9180. index 29d3cbb..c37b471 100644
  9181. --- a/maps/PokemonFanClub.asm
  9182. +++ b/maps/PokemonFanClub.asm
  9183. @@ -307,9 +307,9 @@ PokemonFanClub_MapEventHeader:
  9184.  
  9185.  .PersonEvents:
  9186.     db 6
  9187. -   person_event SPRITE_GENTLEMAN, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x1917e9, -1
  9188. -   person_event SPRITE_RECEPTIONIST, 1, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x191821, -1
  9189. -   person_event SPRITE_FISHER, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x191824, -1
  9190. -   person_event SPRITE_TEACHER, 2, 7, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x19186b, -1
  9191. -   person_event SPRITE_FAIRY, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, FairyScript_0x19186e, EVENT_VERMILION_FAN_CLUB_DOLL
  9192. -   person_event SPRITE_ODDISH, 3, 7, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OddishScript_0x191871, -1
  9193. +   person_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x1917e9, -1
  9194. +   person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x191821, -1
  9195. +   person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x191824, -1
  9196. +   person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x19186b, -1
  9197. +   person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FairyScript_0x19186e, EVENT_VERMILION_FAN_CLUB_DOLL
  9198. +   person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OddishScript_0x191871, -1
  9199. diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
  9200. index 2057e2b..c20e61b 100644
  9201. --- a/maps/PowerPlant.asm
  9202. +++ b/maps/PowerPlant.asm
  9203. @@ -3,8 +3,8 @@ PowerPlant_MapScriptHeader:
  9204.     db 2
  9205.  
  9206.     ; triggers
  9207.     dw UnknownScript_0x188dc3, $0000
  9208.     dw UnknownScript_0x188dc4, $0000
  9209.  
  9210.  .MapCallbacks:
  9211.     db 0
  9212. @@ -401,10 +401,10 @@ PowerPlant_MapEventHeader:
  9213.  
  9214.  .PersonEvents:
  9215.     db 7
  9216. -   person_event SPRITE_OFFICER, 14, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x188df5, -1
  9217. -   person_event SPRITE_GYM_GUY, 9, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e15, -1
  9218. -   person_event SPRITE_GYM_GUY, 11, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e29, -1
  9219. -   person_event SPRITE_OFFICER, 3, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x188e3d, -1
  9220. -   person_event SPRITE_GYM_GUY, 2, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e51, -1
  9221. -   person_event SPRITE_FISHER, 10, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PowerPlantManager, -1
  9222. -   person_event SPRITE_GYM_GUY, 5, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188ecb, -1
  9223. +   person_event SPRITE_OFFICER, 14, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x188df5, -1
  9224. +   person_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e15, -1
  9225. +   person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e29, -1
  9226. +   person_event SPRITE_OFFICER, 3, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x188e3d, -1
  9227. +   person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e51, -1
  9228. +   person_event SPRITE_FISHER, 10, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PowerPlantManager, -1
  9229. +   person_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188ecb, -1
  9230. diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
  9231. index f39a065..6f5cea2 100644
  9232. --- a/maps/RadioTower1F.asm
  9233. +++ b/maps/RadioTower1F.asm
  9234. @@ -178,7 +178,7 @@ YoungsterScript_0x5ce54:
  9235.     jumptextfaceplayer UnknownText_0x5d4ac
  9236.  
  9237.  TrainerGruntM3:
  9238.     trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, $0000, GruntM3Script
  9239.  
  9240.  GruntM3Script:
  9241.     talkaftercancel
  9242. @@ -484,9 +484,9 @@ RadioTower1F_MapEventHeader:
  9243.  
  9244.  .PersonEvents:
  9245.     db 6
  9246. -   person_event SPRITE_RECEPTIONIST, 6, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x5cd29, -1
  9247. -   person_event SPRITE_LASS, 4, 16, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS
  9248. -   person_event SPRITE_YOUNGSTER, 4, 15, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS
  9249. -   person_event SPRITE_ROCKET, 1, 14, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9250. -   person_event SPRITE_GENTLEMAN, 6, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
  9251. -   person_event SPRITE_COOLTRAINER_F, 6, 12, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS
  9252. +   person_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x5cd29, -1
  9253. +   person_event SPRITE_LASS, 4, 16, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS
  9254. +   person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS
  9255. +   person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9256. +   person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
  9257. +   person_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS
  9258. diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
  9259. index 6439214..8e16dd1 100644
  9260. --- a/maps/RadioTower2F.asm
  9261. +++ b/maps/RadioTower2F.asm
  9262. @@ -42,7 +42,7 @@ BlackBeltScript_0x5d722:
  9263.     jumptextfaceplayer UnknownText_0x5da44
  9264.  
  9265.  TrainerGruntM4:
  9266.     trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, $0000, GruntM4Script
  9267.  
  9268.  GruntM4Script:
  9269.     talkaftercancel
  9270. @@ -53,7 +53,7 @@ GruntM4Script:
  9271.     end
  9272.  
  9273.  TrainerGruntM5:
  9274.     trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, $0000, GruntM5Script
  9275.  
  9276.  GruntM5Script:
  9277.     talkaftercancel
  9278. @@ -64,7 +64,7 @@ GruntM5Script:
  9279.     end
  9280.  
  9281.  TrainerGruntM6:
  9282.     trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, $0000, GruntM6Script
  9283.  
  9284.  GruntM6Script:
  9285.     talkaftercancel
  9286. @@ -75,7 +75,7 @@ GruntM6Script:
  9287.     end
  9288.  
  9289.  TrainerGruntF2:
  9290.     trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, $0000, GruntF2Script
  9291.  
  9292.  GruntF2Script:
  9293.     talkaftercancel
  9294. @@ -720,14 +720,14 @@ RadioTower2F_MapEventHeader:
  9295.  
  9296.  .PersonEvents:
  9297.     db 11
  9298. -   person_event SPRITE_SUPER_NERD, 6, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS
  9299. -   person_event SPRITE_TEACHER, 2, 17, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x5d701, -1
  9300. -   person_event SPRITE_ROCKET, 4, 1, $7, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9301. -   person_event SPRITE_ROCKET, 4, 8, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9302. -   person_event SPRITE_ROCKET, 1, 4, $6, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9303. -   person_event SPRITE_ROCKET_GIRL, 5, 10, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9304. -   person_event SPRITE_BLACK_BELT, 1, 0, $6, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
  9305. -   person_event SPRITE_BLACK_BELT, 1, 1, $6, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9306. -   person_event SPRITE_JIGGLYPUFF, 1, 12, $16, 0, 0, -1, -1, 0, 0, 0, JigglypuffScript_0x5d715, -1
  9307. -   person_event SPRITE_BUENA, 5, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Buena, -1
  9308. -   person_event SPRITE_RECEPTIONIST, 7, 12, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
  9309. +   person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS
  9310. +   person_event SPRITE_TEACHER, 2, 17, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x5d701, -1
  9311. +   person_event SPRITE_ROCKET, 4, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9312. +   person_event SPRITE_ROCKET, 4, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9313. +   person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9314. +   person_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9315. +   person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
  9316. +   person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9317. +   person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, JigglypuffScript_0x5d715, -1
  9318. +   person_event SPRITE_BUENA, 5, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Buena, -1
  9319. +   person_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
  9320. diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
  9321. index 4329295..4df995a 100644
  9322. --- a/maps/RadioTower3F.asm
  9323. +++ b/maps/RadioTower3F.asm
  9324. @@ -77,7 +77,7 @@ UnknownScript_0x5e5a1:
  9325.     end
  9326.  
  9327.  TrainerGruntM7:
  9328.     trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, $0000, GruntM7Script
  9329.  
  9330.  GruntM7Script:
  9331.     talkaftercancel
  9332. @@ -88,7 +88,7 @@ GruntM7Script:
  9333.     end
  9334.  
  9335.  TrainerGruntM8:
  9336.     trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, $0000, GruntM8Script
  9337.  
  9338.  GruntM8Script:
  9339.     talkaftercancel
  9340. @@ -99,7 +99,7 @@ GruntM8Script:
  9341.     end
  9342.  
  9343.  TrainerGruntM9:
  9344.     trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, $0000, GruntM9Script
  9345.  
  9346.  GruntM9Script:
  9347.     talkaftercancel
  9348. @@ -110,7 +110,7 @@ GruntM9Script:
  9349.     end
  9350.  
  9351.  TrainerScientistMarc:
  9352.     trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, $0000, ScientistMarcScript
  9353.  
  9354.  ScientistMarcScript:
  9355.     talkaftercancel
  9356. @@ -343,10 +343,10 @@ RadioTower3F_MapEventHeader:
  9357.  
  9358.  .PersonEvents:
  9359.     db 7
  9360. -   person_event SPRITE_SUPER_NERD, 4, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9361. -   person_event SPRITE_GYM_GUY, 4, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GymGuyScript_0x5e556, -1
  9362. -   person_event SPRITE_COOLTRAINER_F, 3, 11, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x5e56a, -1
  9363. -   person_event SPRITE_ROCKET, 1, 5, $9, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9364. -   person_event SPRITE_ROCKET, 2, 6, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9365. -   person_event SPRITE_ROCKET, 6, 16, $7, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9366. -   person_event SPRITE_SCIENTIST, 6, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9367. +   person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9368. +   person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GymGuyScript_0x5e556, -1
  9369. +   person_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x5e56a, -1
  9370. +   person_event SPRITE_ROCKET, 1, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9371. +   person_event SPRITE_ROCKET, 2, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9372. +   person_event SPRITE_ROCKET, 6, 16, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9373. +   person_event SPRITE_SCIENTIST, 6, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9374. diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
  9375. index be4cd0c..f90fe14 100644
  9376. --- a/maps/RadioTower4F.asm
  9377. +++ b/maps/RadioTower4F.asm
  9378. @@ -47,7 +47,7 @@ GrowlitheScript_0x5ebb2:
  9379.     end
  9380.  
  9381.  TrainerGruntM10:
  9382.     trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, $0000, GruntM10Script
  9383.  
  9384.  GruntM10Script:
  9385.     talkaftercancel
  9386. @@ -58,7 +58,7 @@ GruntM10Script:
  9387.     end
  9388.  
  9389.  TrainerExecutivem2:
  9390.     trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, $0000, Executivem2Script
  9391.  
  9392.  Executivem2Script:
  9393.     talkaftercancel
  9394. @@ -69,7 +69,7 @@ Executivem2Script:
  9395.     end
  9396.  
  9397.  TrainerGruntF4:
  9398.     trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, $0000, GruntF4Script
  9399.  
  9400.  GruntF4Script:
  9401.     talkaftercancel
  9402. @@ -80,7 +80,7 @@ GruntF4Script:
  9403.     end
  9404.  
  9405.  TrainerScientistRich:
  9406.     trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, $0000, ScientistRichScript
  9407.  
  9408.  ScientistRichScript:
  9409.     talkaftercancel
  9410. @@ -257,10 +257,10 @@ RadioTower4F_MapEventHeader:
  9411.  
  9412.  .PersonEvents:
  9413.     db 7
  9414. -   person_event SPRITE_FISHER, 4, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9415. -   person_event SPRITE_TEACHER, 6, 14, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5eb85, -1
  9416. -   person_event SPRITE_GROWLITHE, 7, 12, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrowlitheScript_0x5ebb2, -1
  9417. -   person_event SPRITE_ROCKET, 6, 5, $1f, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9418. -   person_event SPRITE_ROCKET, 1, 14, $8, 0, 2, -1, -1, 0, 2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9419. -   person_event SPRITE_ROCKET_GIRL, 4, 12, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9420. -   person_event SPRITE_SCIENTIST, 2, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9421. +   person_event SPRITE_FISHER, 4, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9422. +   person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5eb85, -1
  9423. +   person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrowlitheScript_0x5ebb2, -1
  9424. +   person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEFN_1F, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9425. +   person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEFN_08, 0, 2, -1, -1, 0, 2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9426. +   person_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9427. +   person_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9428. diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
  9429. index 499e7fb..de3d5f7 100644
  9430. --- a/maps/RadioTower5F.asm
  9431. +++ b/maps/RadioTower5F.asm
  9432. @@ -3,9 +3,9 @@ RadioTower5F_MapScriptHeader:
  9433.     db 3
  9434.  
  9435.     ; triggers
  9436.     dw UnknownScript_0x6000e, $0000
  9437.     dw UnknownScript_0x6000f, $0000
  9438.     dw UnknownScript_0x60010, $0000
  9439.  
  9440.  .MapCallbacks:
  9441.     db 0
  9442. @@ -32,7 +32,7 @@ UnknownScript_0x60011:
  9443.     writetext UnknownText_0x60147
  9444.     closetext
  9445.     loadmovesprites
  9446.     winlosstext UnknownText_0x60223, $0000
  9447.     setlasttalked $2
  9448.     loadtrainer EXECUTIVEM, 3
  9449.     startbattle
  9450. @@ -63,7 +63,7 @@ UnknownScript_0x60054:
  9451.     end
  9452.  
  9453.  TrainerExecutivef1:
  9454.     trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, $0000, Executivef1Script
  9455.  
  9456.  Executivef1Script:
  9457.     talkaftercancel
  9458. @@ -81,7 +81,7 @@ UnknownScript_0x6006e:
  9459.     writetext UnknownText_0x603d1
  9460.     closetext
  9461.     loadmovesprites
  9462.     winlosstext UnknownText_0x604f3, $0000
  9463.     setlasttalked $3
  9464.     loadtrainer EXECUTIVEM, 1
  9465.     startbattle
  9466. @@ -439,8 +439,8 @@ RadioTower5F_MapEventHeader:
  9467.  
  9468.  .PersonEvents:
  9469.     db 5
  9470. -   person_event SPRITE_GENTLEMAN, 6, 3, $3, 0, 0, -1, -1, 0, 0, 0, Director, -1
  9471. -   person_event SPRITE_ROCKET, 5, 13, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9472. -   person_event SPRITE_ROCKET_GIRL, 2, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9473. -   person_event SPRITE_ROCKER, 5, 13, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9474. -   person_event SPRITE_POKE_BALL, 5, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL
  9475. +   person_event SPRITE_GENTLEMAN, 6, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, Director, -1
  9476. +   person_event SPRITE_ROCKET, 5, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9477. +   person_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9478. +   person_event SPRITE_ROCKER, 5, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9479. +   person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL
  9480. diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
  9481. index a3e23c6..2826705 100644
  9482. --- a/maps/RedsHouse1F.asm
  9483. +++ b/maps/RedsHouse1F.asm
  9484. @@ -3,7 +3,7 @@ RedsHouse1F_MapScriptHeader:
  9485.     db 1
  9486.  
  9487.     ; triggers
  9488.     dw .Trigger, $0000
  9489.  
  9490.  .MapCallbacks:
  9491.     db 0
  9492. @@ -94,4 +94,4 @@ RedsHouse1F_MapEventHeader:
  9493.  
  9494.  .PersonEvents:
  9495.     db 1
  9496. -   person_event SPRITE_REDS_MOM, 3, 5, $8, 0, 0, -1, -1, 0, 0, 0, RedsMom, -1
  9497. +   person_event SPRITE_REDS_MOM, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, RedsMom, -1
  9498. diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
  9499. index 6f4c0f6..5c35584 100644
  9500. --- a/maps/RockTunnel1F.asm
  9501. +++ b/maps/RockTunnel1F.asm
  9502. @@ -42,5 +42,5 @@ RockTunnel1F_MapEventHeader:
  9503.  
  9504.  .PersonEvents:
  9505.     db 2
  9506. -   person_event SPRITE_POKE_BALL, 18, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER
  9507. -   person_event SPRITE_POKE_BALL, 15, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
  9508. +   person_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER
  9509. +   person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
  9510. diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
  9511. index 3f95471..5889d35 100644
  9512. --- a/maps/RockTunnelB1F.asm
  9513. +++ b/maps/RockTunnelB1F.asm
  9514. @@ -38,6 +38,6 @@ RockTunnelB1F_MapEventHeader:
  9515.  
  9516.  .PersonEvents:
  9517.     db 3
  9518. -   person_event SPRITE_POKE_BALL, 25, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON
  9519. -   person_event SPRITE_POKE_BALL, 17, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP
  9520. -   person_event SPRITE_POKE_BALL, 2, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE
  9521. +   person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON
  9522. +   person_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP
  9523. +   person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE
  9524. diff --git a/maps/Route1.asm b/maps/Route1.asm
  9525. index 0c175e9..12434ea 100644
  9526. --- a/maps/Route1.asm
  9527. +++ b/maps/Route1.asm
  9528. @@ -6,7 +6,7 @@ Route1_MapScriptHeader:
  9529.     db 0
  9530.  
  9531.  TrainerSchoolboyDanny:
  9532.     trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, $0000, SchoolboyDannyScript
  9533.  
  9534.  SchoolboyDannyScript:
  9535.     talkaftercancel
  9536. @@ -17,7 +17,7 @@ SchoolboyDannyScript:
  9537.     end
  9538.  
  9539.  TrainerCooltrainerfQuinn:
  9540.     trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, $0000, CooltrainerfQuinnScript
  9541.  
  9542.  CooltrainerfQuinnScript:
  9543.     talkaftercancel
  9544. @@ -91,6 +91,6 @@ Route1_MapEventHeader:
  9545.  
  9546.  .PersonEvents:
  9547.     db 3
  9548. -   person_event SPRITE_YOUNGSTER, 12, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSchoolboyDanny, -1
  9549. -   person_event SPRITE_COOLTRAINER_F, 25, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfQuinn, -1
  9550. -   person_event SPRITE_FRUIT_TREE, 7, 3, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac581, -1
  9551. +   person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSchoolboyDanny, -1
  9552. +   person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfQuinn, -1
  9553. +   person_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac581, -1
  9554. diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm
  9555. index 8374255..2ddca4e 100644
  9556. --- a/maps/Route10PokeCenter1F.asm
  9557. +++ b/maps/Route10PokeCenter1F.asm
  9558. @@ -92,7 +92,7 @@ Route10PokeCenter1F_MapEventHeader:
  9559.  
  9560.  .PersonEvents:
  9561.     db 4
  9562. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x188bd4, -1
  9563. -   person_event SPRITE_GENTLEMAN, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x188bd7, -1
  9564. -   person_event SPRITE_GYM_GUY, 2, 7, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x188bda, -1
  9565. -   person_event SPRITE_COOLTRAINER_F, 3, 1, $6, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x188bee, -1
  9566. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x188bd4, -1
  9567. +   person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x188bd7, -1
  9568. +   person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x188bda, -1
  9569. +   person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x188bee, -1
  9570. diff --git a/maps/Route10South.asm b/maps/Route10South.asm
  9571. index 662509b..84e81eb 100644
  9572. --- a/maps/Route10South.asm
  9573. +++ b/maps/Route10South.asm
  9574. @@ -6,7 +6,7 @@ Route10South_MapScriptHeader:
  9575.     db 0
  9576.  
  9577.  TrainerHikerJim:
  9578.     trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, $0000, HikerJimScript
  9579.  
  9580.  HikerJimScript:
  9581.     talkaftercancel
  9582. @@ -17,7 +17,7 @@ HikerJimScript:
  9583.     end
  9584.  
  9585.  TrainerPokefanmRobert:
  9586.     trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, $0000, PokefanmRobertScript
  9587.  
  9588.  PokefanmRobertScript:
  9589.     talkaftercancel
  9590. @@ -88,5 +88,5 @@ Route10South_MapEventHeader:
  9591.  
  9592.  .PersonEvents:
  9593.     db 2
  9594. -   person_event SPRITE_POKEFAN_M, 3, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerJim, -1
  9595. -   person_event SPRITE_POKEFAN_M, 10, 8, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmRobert, -1
  9596. +   person_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerJim, -1
  9597. +   person_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmRobert, -1
  9598. diff --git a/maps/Route11.asm b/maps/Route11.asm
  9599. index c3ee336..ad0965b 100644
  9600. --- a/maps/Route11.asm
  9601. +++ b/maps/Route11.asm
  9602. @@ -6,7 +6,7 @@ Route11_MapScriptHeader:
  9603.     db 0
  9604.  
  9605.  TrainerYoungsterOwen:
  9606.     trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, $0000, YoungsterOwenScript
  9607.  
  9608.  YoungsterOwenScript:
  9609.     talkaftercancel
  9610. @@ -17,7 +17,7 @@ YoungsterOwenScript:
  9611.     end
  9612.  
  9613.  TrainerYoungsterJason:
  9614.     trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, $0000, YoungsterJasonScript
  9615.  
  9616.  YoungsterJasonScript:
  9617.     talkaftercancel
  9618. @@ -28,7 +28,7 @@ YoungsterJasonScript:
  9619.     end
  9620.  
  9621.  TrainerPsychicHerman:
  9622.     trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, $0000, PsychicHermanScript
  9623.  
  9624.  PsychicHermanScript:
  9625.     talkaftercancel
  9626. @@ -39,7 +39,7 @@ PsychicHermanScript:
  9627.     end
  9628.  
  9629.  TrainerPsychicFidel:
  9630.     trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, $0000, PsychicFidelScript
  9631.  
  9632.  PsychicFidelScript:
  9633.     talkaftercancel
  9634. @@ -156,8 +156,8 @@ Route11_MapEventHeader:
  9635.  
  9636.  .PersonEvents:
  9637.     db 5
  9638. -   person_event SPRITE_YOUNGSTER, 14, 22, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterOwen, -1
  9639. -   person_event SPRITE_YOUNGSTER, 4, 20, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterJason, -1
  9640. -   person_event SPRITE_YOUNGSTER, 7, 28, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicHerman, -1
  9641. -   person_event SPRITE_YOUNGSTER, 6, 8, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicFidel, -1
  9642. -   person_event SPRITE_FRUIT_TREE, 2, 32, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x68055, -1
  9643. +   person_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterOwen, -1
  9644. +   person_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterJason, -1
  9645. +   person_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicHerman, -1
  9646. +   person_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicFidel, -1
  9647. +   person_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x68055, -1
  9648. diff --git a/maps/Route12.asm b/maps/Route12.asm
  9649. index 8b7ebe9..6fd879a 100644
  9650. --- a/maps/Route12.asm
  9651. +++ b/maps/Route12.asm
  9652. @@ -6,7 +6,7 @@ Route12_MapScriptHeader:
  9653.     db 0
  9654.  
  9655.  TrainerFisherKyle:
  9656.     trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, $0000, FisherKyleScript
  9657.  
  9658.  FisherKyleScript:
  9659.     talkaftercancel
  9660. @@ -17,7 +17,7 @@ FisherKyleScript:
  9661.     end
  9662.  
  9663.  TrainerFisherMartin:
  9664.     trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, $0000, FisherMartinScript
  9665.  
  9666.  FisherMartinScript:
  9667.     talkaftercancel
  9668. @@ -28,7 +28,7 @@ FisherMartinScript:
  9669.     end
  9670.  
  9671.  TrainerFisherStephen:
  9672.     trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, $0000, FisherStephenScript
  9673.  
  9674.  FisherStephenScript:
  9675.     talkaftercancel
  9676. @@ -39,7 +39,7 @@ FisherStephenScript:
  9677.     end
  9678.  
  9679.  TrainerFisherBarney:
  9680.     trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, $0000, FisherBarneyScript
  9681.  
  9682.  FisherBarneyScript:
  9683.     talkaftercancel
  9684. @@ -178,9 +178,9 @@ Route12_MapEventHeader:
  9685.  
  9686.  .PersonEvents:
  9687.     db 6
  9688. -   person_event SPRITE_FISHER, 13, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherMartin, -1
  9689. -   person_event SPRITE_FISHER, 23, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherStephen, -1
  9690. -   person_event SPRITE_FISHER, 38, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerFisherBarney, -1
  9691. -   person_event SPRITE_FISHER, 7, 6, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherKyle, -1
  9692. -   person_event SPRITE_POKE_BALL, 43, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM
  9693. -   person_event SPRITE_POKE_BALL, 51, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET
  9694. +   person_event SPRITE_FISHER, 13, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherMartin, -1
  9695. +   person_event SPRITE_FISHER, 23, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherStephen, -1
  9696. +   person_event SPRITE_FISHER, 38, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerFisherBarney, -1
  9697. +   person_event SPRITE_FISHER, 7, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherKyle, -1
  9698. +   person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM
  9699. +   person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET
  9700. diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
  9701. index bc4376e..ba25ab1 100644
  9702. --- a/maps/Route12SuperRodHouse.asm
  9703. +++ b/maps/Route12SuperRodHouse.asm
  9704. @@ -93,4 +93,4 @@ Route12SuperRodHouse_MapEventHeader:
  9705.  
  9706.  .PersonEvents:
  9707.     db 1
  9708. -   person_event SPRITE_FISHING_GURU, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x7f484, -1
  9709. +   person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x7f484, -1
  9710. diff --git a/maps/Route13.asm b/maps/Route13.asm
  9711. index 6314a69..1ddb39f 100644
  9712. --- a/maps/Route13.asm
  9713. +++ b/maps/Route13.asm
  9714. @@ -6,7 +6,7 @@ Route13_MapScriptHeader:
  9715.     db 0
  9716.  
  9717.  TrainerPokefanmAlex:
  9718.     trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, $0000, PokefanmAlexScript
  9719.  
  9720.  PokefanmAlexScript:
  9721.     talkaftercancel
  9722. @@ -17,7 +17,7 @@ PokefanmAlexScript:
  9723.     end
  9724.  
  9725.  TrainerPokefanmJoshua:
  9726.     trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, $0000, PokefanmJoshuaScript
  9727.  
  9728.  PokefanmJoshuaScript:
  9729.     talkaftercancel
  9730. @@ -28,7 +28,7 @@ PokefanmJoshuaScript:
  9731.     end
  9732.  
  9733.  TrainerBird_keeperPerry:
  9734.     trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, $0000, Bird_keeperPerryScript
  9735.  
  9736.  Bird_keeperPerryScript:
  9737.     talkaftercancel
  9738. @@ -39,7 +39,7 @@ Bird_keeperPerryScript:
  9739.     end
  9740.  
  9741.  TrainerBird_keeperBret:
  9742.     trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, $0000, Bird_keeperBretScript
  9743.  
  9744.  Bird_keeperBretScript:
  9745.     talkaftercancel
  9746. @@ -50,7 +50,7 @@ Bird_keeperBretScript:
  9747.     end
  9748.  
  9749.  TrainerHikerKenny:
  9750.     trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, $0000, HikerKennyScript
  9751.  
  9752.  HikerKennyScript:
  9753.     talkaftercancel
  9754. @@ -204,8 +204,8 @@ Route13_MapEventHeader:
  9755.  
  9756.  .PersonEvents:
  9757.     db 5
  9758. -   person_event SPRITE_YOUNGSTER, 6, 42, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBird_keeperPerry, -1
  9759. -   person_event SPRITE_YOUNGSTER, 6, 43, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBird_keeperBret, -1
  9760. -   person_event SPRITE_POKEFAN_M, 8, 32, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmJoshua, -1
  9761. -   person_event SPRITE_POKEFAN_M, 10, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerHikerKenny, -1
  9762. -   person_event SPRITE_POKEFAN_M, 6, 25, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanmAlex, -1
  9763. +   person_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBird_keeperPerry, -1
  9764. +   person_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBird_keeperBret, -1
  9765. +   person_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmJoshua, -1
  9766. +   person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerHikerKenny, -1
  9767. +   person_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanmAlex, -1
  9768. diff --git a/maps/Route14.asm b/maps/Route14.asm
  9769. index 0884356..7c34fc2 100644
  9770. --- a/maps/Route14.asm
  9771. +++ b/maps/Route14.asm
  9772. @@ -14,7 +14,7 @@ TeacherScript_0x1ad47f:
  9773.     end
  9774.  
  9775.  TrainerPokefanmCarter:
  9776.     trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, $0000, PokefanmCarterScript
  9777.  
  9778.  PokefanmCarterScript:
  9779.     talkaftercancel
  9780. @@ -25,7 +25,7 @@ PokefanmCarterScript:
  9781.     end
  9782.  
  9783.  TrainerBird_keeperRoy:
  9784.     trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, $0000, Bird_keeperRoyScript
  9785.  
  9786.  Bird_keeperRoyScript:
  9787.     talkaftercancel
  9788. @@ -36,7 +36,7 @@ Bird_keeperRoyScript:
  9789.     end
  9790.  
  9791.  TrainerPokefanmTrevor:
  9792.     trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, $0000, PokefanmTrevorScript
  9793.  
  9794.  PokefanmTrevorScript:
  9795.     talkaftercancel
  9796. @@ -124,7 +124,7 @@ Route14_MapEventHeader:
  9797.  
  9798.  .PersonEvents:
  9799.     db 4
  9800. -   person_event SPRITE_POKEFAN_M, 15, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmCarter, -1
  9801. -   person_event SPRITE_YOUNGSTER, 27, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperRoy, -1
  9802. -   person_event SPRITE_POKEFAN_M, 11, 6, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmTrevor, -1
  9803. -   person_event SPRITE_TEACHER, 5, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 4, TeacherScript_0x1ad47f, -1
  9804. +   person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmCarter, -1
  9805. +   person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperRoy, -1
  9806. +   person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmTrevor, -1
  9807. +   person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 4, TeacherScript_0x1ad47f, -1
  9808. diff --git a/maps/Route15.asm b/maps/Route15.asm
  9809. index a5480c8..9432c44 100644
  9810. --- a/maps/Route15.asm
  9811. +++ b/maps/Route15.asm
  9812. @@ -6,7 +6,7 @@ Route15_MapScriptHeader:
  9813.     db 0
  9814.  
  9815.  TrainerTeacherColette:
  9816.     trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, $0000, TeacherColetteScript
  9817.  
  9818.  TeacherColetteScript:
  9819.     talkaftercancel
  9820. @@ -17,7 +17,7 @@ TeacherColetteScript:
  9821.     end
  9822.  
  9823.  TrainerTeacherHillary:
  9824.     trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, $0000, TeacherHillaryScript
  9825.  
  9826.  TeacherHillaryScript:
  9827.     talkaftercancel
  9828. @@ -28,7 +28,7 @@ TeacherHillaryScript:
  9829.     end
  9830.  
  9831.  TrainerSchoolboyKipp:
  9832.     trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, $0000, SchoolboyKippScript
  9833.  
  9834.  SchoolboyKippScript:
  9835.     talkaftercancel
  9836. @@ -39,7 +39,7 @@ SchoolboyKippScript:
  9837.     end
  9838.  
  9839.  TrainerSchoolboyTommy:
  9840.     trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, $0000, SchoolboyTommyScript
  9841.  
  9842.  SchoolboyTommyScript:
  9843.     talkaftercancel
  9844. @@ -50,7 +50,7 @@ SchoolboyTommyScript:
  9845.     end
  9846.  
  9847.  TrainerSchoolboyJohnny:
  9848.     trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, $0000, SchoolboyJohnnyScript
  9849.  
  9850.  SchoolboyJohnnyScript:
  9851.     talkaftercancel
  9852. @@ -61,7 +61,7 @@ SchoolboyJohnnyScript:
  9853.     end
  9854.  
  9855.  TrainerSchoolboyBilly:
  9856.     trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, $0000, SchoolboyBillyScript
  9857.  
  9858.  SchoolboyBillyScript:
  9859.     talkaftercancel
  9860. @@ -210,10 +210,10 @@ Route15_MapEventHeader:
  9861.  
  9862.  .PersonEvents:
  9863.     db 7
  9864. -   person_event SPRITE_YOUNGSTER, 10, 10, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSchoolboyKipp, -1
  9865. -   person_event SPRITE_YOUNGSTER, 13, 15, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyTommy, -1
  9866. -   person_event SPRITE_YOUNGSTER, 10, 33, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyJohnny, -1
  9867. -   person_event SPRITE_YOUNGSTER, 10, 27, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyBilly, -1
  9868. -   person_event SPRITE_TEACHER, 12, 30, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerTeacherColette, -1
  9869. -   person_event SPRITE_TEACHER, 10, 20, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerTeacherHillary, -1
  9870. -   person_event SPRITE_POKE_BALL, 5, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP
  9871. +   person_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSchoolboyKipp, -1
  9872. +   person_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyTommy, -1
  9873. +   person_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyJohnny, -1
  9874. +   person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyBilly, -1
  9875. +   person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerTeacherColette, -1
  9876. +   person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerTeacherHillary, -1
  9877. +   person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP
  9878. diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
  9879. index 2ffb7ee..b13051d 100644
  9880. --- a/maps/Route15FuchsiaGate.asm
  9881. +++ b/maps/Route15FuchsiaGate.asm
  9882. @@ -35,4 +35,4 @@ Route15FuchsiaGate_MapEventHeader:
  9883.  
  9884.  .PersonEvents:
  9885.     db 1
  9886. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19679e, -1
  9887. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19679e, -1
  9888. diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
  9889. index aab16e3..e46b573 100644
  9890. --- a/maps/Route16FuchsiaSpeechHouse.asm
  9891. +++ b/maps/Route16FuchsiaSpeechHouse.asm
  9892. @@ -38,4 +38,4 @@ Route16FuchsiaSpeechHouse_MapEventHeader:
  9893.  
  9894.  .PersonEvents:
  9895.     db 1
  9896. -   person_event SPRITE_SUPER_NERD, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x73373, -1
  9897. +   person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x73373, -1
  9898. diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
  9899. index b2ad14e..e2e860b 100644
  9900. --- a/maps/Route16Gate.asm
  9901. +++ b/maps/Route16Gate.asm
  9902. @@ -3,7 +3,7 @@ Route16Gate_MapScriptHeader:
  9903.     db 1
  9904.  
  9905.     ; triggers
  9906.     dw UnknownScript_0x733e9, $0000
  9907.  
  9908.  .MapCallbacks:
  9909.     db 0
  9910. @@ -80,4 +80,4 @@ Route16Gate_MapEventHeader:
  9911.  
  9912.  .PersonEvents:
  9913.     db 1
  9914. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x733ea, -1
  9915. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x733ea, -1
  9916. diff --git a/maps/Route17.asm b/maps/Route17.asm
  9917. index 6543def..5518d86 100644
  9918. --- a/maps/Route17.asm
  9919. +++ b/maps/Route17.asm
  9920. @@ -15,7 +15,7 @@ UnknownScript_0x1ad0ab:
  9921.     return
  9922.  
  9923.  TrainerBikerCharles:
  9924.     trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, $0000, BikerCharlesScript
  9925.  
  9926.  BikerCharlesScript:
  9927.     talkaftercancel
  9928. @@ -26,7 +26,7 @@ BikerCharlesScript:
  9929.     end
  9930.  
  9931.  TrainerBikerRiley:
  9932.     trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, $0000, BikerRileyScript
  9933.  
  9934.  BikerRileyScript:
  9935.     talkaftercancel
  9936. @@ -37,7 +37,7 @@ BikerRileyScript:
  9937.     end
  9938.  
  9939.  TrainerBikerJoel:
  9940.     trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, $0000, BikerJoelScript
  9941.  
  9942.  BikerJoelScript:
  9943.     talkaftercancel
  9944. @@ -48,7 +48,7 @@ BikerJoelScript:
  9945.     end
  9946.  
  9947.  TrainerBikerGlenn:
  9948.     trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, $0000, BikerGlennScript
  9949.  
  9950.  BikerGlennScript:
  9951.     talkaftercancel
  9952. @@ -150,7 +150,7 @@ Route17_MapEventHeader:
  9953.  
  9954.  .PersonEvents:
  9955.     db 4
  9956. -   person_event SPRITE_BIKER, 17, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerBikerRiley, -1
  9957. -   person_event SPRITE_BIKER, 68, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBikerJoel, -1
  9958. -   person_event SPRITE_BIKER, 53, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBikerGlenn, -1
  9959. -   person_event SPRITE_BIKER, 80, 6, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerBikerCharles, -1
  9960. +   person_event SPRITE_BIKER, 17, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerBikerRiley, -1
  9961. +   person_event SPRITE_BIKER, 68, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBikerJoel, -1
  9962. +   person_event SPRITE_BIKER, 53, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBikerGlenn, -1
  9963. +   person_event SPRITE_BIKER, 80, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerBikerCharles, -1
  9964. diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm
  9965. index c23d76d..7ef82c1 100644
  9966. --- a/maps/Route1718Gate.asm
  9967. +++ b/maps/Route1718Gate.asm
  9968. @@ -3,7 +3,7 @@ Route1718Gate_MapScriptHeader:
  9969.     db 1
  9970.  
  9971.     ; triggers
  9972.     dw UnknownScript_0x7360d, $0000
  9973.  
  9974.  .MapCallbacks:
  9975.     db 0
  9976. @@ -71,4 +71,4 @@ Route1718Gate_MapEventHeader:
  9977.  
  9978.  .PersonEvents:
  9979.     db 1
  9980. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7360e, -1
  9981. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7360e, -1
  9982. diff --git a/maps/Route18.asm b/maps/Route18.asm
  9983. index 00728f8..e895951 100644
  9984. --- a/maps/Route18.asm
  9985. +++ b/maps/Route18.asm
  9986. @@ -6,7 +6,7 @@ Route18_MapScriptHeader:
  9987.     db 0
  9988.  
  9989.  TrainerBird_keeperBoris:
  9990.     trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, $0000, Bird_keeperBorisScript
  9991.  
  9992.  Bird_keeperBorisScript:
  9993.     talkaftercancel
  9994. @@ -17,7 +17,7 @@ Bird_keeperBorisScript:
  9995.     end
  9996.  
  9997.  TrainerBird_keeperBob:
  9998.     trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, $0000, Bird_keeperBobScript
  9999.  
  10000.  Bird_keeperBobScript:
  10001.     talkaftercancel
  10002. @@ -91,5 +91,5 @@ Route18_MapEventHeader:
  10003.  
  10004.  .PersonEvents:
  10005.     db 2
  10006. -   person_event SPRITE_YOUNGSTER, 12, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBoris, -1
  10007. -   person_event SPRITE_YOUNGSTER, 6, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBob, -1
  10008. +   person_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBoris, -1
  10009. +   person_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBob, -1
  10010. diff --git a/maps/Route19.asm b/maps/Route19.asm
  10011. index beb87fd..6c58a16 100644
  10012. --- a/maps/Route19.asm
  10013. +++ b/maps/Route19.asm
  10014. @@ -22,7 +22,7 @@ Route19_MapScriptHeader:
  10015.     return
  10016.  
  10017.  TrainerSwimmerfDawn:
  10018.     trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, $0000, SwimmerfDawnScript
  10019.  
  10020.  SwimmerfDawnScript:
  10021.     talkaftercancel
  10022. @@ -33,7 +33,7 @@ SwimmerfDawnScript:
  10023.     end
  10024.  
  10025.  TrainerSwimmermHarold:
  10026.     trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, $0000, SwimmermHaroldScript
  10027.  
  10028.  SwimmermHaroldScript:
  10029.     talkaftercancel
  10030. @@ -44,7 +44,7 @@ SwimmermHaroldScript:
  10031.     end
  10032.  
  10033.  TrainerSwimmermJerome:
  10034.     trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, $0000, SwimmermJeromeScript
  10035.  
  10036.  SwimmermJeromeScript:
  10037.     talkaftercancel
  10038. @@ -55,7 +55,7 @@ SwimmermJeromeScript:
  10039.     end
  10040.  
  10041.  TrainerSwimmermTucker:
  10042.     trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, $0000, SwimmermTuckerScript
  10043.  
  10044.  SwimmermTuckerScript:
  10045.     talkaftercancel
  10046. @@ -247,9 +247,9 @@ Route19_MapEventHeader:
  10047.  
  10048.  .PersonEvents:
  10049.     db 6
  10050. -   person_event SPRITE_SWIMMER_GIRL, 23, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerSwimmerfDawn, -1
  10051. -   person_event SPRITE_SWIMMER_GUY, 28, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermHarold, -1
  10052. -   person_event SPRITE_SWIMMER_GUY, 17, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermJerome, -1
  10053. -   person_event SPRITE_SWIMMER_GUY, 23, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerSwimmermTucker, -1
  10054. -   person_event SPRITE_FISHER, 5, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 1, FisherScript_0x19ea4d, -1
  10055. -   person_event SPRITE_FISHER, 5, 11, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, FisherScript_0x19ea61, -1
  10056. +   person_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerSwimmerfDawn, -1
  10057. +   person_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermHarold, -1
  10058. +   person_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermJerome, -1
  10059. +   person_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerSwimmermTucker, -1
  10060. +   person_event SPRITE_FISHER, 5, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 1, FisherScript_0x19ea4d, -1
  10061. +   person_event SPRITE_FISHER, 5, 11, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, FisherScript_0x19ea61, -1
  10062. diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
  10063. index 1036a5f..87b4397 100644
  10064. --- a/maps/Route19FuchsiaGate.asm
  10065. +++ b/maps/Route19FuchsiaGate.asm
  10066. @@ -61,4 +61,4 @@ Route19FuchsiaGate_MapEventHeader:
  10067.  
  10068.  .PersonEvents:
  10069.     db 1
  10070. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x1ab3f6, -1
  10071. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x1ab3f6, -1
  10072. diff --git a/maps/Route2.asm b/maps/Route2.asm
  10073. index 79a72bf..96ef0cf 100644
  10074. --- a/maps/Route2.asm
  10075. +++ b/maps/Route2.asm
  10076. @@ -6,7 +6,7 @@ Route2_MapScriptHeader:
  10077.     db 0
  10078.  
  10079.  TrainerBug_catcherRob:
  10080.     trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, $0000, Bug_catcherRobScript
  10081.  
  10082.  Bug_catcherRobScript:
  10083.     talkaftercancel
  10084. @@ -17,7 +17,7 @@ Bug_catcherRobScript:
  10085.     end
  10086.  
  10087.  TrainerBug_catcherEd:
  10088.     trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, $0000, Bug_catcherEdScript
  10089.  
  10090.  Bug_catcherEdScript:
  10091.     talkaftercancel
  10092. @@ -28,7 +28,7 @@ Bug_catcherEdScript:
  10093.     end
  10094.  
  10095.  TrainerBug_catcherDoug:
  10096.     trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, $0000, Bug_catcherDougScript
  10097.  
  10098.  Bug_catcherDougScript:
  10099.     talkaftercancel
  10100. @@ -162,11 +162,11 @@ Route2_MapEventHeader:
  10101.  
  10102.  .PersonEvents:
  10103.     db 8
  10104. -   person_event SPRITE_BUG_CATCHER, 45, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 5, TrainerBug_catcherRob, -1
  10105. -   person_event SPRITE_BUG_CATCHER, 4, 6, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherEd, -1
  10106. -   person_event SPRITE_BUG_CATCHER, 40, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherDoug, -1
  10107. -   person_event SPRITE_POKE_BALL, 29, 0, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT
  10108. -   person_event SPRITE_POKE_BALL, 23, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION
  10109. -   person_event SPRITE_POKE_BALL, 2, 19, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS
  10110. -   person_event SPRITE_POKE_BALL, 50, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER
  10111. -   person_event SPRITE_FRUIT_TREE, 14, 10, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac306, -1
  10112. +   person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 5, TrainerBug_catcherRob, -1
  10113. +   person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherEd, -1
  10114. +   person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherDoug, -1
  10115. +   person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT
  10116. +   person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION
  10117. +   person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS
  10118. +   person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER
  10119. +   person_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac306, -1
  10120. diff --git a/maps/Route20.asm b/maps/Route20.asm
  10121. index e623138..0873c9c 100644
  10122. --- a/maps/Route20.asm
  10123. +++ b/maps/Route20.asm
  10124. @@ -14,7 +14,7 @@ Route20_MapScriptHeader:
  10125.     return
  10126.  
  10127.  TrainerSwimmerfNicole:
  10128.     trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, $0000, SwimmerfNicoleScript
  10129.  
  10130.  SwimmerfNicoleScript:
  10131.     talkaftercancel
  10132. @@ -25,7 +25,7 @@ SwimmerfNicoleScript:
  10133.     end
  10134.  
  10135.  TrainerSwimmerfLori:
  10136.     trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, $0000, SwimmerfLoriScript
  10137.  
  10138.  SwimmerfLoriScript:
  10139.     talkaftercancel
  10140. @@ -36,7 +36,7 @@ SwimmerfLoriScript:
  10141.     end
  10142.  
  10143.  TrainerSwimmermCameron:
  10144.     trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, $0000, SwimmermCameronScript
  10145.  
  10146.  SwimmermCameronScript:
  10147.     talkaftercancel
  10148. @@ -127,6 +127,6 @@ Route20_MapEventHeader:
  10149.  
  10150.  .PersonEvents:
  10151.     db 3
  10152. -   person_event SPRITE_SWIMMER_GIRL, 8, 52, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfNicole, -1
  10153. -   person_event SPRITE_SWIMMER_GIRL, 13, 45, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfLori, -1
  10154. -   person_event SPRITE_SWIMMER_GUY, 13, 12, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermCameron, -1
  10155. +   person_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfNicole, -1
  10156. +   person_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfLori, -1
  10157. +   person_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermCameron, -1
  10158. diff --git a/maps/Route21.asm b/maps/Route21.asm
  10159. index 15dd2d9..a1aeb83 100644
  10160. --- a/maps/Route21.asm
  10161. +++ b/maps/Route21.asm
  10162. @@ -6,7 +6,7 @@ Route21_MapScriptHeader:
  10163.     db 0
  10164.  
  10165.  TrainerSwimmermSeth:
  10166.     trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, $0000, SwimmermSethScript
  10167.  
  10168.  SwimmermSethScript:
  10169.     talkaftercancel
  10170. @@ -17,7 +17,7 @@ SwimmermSethScript:
  10171.     end
  10172.  
  10173.  TrainerSwimmerfNikki:
  10174.     trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, $0000, SwimmerfNikkiScript
  10175.  
  10176.  SwimmerfNikkiScript:
  10177.     talkaftercancel
  10178. @@ -28,7 +28,7 @@ SwimmerfNikkiScript:
  10179.     end
  10180.  
  10181.  TrainerFisherArnold:
  10182.     trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, $0000, FisherArnoldScript
  10183.  
  10184.  FisherArnoldScript:
  10185.     talkaftercancel
  10186. @@ -99,6 +99,6 @@ Route21_MapEventHeader:
  10187.  
  10188.  .PersonEvents:
  10189.     db 3
  10190. -   person_event SPRITE_SWIMMER_GIRL, 16, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfNikki, -1
  10191. -   person_event SPRITE_SWIMMER_GUY, 30, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerSwimmermSeth, -1
  10192. -   person_event SPRITE_FISHER, 22, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherArnold, -1
  10193. +   person_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfNikki, -1
  10194. +   person_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerSwimmermSeth, -1
  10195. +   person_event SPRITE_FISHER, 22, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherArnold, -1
  10196. diff --git a/maps/Route24.asm b/maps/Route24.asm
  10197. index fffc4ca..0a35bce 100644
  10198. --- a/maps/Route24.asm
  10199. +++ b/maps/Route24.asm
  10200. @@ -130,4 +130,4 @@ Route24_MapEventHeader:
  10201.  
  10202.  .PersonEvents:
  10203.     db 1
  10204. -   person_event SPRITE_ROCKET, 7, 8, $3, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
  10205. +   person_event SPRITE_ROCKET, 7, 8, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
  10206. diff --git a/maps/Route25.asm b/maps/Route25.asm
  10207. index 7b3fee4..cea7ecd 100644
  10208. --- a/maps/Route25.asm
  10209. +++ b/maps/Route25.asm
  10210. @@ -3,8 +3,8 @@ Route25_MapScriptHeader:
  10211.     db 2
  10212.  
  10213.     ; triggers
  10214.     dw UnknownScript_0x19ee9e, $0000
  10215.     dw UnknownScript_0x19ee9f, $0000
  10216.  
  10217.  .MapCallbacks:
  10218.     db 0
  10219. @@ -68,7 +68,7 @@ UnknownScript_0x19eee0:
  10220.     end
  10221.  
  10222.  TrainerSchoolboyDudley:
  10223.     trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, $0000, SchoolboyDudleyScript
  10224.  
  10225.  SchoolboyDudleyScript:
  10226.     talkaftercancel
  10227. @@ -79,7 +79,7 @@ SchoolboyDudleyScript:
  10228.     end
  10229.  
  10230.  TrainerLassEllen:
  10231.     trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, $0000, LassEllenScript
  10232.  
  10233.  LassEllenScript:
  10234.     talkaftercancel
  10235. @@ -90,7 +90,7 @@ LassEllenScript:
  10236.     end
  10237.  
  10238.  TrainerSchoolboyJoe:
  10239.     trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, $0000, SchoolboyJoeScript
  10240.  
  10241.  SchoolboyJoeScript:
  10242.     talkaftercancel
  10243. @@ -101,7 +101,7 @@ SchoolboyJoeScript:
  10244.     end
  10245.  
  10246.  TrainerLassLaura:
  10247.     trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, $0000, LassLauraScript
  10248.  
  10249.  LassLauraScript:
  10250.     talkaftercancel
  10251. @@ -112,7 +112,7 @@ LassLauraScript:
  10252.     end
  10253.  
  10254.  TrainerCamperLloyd:
  10255.     trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, $0000, CamperLloydScript
  10256.  
  10257.  CamperLloydScript:
  10258.     talkaftercancel
  10259. @@ -123,7 +123,7 @@ CamperLloydScript:
  10260.     end
  10261.  
  10262.  TrainerLassShannon:
  10263.     trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, $0000, LassShannonScript
  10264.  
  10265.  LassShannonScript:
  10266.     talkaftercancel
  10267. @@ -134,7 +134,7 @@ LassShannonScript:
  10268.     end
  10269.  
  10270.  TrainerSupernerdPat:
  10271.     trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, $0000, SupernerdPatScript
  10272.  
  10273.  SupernerdPatScript:
  10274.     talkaftercancel
  10275. @@ -160,7 +160,7 @@ UnknownScript_0x19efc7:
  10276.     writetext UnknownText_0x19f49d
  10277.     closetext
  10278.     loadmovesprites
  10279.     winlosstext UnknownText_0x19f4fd, $0000
  10280.     loadtrainer COOLTRAINERM, KEVIN
  10281.     startbattle
  10282.     returnafterbattle
  10283. @@ -439,14 +439,14 @@ Route25_MapEventHeader:
  10284.  
  10285.  .PersonEvents:
  10286.     db 11
  10287. -   person_event SPRITE_MISTY, 9, 46, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
  10288. -   person_event SPRITE_COOLTRAINER_M, 10, 46, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
  10289. -   person_event SPRITE_YOUNGSTER, 8, 12, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyDudley, -1
  10290. -   person_event SPRITE_LASS, 11, 16, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassEllen, -1
  10291. -   person_event SPRITE_YOUNGSTER, 8, 21, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyJoe, -1
  10292. -   person_event SPRITE_LASS, 6, 22, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassLaura, -1
  10293. -   person_event SPRITE_YOUNGSTER, 4, 25, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperLloyd, -1
  10294. -   person_event SPRITE_LASS, 11, 28, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassShannon, -1
  10295. -   person_event SPRITE_SUPER_NERD, 7, 31, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerSupernerdPat, -1
  10296. -   person_event SPRITE_COOLTRAINER_M, 8, 37, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x19efac, -1
  10297. -   person_event SPRITE_POKE_BALL, 4, 32, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN
  10298. +   person_event SPRITE_MISTY, 9, 46, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
  10299. +   person_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
  10300. +   person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyDudley, -1
  10301. +   person_event SPRITE_LASS, 11, 16, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassEllen, -1
  10302. +   person_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyJoe, -1
  10303. +   person_event SPRITE_LASS, 6, 22, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassLaura, -1
  10304. +   person_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperLloyd, -1
  10305. +   person_event SPRITE_LASS, 11, 28, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassShannon, -1
  10306. +   person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerSupernerdPat, -1
  10307. +   person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x19efac, -1
  10308. +   person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN
  10309. diff --git a/maps/Route26.asm b/maps/Route26.asm
  10310. index 8feb734..fb08ce3 100644
  10311. --- a/maps/Route26.asm
  10312. +++ b/maps/Route26.asm
  10313. @@ -6,7 +6,7 @@ Route26_MapScriptHeader:
  10314.     db 0
  10315.  
  10316.  TrainerCooltrainermJake:
  10317.     trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, $0000, CooltrainermJakeScript
  10318.  
  10319.  CooltrainermJakeScript:
  10320.     talkaftercancel
  10321. @@ -17,7 +17,7 @@ CooltrainermJakeScript:
  10322.     end
  10323.  
  10324.  TrainerCooltrainermGaven3:
  10325.     trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, $0000, CooltrainermGaven3Script
  10326.  
  10327.  CooltrainermGaven3Script:
  10328.     writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
  10329. @@ -47,7 +47,7 @@ UnknownScript_0x1a4d65:
  10330.  
  10331.  UnknownScript_0x1a4d79:
  10332.     scall UnknownScript_0x1a4dd7
  10333.     winlosstext CooltrainermGaven3BeatenText, $0000
  10334.     copybytetovar wGavenFightCount
  10335.     if_equal 2, .Fight2
  10336.     if_equal 1, .Fight1
  10337. @@ -110,7 +110,7 @@ UnknownScript_0x1a4dd7:
  10338.     end
  10339.  
  10340.  TrainerCooltrainerfJoyce:
  10341.     trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, $0000, CooltrainerfJoyceScript
  10342.  
  10343.  CooltrainerfJoyceScript:
  10344.     talkaftercancel
  10345. @@ -121,7 +121,7 @@ CooltrainerfJoyceScript:
  10346.     end
  10347.  
  10348.  TrainerCooltrainerfBeth1:
  10349.     trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, $0000, CooltrainerfBeth1Script
  10350.  
  10351.  CooltrainerfBeth1Script:
  10352.     writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH
  10353. @@ -151,7 +151,7 @@ UnknownScript_0x1a4e21:
  10354.  
  10355.  UnknownScript_0x1a4e35:
  10356.     scall UnknownScript_0x1a4e93
  10357.     winlosstext CooltrainerfBeth1BeatenText, $0000
  10358.     copybytetovar wBethFightCount
  10359.     if_equal 2, .Fight2
  10360.     if_equal 1, .Fight1
  10361. @@ -214,7 +214,7 @@ UnknownScript_0x1a4e93:
  10362.     end
  10363.  
  10364.  TrainerPsychicRichard:
  10365.     trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, $0000, PsychicRichardScript
  10366.  
  10367.  PsychicRichardScript:
  10368.     talkaftercancel
  10369. @@ -225,7 +225,7 @@ PsychicRichardScript:
  10370.     end
  10371.  
  10372.  TrainerFisherScott:
  10373.     trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, $0000, FisherScottScript
  10374.  
  10375.  FisherScottScript:
  10376.     talkaftercancel
  10377. @@ -421,11 +421,11 @@ Route26_MapEventHeader:
  10378.  
  10379.  .PersonEvents:
  10380.     db 8
  10381. -   person_event SPRITE_COOLTRAINER_M, 24, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainermJake, -1
  10382. -   person_event SPRITE_COOLTRAINER_M, 38, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermGaven3, -1
  10383. -   person_event SPRITE_COOLTRAINER_F, 56, 10, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfJoyce, -1
  10384. -   person_event SPRITE_COOLTRAINER_F, 8, 5, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainerfBeth1, -1
  10385. -   person_event SPRITE_YOUNGSTER, 79, 13, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPsychicRichard, -1
  10386. -   person_event SPRITE_FISHER, 92, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherScott, -1
  10387. -   person_event SPRITE_FRUIT_TREE, 54, 14, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a4ec2, -1
  10388. -   person_event SPRITE_POKE_BALL, 15, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER
  10389. +   person_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainermJake, -1
  10390. +   person_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermGaven3, -1
  10391. +   person_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfJoyce, -1
  10392. +   person_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainerfBeth1, -1
  10393. +   person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPsychicRichard, -1
  10394. +   person_event SPRITE_FISHER, 92, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherScott, -1
  10395. +   person_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a4ec2, -1
  10396. +   person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER
  10397. diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm
  10398. index b0a8a1c..98ff25f 100644
  10399. --- a/maps/Route26DayofWeekSiblingsHouse.asm
  10400. +++ b/maps/Route26DayofWeekSiblingsHouse.asm
  10401. @@ -84,4 +84,4 @@ Route26DayofWeekSiblingsHouse_MapEventHeader:
  10402.  
  10403.  .PersonEvents:
  10404.     db 1
  10405. -   person_event SPRITE_POKEDEX, 3, 3, $1, 0, 0, -1, -1, 0, 0, 0, PokedexScript_0x7b1e4, -1
  10406. +   person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, PokedexScript_0x7b1e4, -1
  10407. diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm
  10408. index 44e3e90..be50228 100644
  10409. --- a/maps/Route26HealSpeechHouse.asm
  10410. +++ b/maps/Route26HealSpeechHouse.asm
  10411. @@ -64,4 +64,4 @@ Route26HealSpeechHouse_MapEventHeader:
  10412.  
  10413.  .PersonEvents:
  10414.     db 1
  10415. -   person_event SPRITE_TEACHER, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7b125, -1
  10416. +   person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7b125, -1
  10417. diff --git a/maps/Route27.asm b/maps/Route27.asm
  10418. index 3a3d871..1a4d81e 100644
  10419. --- a/maps/Route27.asm
  10420. +++ b/maps/Route27.asm
  10421. @@ -3,8 +3,8 @@ Route27_MapScriptHeader:
  10422.     db 2
  10423.  
  10424.     ; triggers
  10425.     dw UnknownScript_0x1a0871, $0000
  10426.     dw UnknownScript_0x1a0872, $0000
  10427.  
  10428.  .MapCallbacks:
  10429.     db 0
  10430. @@ -40,7 +40,7 @@ FisherScript_0x1a089c:
  10431.     jumptextfaceplayer UnknownText_0x1a0a71
  10432.  
  10433.  TrainerPsychicGilbert:
  10434.     trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, $0000, PsychicGilbertScript
  10435.  
  10436.  PsychicGilbertScript:
  10437.     talkaftercancel
  10438. @@ -51,7 +51,7 @@ PsychicGilbertScript:
  10439.     end
  10440.  
  10441.  TrainerBird_keeperJose2:
  10442.     trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, $0000, Bird_keeperJose2Script
  10443.  
  10444.  Bird_keeperJose2Script:
  10445.     writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
  10446. @@ -83,7 +83,7 @@ UnknownScript_0x1a08eb:
  10447.  
  10448.  UnknownScript_0x1a08ff:
  10449.     scall UnknownScript_0x1a096f
  10450.     winlosstext Bird_keeperJose2BeatenText, $0000
  10451.     copybytetovar wJoseFightCount
  10452.     if_equal 2, .Fight2
  10453.     if_equal 1, .Fight1
  10454. @@ -164,7 +164,7 @@ UnknownScript_0x1a0977:
  10455.     end
  10456.  
  10457.  TrainerCooltrainermBlake:
  10458.     trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, $0000, CooltrainermBlakeScript
  10459.  
  10460.  CooltrainermBlakeScript:
  10461.     talkaftercancel
  10462. @@ -175,7 +175,7 @@ CooltrainermBlakeScript:
  10463.     end
  10464.  
  10465.  TrainerCooltrainermBrian:
  10466.     trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, $0000, CooltrainermBrianScript
  10467.  
  10468.  CooltrainermBrianScript:
  10469.     talkaftercancel
  10470. @@ -186,7 +186,7 @@ CooltrainermBrianScript:
  10471.     end
  10472.  
  10473.  TrainerCooltrainerfReena:
  10474.     trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, $0000, CooltrainerfReena1Script
  10475.  
  10476.  CooltrainerfReena1Script:
  10477.     writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA
  10478. @@ -216,7 +216,7 @@ UnknownScript_0x1a09d5:
  10479.  
  10480.  UnknownScript_0x1a09e9:
  10481.     scall UnknownScript_0x1a0a47
  10482.     winlosstext CooltrainerfReena1BeatenText, $0000
  10483.     copybytetovar wReenaFightCount
  10484.     if_equal 2, .Fight2
  10485.     if_equal 1, .Fight1
  10486. @@ -279,7 +279,7 @@ UnknownScript_0x1a0a47:
  10487.     end
  10488.  
  10489.  TrainerCooltrainerfMegan:
  10490.     trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, $0000, CooltrainerfMeganScript
  10491.  
  10492.  CooltrainerfMeganScript:
  10493.     talkaftercancel
  10494. @@ -479,12 +479,12 @@ Route27_MapEventHeader:
  10495.  
  10496.  .PersonEvents:
  10497.     db 9
  10498. -   person_event SPRITE_COOLTRAINER_M, 7, 48, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermBlake, -1
  10499. -   person_event SPRITE_COOLTRAINER_M, 6, 58, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermBrian, -1
  10500. -   person_event SPRITE_COOLTRAINER_F, 10, 72, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainerfReena, -1
  10501. -   person_event SPRITE_COOLTRAINER_F, 6, 37, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfMegan, -1
  10502. -   person_event SPRITE_YOUNGSTER, 7, 65, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicGilbert, -1
  10503. -   person_event SPRITE_YOUNGSTER, 13, 58, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperJose2, -1
  10504. -   person_event SPRITE_POKE_BALL, 12, 60, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM
  10505. -   person_event SPRITE_POKE_BALL, 12, 53, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY
  10506. -   person_event SPRITE_FISHER, 10, 21, $3, 0, 0, -1, -1, 0, 0, 3, FisherScript_0x1a089c, -1
  10507. +   person_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermBlake, -1
  10508. +   person_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermBrian, -1
  10509. +   person_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainerfReena, -1
  10510. +   person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfMegan, -1
  10511. +   person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicGilbert, -1
  10512. +   person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperJose2, -1
  10513. +   person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM
  10514. +   person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY
  10515. +   person_event SPRITE_FISHER, 10, 21, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 3, FisherScript_0x1a089c, -1
  10516. diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
  10517. index 9737ae9..4a837aa 100644
  10518. --- a/maps/Route27SandstormHouse.asm
  10519. +++ b/maps/Route27SandstormHouse.asm
  10520. @@ -109,4 +109,4 @@ Route27SandstormHouse_MapEventHeader:
  10521.  
  10522.  .PersonEvents:
  10523.     db 1
  10524. -   person_event SPRITE_GRANNY, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, SandstormHouseWoman, -1
  10525. +   person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SandstormHouseWoman, -1
  10526. diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm
  10527. index a0f474b..ae7c41b 100644
  10528. --- a/maps/Route28FamousSpeechHouse.asm
  10529. +++ b/maps/Route28FamousSpeechHouse.asm
  10530. @@ -3,7 +3,7 @@ Route28FamousSpeechHouse_MapScriptHeader:
  10531.     db 1
  10532.  
  10533.     ; triggers
  10534.     dw .Trigger, $0000
  10535.  
  10536.  .MapCallbacks:
  10537.     db 0
  10538. @@ -87,5 +87,5 @@ Route28FamousSpeechHouse_MapEventHeader:
  10539.  
  10540.  .PersonEvents:
  10541.     db 2
  10542. -   person_event SPRITE_COOLTRAINER_F, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Celebrity, -1
  10543. -   person_event SPRITE_MOLTRES, 5, 6, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CelebritysFearow, -1
  10544. +   person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Celebrity, -1
  10545. +   person_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CelebritysFearow, -1
  10546. diff --git a/maps/Route29.asm b/maps/Route29.asm
  10547. index 0fa4f76..f8456b5 100644
  10548. --- a/maps/Route29.asm
  10549. +++ b/maps/Route29.asm
  10550. @@ -3,8 +3,8 @@ Route29_MapScriptHeader:
  10551.     db 2
  10552.  
  10553.     ; triggers
  10554.     dw UnknownScript_0x1a0f59, $0000
  10555.     dw UnknownScript_0x1a0f5a, $0000
  10556.  
  10557.  .MapCallbacks:
  10558.     db 1
  10559. @@ -430,11 +430,11 @@ Route29_MapEventHeader:
  10560.  
  10561.  .PersonEvents:
  10562.     db 8
  10563. -   person_event SPRITE_COOLTRAINER_M, 12, 50, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x1a0ff1, -1
  10564. -   person_event SPRITE_YOUNGSTER, 16, 27, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a1028, -1
  10565. -   person_event SPRITE_TEACHER, 11, 15, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a102b, -1
  10566. -   person_event SPRITE_FRUIT_TREE, 2, 12, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a1089, -1
  10567. -   person_event SPRITE_FISHER, 3, 25, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x1a102e, -1
  10568. -   person_event SPRITE_COOLTRAINER_M, 4, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x1a1031, -1
  10569. -   person_event SPRITE_TEACHER, 12, 29, $3, 0, 0, -1, -1, 0, 0, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
  10570. -   person_event SPRITE_POKE_BALL, 2, 48, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION
  10571. +   person_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x1a0ff1, -1
  10572. +   person_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a1028, -1
  10573. +   person_event SPRITE_TEACHER, 11, 15, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a102b, -1
  10574. +   person_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a1089, -1
  10575. +   person_event SPRITE_FISHER, 3, 25, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x1a102e, -1
  10576. +   person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x1a1031, -1
  10577. +   person_event SPRITE_TEACHER, 12, 29, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
  10578. +   person_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION
  10579. diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm
  10580. index 513e8f2..c138a0b 100644
  10581. --- a/maps/Route2946Gate.asm
  10582. +++ b/maps/Route2946Gate.asm
  10583. @@ -51,5 +51,5 @@ Route2946Gate_MapEventHeader:
  10584.  
  10585.  .PersonEvents:
  10586.     db 2
  10587. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x7b5bb, -1
  10588. -   person_event SPRITE_YOUNGSTER, 4, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x7b5be, -1
  10589. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x7b5bb, -1
  10590. +   person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x7b5be, -1
  10591. diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
  10592. index a49673d..8aa24ef 100644
  10593. --- a/maps/Route2Gate.asm
  10594. +++ b/maps/Route2Gate.asm
  10595. @@ -41,4 +41,4 @@ Route2Gate_MapEventHeader:
  10596.  
  10597.  .PersonEvents:
  10598.     db 1
  10599. -   person_event SPRITE_SCIENTIST, 4, 6, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x9b952, -1
  10600. +   person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x9b952, -1
  10601. diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm
  10602. index 8910846..0c71d08 100644
  10603. --- a/maps/Route2NuggetSpeechHouse.asm
  10604. +++ b/maps/Route2NuggetSpeechHouse.asm
  10605. @@ -66,4 +66,4 @@ Route2NuggetSpeechHouse_MapEventHeader:
  10606.  
  10607.  .PersonEvents:
  10608.     db 1
  10609. -   person_event SPRITE_FISHER, 4, 2, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x9b847, -1
  10610. +   person_event SPRITE_FISHER, 4, 2, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x9b847, -1
  10611. diff --git a/maps/Route3.asm b/maps/Route3.asm
  10612. index 8743543..3feda23 100644
  10613. --- a/maps/Route3.asm
  10614. +++ b/maps/Route3.asm
  10615. @@ -6,7 +6,7 @@ Route3_MapScriptHeader:
  10616.     db 0
  10617.  
  10618.  TrainerFirebreatherOtis:
  10619.     trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, $0000, FirebreatherOtisScript
  10620.  
  10621.  FirebreatherOtisScript:
  10622.     talkaftercancel
  10623. @@ -17,7 +17,7 @@ FirebreatherOtisScript:
  10624.     end
  10625.  
  10626.  TrainerYoungsterWarren:
  10627.     trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, $0000, YoungsterWarrenScript
  10628.  
  10629.  YoungsterWarrenScript:
  10630.     talkaftercancel
  10631. @@ -28,7 +28,7 @@ YoungsterWarrenScript:
  10632.     end
  10633.  
  10634.  TrainerYoungsterJimmy:
  10635.     trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, $0000, YoungsterJimmyScript
  10636.  
  10637.  YoungsterJimmyScript:
  10638.     talkaftercancel
  10639. @@ -39,7 +39,7 @@ YoungsterJimmyScript:
  10640.     end
  10641.  
  10642.  TrainerFirebreatherBurt:
  10643.     trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, $0000, FirebreatherBurtScript
  10644.  
  10645.  FirebreatherBurtScript:
  10646.     talkaftercancel
  10647. @@ -143,7 +143,7 @@ Route3_MapEventHeader:
  10648.  
  10649.  .PersonEvents:
  10650.     db 4
  10651. -   person_event SPRITE_FISHER, 12, 26, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherOtis, -1
  10652. -   person_event SPRITE_YOUNGSTER, 7, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterWarren, -1
  10653. -   person_event SPRITE_YOUNGSTER, 3, 16, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerYoungsterJimmy, -1
  10654. -   person_event SPRITE_FISHER, 5, 49, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerFirebreatherBurt, -1
  10655. +   person_event SPRITE_FISHER, 12, 26, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherOtis, -1
  10656. +   person_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterWarren, -1
  10657. +   person_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerYoungsterJimmy, -1
  10658. +   person_event SPRITE_FISHER, 5, 49, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerFirebreatherBurt, -1
  10659. diff --git a/maps/Route30.asm b/maps/Route30.asm
  10660. index 07667a7..13836a5 100644
  10661. --- a/maps/Route30.asm
  10662. +++ b/maps/Route30.asm
  10663. @@ -26,7 +26,7 @@ YoungsterScript_0x1a1673:
  10664.     end
  10665.  
  10666.  TrainerYoungsterJoey:
  10667.     trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, $0000, YoungsterJoey1Script
  10668.  
  10669.  YoungsterJoey1Script:
  10670.     writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY
  10671. @@ -56,7 +56,7 @@ UnknownScript_0x1a16cc:
  10672.  
  10673.  UnknownScript_0x1a16e0:
  10674.     scall UnknownScript_0x1a179b
  10675.     winlosstext YoungsterJoey1BeatenText, $0000
  10676.     copybytetovar wJoeyFightCount
  10677.     if_equal 4, .Fight4
  10678.     if_equal 3, .Fight3
  10679. @@ -173,7 +173,7 @@ UnknownScript_0x1a17a6:
  10680.     end
  10681.  
  10682.  TrainerYoungsterMikey:
  10683.     trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, $0000, YoungsterMikeyScript
  10684.  
  10685.  YoungsterMikeyScript:
  10686.     talkaftercancel
  10687. @@ -184,7 +184,7 @@ YoungsterMikeyScript:
  10688.     end
  10689.  
  10690.  TrainerBug_catcherDon:
  10691.     trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, $0000, Bug_catcherDonScript
  10692.  
  10693.  Bug_catcherDonScript:
  10694.     talkaftercancel
  10695. @@ -416,14 +416,14 @@ Route30_MapEventHeader:
  10696.  
  10697.  .PersonEvents:
  10698.     db 11
  10699. -   person_event SPRITE_YOUNGSTER, 26, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE
  10700. -   person_event SPRITE_YOUNGSTER, 28, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
  10701. -   person_event SPRITE_YOUNGSTER, 23, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerYoungsterMikey, -1
  10702. -   person_event SPRITE_BUG_CATCHER, 7, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherDon, -1
  10703. -   person_event SPRITE_YOUNGSTER, 30, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a17d2, -1
  10704. -   person_event SPRITE_MONSTER, 24, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
  10705. -   person_event SPRITE_MONSTER, 25, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
  10706. -   person_event SPRITE_FRUIT_TREE, 39, 5, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a17f7, -1
  10707. -   person_event SPRITE_FRUIT_TREE, 5, 11, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a17f9, -1
  10708. -   person_event SPRITE_COOLTRAINER_F, 13, 2, $6, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x1a17e6, -1
  10709. -   person_event SPRITE_POKE_BALL, 35, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE
  10710. +   person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE
  10711. +   person_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
  10712. +   person_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerYoungsterMikey, -1
  10713. +   person_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherDon, -1
  10714. +   person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a17d2, -1
  10715. +   person_event SPRITE_MONSTER, 24, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
  10716. +   person_event SPRITE_MONSTER, 25, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
  10717. +   person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a17f7, -1
  10718. +   person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a17f9, -1
  10719. +   person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x1a17e6, -1
  10720. +   person_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE
  10721. diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm
  10722. index 3590efc..56a3604 100644
  10723. --- a/maps/Route30BerrySpeechHouse.asm
  10724. +++ b/maps/Route30BerrySpeechHouse.asm
  10725. @@ -62,4 +62,4 @@ Route30BerrySpeechHouse_MapEventHeader:
  10726.  
  10727.  .PersonEvents:
  10728.     db 1
  10729. -   person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x196d64, -1
  10730. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x196d64, -1
  10731. diff --git a/maps/Route31.asm b/maps/Route31.asm
  10732. index 8328591..9bf820e 100644
  10733. --- a/maps/Route31.asm
  10734. +++ b/maps/Route31.asm
  10735. @@ -19,7 +19,7 @@ UnknownScript_0x1a5443:
  10736.     return
  10737.  
  10738.  TrainerBug_catcherWade1:
  10739.     trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, $0000, Bug_catcherWade1Script
  10740.  
  10741.  Bug_catcherWade1Script:
  10742.     writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE
  10743. @@ -51,7 +51,7 @@ UnknownScript_0x1a547f:
  10744.  
  10745.  UnknownScript_0x1a5493:
  10746.     scall UnknownScript_0x1a5564
  10747.     winlosstext Bug_catcherWade1BeatenText, $0000
  10748.     copybytetovar wWadeFightCount
  10749.     if_equal 4, .Fight4
  10750.     if_equal 3, .Fight3
  10751. @@ -430,10 +430,10 @@ Route31_MapEventHeader:
  10752.  
  10753.  .PersonEvents:
  10754.     db 7
  10755. -   person_event SPRITE_FISHER, 7, 17, $6, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1a5570, -1
  10756. -   person_event SPRITE_YOUNGSTER, 5, 9, $2, 1, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a55ed, -1
  10757. -   person_event SPRITE_BUG_CATCHER, 13, 21, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 5, TrainerBug_catcherWade1, -1
  10758. -   person_event SPRITE_COOLTRAINER_M, 8, 33, $2, 1, 1, -1, -1, 0, 0, 0, CooltrainerMScript_0x1a55f6, -1
  10759. -   person_event SPRITE_FRUIT_TREE, 7, 16, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a55f9, -1
  10760. -   person_event SPRITE_POKE_BALL, 5, 29, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION
  10761. -   person_event SPRITE_POKE_BALL, 15, 19, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL
  10762. +   person_event SPRITE_FISHER, 7, 17, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1a5570, -1
  10763. +   person_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a55ed, -1
  10764. +   person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 5, TrainerBug_catcherWade1, -1
  10765. +   person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, CooltrainerMScript_0x1a55f6, -1
  10766. +   person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a55f9, -1
  10767. +   person_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION
  10768. +   person_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL
  10769. diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
  10770. index 83fd9ed..cf4ccf9 100644
  10771. --- a/maps/Route31VioletGate.asm
  10772. +++ b/maps/Route31VioletGate.asm
  10773. @@ -42,5 +42,5 @@ Route31VioletGate_MapEventHeader:
  10774.  
  10775.  .PersonEvents:
  10776.     db 2
  10777. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x197634, -1
  10778. -   person_event SPRITE_COOLTRAINER_F, 2, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerFScript_0x197637, -1
  10779. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x197634, -1
  10780. +   person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerFScript_0x197637, -1
  10781. diff --git a/maps/Route32.asm b/maps/Route32.asm
  10782. index 9b4bfe5..f988c16 100644
  10783. --- a/maps/Route32.asm
  10784. +++ b/maps/Route32.asm
  10785. @@ -3,9 +3,9 @@ Route32_MapScriptHeader:
  10786.     db 3
  10787.  
  10788.     ; triggers
  10789.     dw UnknownScript_0x190460, $0000
  10790.     dw UnknownScript_0x190461, $0000
  10791.     dw UnknownScript_0x190462, $0000
  10792.  
  10793.  .MapCallbacks:
  10794.     db 1
  10795. @@ -133,7 +133,7 @@ UnknownScript_0x190503:
  10796.     end
  10797.  
  10798.  TrainerCamperRoland:
  10799.     trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, $0000, CamperRolandScript
  10800.  
  10801.  CamperRolandScript:
  10802.     talkaftercancel
  10803. @@ -144,7 +144,7 @@ CamperRolandScript:
  10804.     end
  10805.  
  10806.  TrainerFisherJustin:
  10807.     trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, $0000, FisherJustinScript
  10808.  
  10809.  FisherJustinScript:
  10810.     talkaftercancel
  10811. @@ -155,7 +155,7 @@ FisherJustinScript:
  10812.     end
  10813.  
  10814.  TrainerFisherRalph1:
  10815.     trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, $0000, FisherRalph1Script
  10816.  
  10817.  FisherRalph1Script:
  10818.     writecode VAR_CALLERID, PHONE_FISHER_RALPH
  10819. @@ -187,7 +187,7 @@ UnknownScript_0x190569:
  10820.  
  10821.  UnknownScript_0x19057d:
  10822.     scall UnknownScript_0x19060f
  10823.     winlosstext FisherRalph1BeatenText, $0000
  10824.     copybytetovar wRalphFightCount
  10825.     if_equal 4, .Fight4
  10826.     if_equal 3, .Fight3
  10827. @@ -280,7 +280,7 @@ UnknownScript_0x19060f:
  10828.     end
  10829.  
  10830.  TrainerFisherHenry:
  10831.     trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, $0000, FisherHenryScript
  10832.  
  10833.  FisherHenryScript:
  10834.     talkaftercancel
  10835. @@ -291,7 +291,7 @@ FisherHenryScript:
  10836.     end
  10837.  
  10838.  TrainerPicnickerLiz1:
  10839.     trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, $0000, PicnickerLiz1Script
  10840.  
  10841.  PicnickerLiz1Script:
  10842.     writecode VAR_CALLERID, PHONE_PICNICKER_LIZ
  10843. @@ -321,7 +321,7 @@ UnknownScript_0x190659:
  10844.  
  10845.  UnknownScript_0x19066d:
  10846.     scall UnknownScript_0x1906f9
  10847.     winlosstext PicnickerLiz1BeatenText, $0000
  10848.     copybytetovar wLizFightCount
  10849.     if_equal 4, .Fight4
  10850.     if_equal 3, .Fight3
  10851. @@ -408,7 +408,7 @@ UnknownScript_0x1906f9:
  10852.     end
  10853.  
  10854.  TrainerYoungsterAlbert:
  10855.     trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, $0000, YoungsterAlbertScript
  10856.  
  10857.  YoungsterAlbertScript:
  10858.     talkaftercancel
  10859. @@ -419,7 +419,7 @@ YoungsterAlbertScript:
  10860.     end
  10861.  
  10862.  TrainerYoungsterGordon:
  10863.     trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, $0000, YoungsterGordonScript
  10864.  
  10865.  YoungsterGordonScript:
  10866.     talkaftercancel
  10867. @@ -430,7 +430,7 @@ YoungsterGordonScript:
  10868.     end
  10869.  
  10870.  TrainerBird_keeperPeter:
  10871.     trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, $0000, Bird_keeperPeterScript
  10872.  
  10873.  Bird_keeperPeterScript:
  10874.     talkaftercancel
  10875. @@ -946,17 +946,17 @@ Route32_MapEventHeader:
  10876.  
  10877.  .PersonEvents:
  10878.     db 14
  10879. -   person_event SPRITE_FISHER, 49, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherJustin, -1
  10880. -   person_event SPRITE_FISHER, 56, 12, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherRalph1, -1
  10881. -   person_event SPRITE_FISHER, 48, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherHenry, -1
  10882. -   person_event SPRITE_YOUNGSTER, 22, 12, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterAlbert, -1
  10883. -   person_event SPRITE_YOUNGSTER, 63, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterGordon, -1
  10884. -   person_event SPRITE_YOUNGSTER, 45, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperRoland, -1
  10885. -   person_event SPRITE_LASS, 30, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerLiz1, -1
  10886. -   person_event SPRITE_COOLTRAINER_M, 8, 19, $8, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x19046f, -1
  10887. -   person_event SPRITE_YOUNGSTER, 82, 11, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperPeter, -1
  10888. -   person_event SPRITE_FISHER, 70, 7, $6, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS
  10889. -   person_event SPRITE_POKE_BALL, 53, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x190773, EVENT_ROUTE_32_GREAT_BALL
  10890. -   person_event SPRITE_FISHER, 13, 15, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1904ce, -1
  10891. -   person_event SPRITE_LASS, 67, 12, $8, 0, 0, -1, -1, 0, 0, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
  10892. -   person_event SPRITE_POKE_BALL, 30, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL
  10893. +   person_event SPRITE_FISHER, 49, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherJustin, -1
  10894. +   person_event SPRITE_FISHER, 56, 12, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherRalph1, -1
  10895. +   person_event SPRITE_FISHER, 48, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherHenry, -1
  10896. +   person_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterAlbert, -1
  10897. +   person_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterGordon, -1
  10898. +   person_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperRoland, -1
  10899. +   person_event SPRITE_LASS, 30, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerLiz1, -1
  10900. +   person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x19046f, -1
  10901. +   person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperPeter, -1
  10902. +   person_event SPRITE_FISHER, 70, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS
  10903. +   person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x190773, EVENT_ROUTE_32_GREAT_BALL
  10904. +   person_event SPRITE_FISHER, 13, 15, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1904ce, -1
  10905. +   person_event SPRITE_LASS, 67, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
  10906. +   person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL
  10907. diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm
  10908. index 2ef9c76..bdf99ed 100644
  10909. --- a/maps/Route32PokeCenter1F.asm
  10910. +++ b/maps/Route32PokeCenter1F.asm
  10911. @@ -107,6 +107,6 @@ Route32PokeCenter1F_MapEventHeader:
  10912.  
  10913.  .PersonEvents:
  10914.     db 3
  10915. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x69b52, -1
  10916. -   person_event SPRITE_FISHING_GURU, 4, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x69b55, -1
  10917. -   person_event SPRITE_COOLTRAINER_F, 2, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x69b80, -1
  10918. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x69b52, -1
  10919. +   person_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x69b55, -1
  10920. +   person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x69b80, -1
  10921. diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm
  10922. index 2c48582..c291148 100644
  10923. --- a/maps/Route32RuinsofAlphGate.asm
  10924. +++ b/maps/Route32RuinsofAlphGate.asm
  10925. @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader:
  10926.  
  10927.  .PersonEvents:
  10928.     db 3
  10929. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x69a2d, -1
  10930. -   person_event SPRITE_POKEFAN_M, 2, 8, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x69a30, -1
  10931. -   person_event SPRITE_YOUNGSTER, 6, 1, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x69a33, -1
  10932. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x69a2d, -1
  10933. +   person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x69a30, -1
  10934. +   person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x69a33, -1
  10935. diff --git a/maps/Route33.asm b/maps/Route33.asm
  10936. index e24e1a3..fc44601 100644
  10937. --- a/maps/Route33.asm
  10938. +++ b/maps/Route33.asm
  10939. @@ -9,7 +9,7 @@ LassScript_0x1ac002:
  10940.     jumptextfaceplayer UnknownText_0x1ac1e7
  10941.  
  10942.  TrainerHikerAnthony:
  10943.     trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, $0000, HikerAnthony2Script
  10944.  
  10945.  HikerAnthony2Script:
  10946.     writecode VAR_CALLERID, PHONE_HIKER_ANTHONY
  10947. @@ -41,7 +41,7 @@ UnknownScript_0x1ac03d:
  10948.  
  10949.  UnknownScript_0x1ac051:
  10950.     scall UnknownScript_0x1ac0e3
  10951.     winlosstext HikerAnthony2BeatenText, $0000
  10952.     copybytetovar wAnthonyFightCount
  10953.     if_equal 4, .Fight4
  10954.     if_equal 3, .Fight3
  10955. @@ -206,6 +206,6 @@ Route33_MapEventHeader:
  10956.  
  10957.  .PersonEvents:
  10958.     db 3
  10959. -   person_event SPRITE_POKEFAN_M, 13, 6, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerAnthony, -1
  10960. -   person_event SPRITE_LASS, 16, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1ac002, -1
  10961. -   person_event SPRITE_FRUIT_TREE, 16, 14, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac0ea, -1
  10962. +   person_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerAnthony, -1
  10963. +   person_event SPRITE_LASS, 16, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1ac002, -1
  10964. +   person_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac0ea, -1
  10965. diff --git a/maps/Route34.asm b/maps/Route34.asm
  10966. index 7a9bae1..1709734 100644
  10967. --- a/maps/Route34.asm
  10968. +++ b/maps/Route34.asm
  10969. @@ -76,7 +76,7 @@ DaycareMon2Script_0x7806b:
  10970.     end
  10971.  
  10972.  TrainerCamperTodd1:
  10973.     trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, $0000, CamperTodd1Script
  10974.  
  10975.  CamperTodd1Script:
  10976.     writecode VAR_CALLERID, PHONE_CAMPER_TODD
  10977. @@ -108,7 +108,7 @@ UnknownScript_0x780a9:
  10978.  
  10979.  UnknownScript_0x780bd:
  10980.     scall UnknownScript_0x7814f
  10981.     winlosstext CamperTodd1BeatenText, $0000
  10982.     copybytetovar wToddFightCount
  10983.     if_equal 4, .Fight4
  10984.     if_equal 3, .Fight3
  10985. @@ -201,7 +201,7 @@ UnknownScript_0x7814f:
  10986.     end
  10987.  
  10988.  TrainerPicnickerGina1:
  10989.     trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, $0000, PicnickerGina1Script
  10990.  
  10991.  PicnickerGina1Script:
  10992.     writecode VAR_CALLERID, PHONE_PICNICKER_GINA
  10993. @@ -233,7 +233,7 @@ UnknownScript_0x7818b:
  10994.  
  10995.  UnknownScript_0x7819f:
  10996.     scall UnknownScript_0x78240
  10997.     winlosstext PicnickerGina1BeatenText, $0000
  10998.     copybytetovar wGinaFightCount
  10999.     if_equal 4, .Fight4
  11000.     if_equal 3, .Fight3
  11001. @@ -349,7 +349,7 @@ OfficerScript_0x7824c:
  11002.     writetext UnknownText_0x785e4
  11003.     closetext
  11004.     loadmovesprites
  11005.     winlosstext UnknownText_0x78609, $0000
  11006.     loadtrainer OFFICER, KEITH
  11007.     startbattle
  11008.     returnafterbattle
  11009. @@ -370,7 +370,7 @@ UnknownScript_0x78276:
  11010.     end
  11011.  
  11012.  TrainerYoungsterSamuel:
  11013.     trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, $0000, YoungsterSamuelScript
  11014.  
  11015.  YoungsterSamuelScript:
  11016.     talkaftercancel
  11017. @@ -381,7 +381,7 @@ YoungsterSamuelScript:
  11018.     end
  11019.  
  11020.  TrainerYoungsterIan:
  11021.     trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, $0000, YoungsterIanScript
  11022.  
  11023.  YoungsterIanScript:
  11024.     talkaftercancel
  11025. @@ -392,7 +392,7 @@ YoungsterIanScript:
  11026.     end
  11027.  
  11028.  TrainerPokefanmBrandon:
  11029.     trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, $0000, PokefanmBrandonScript
  11030.  
  11031.  PokefanmBrandonScript:
  11032.     talkaftercancel
  11033. @@ -403,7 +403,7 @@ PokefanmBrandonScript:
  11034.     end
  11035.  
  11036.  TrainerCooltrainerfIrene:
  11037.     trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, $0000, CooltrainerfIreneScript
  11038.  
  11039.  CooltrainerfIreneScript:
  11040.     talkaftercancel
  11041. @@ -422,7 +422,7 @@ UnknownScript_0x782d2:
  11042.     end
  11043.  
  11044.  TrainerCooltrainerfJenn:
  11045.     trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, $0000, CooltrainerfJennScript
  11046.  
  11047.  CooltrainerfJennScript:
  11048.     talkaftercancel
  11049. @@ -441,7 +441,7 @@ UnknownScript_0x782f2:
  11050.     end
  11051.  
  11052.  TrainerCooltrainerfKate:
  11053.     trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, $0000, CooltrainerfKateScript
  11054.  
  11055.  CooltrainerfKateScript:
  11056.     talkaftercancel
  11057. @@ -775,16 +775,16 @@ Route34_MapEventHeader:
  11058.  
  11059.  .PersonEvents:
  11060.     db 13
  11061. -   person_event SPRITE_YOUNGSTER, 7, 13, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerCamperTodd1, -1
  11062. -   person_event SPRITE_YOUNGSTER, 32, 15, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterSamuel, -1
  11063. -   person_event SPRITE_YOUNGSTER, 20, 11, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterIan, -1
  11064. -   person_event SPRITE_LASS, 26, 10, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerGina1, -1
  11065. -   person_event SPRITE_OFFICER, 11, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7824c, -1
  11066. -   person_event SPRITE_POKEFAN_M, 28, 18, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmBrandon, -1
  11067. -   person_event SPRITE_GRAMPS, 16, 15, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x7803d, EVENT_DAYCARE_MAN_ON_ROUTE_34
  11068. -   person_event SPRITE_DAYCARE_MON_1, 18, 14, $16, 2, 2, -1, -1, 0, 0, 0, DaycareMon1Script_0x78065, EVENT_DAYCARE_MON_1
  11069. -   person_event SPRITE_DAYCARE_MON_2, 19, 17, $16, 2, 2, -1, -1, 0, 0, 0, DaycareMon2Script_0x7806b, EVENT_DAYCARE_MON_2
  11070. -   person_event SPRITE_COOLTRAINER_F, 48, 11, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainerfIrene, -1
  11071. -   person_event SPRITE_COOLTRAINER_F, 48, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfJenn, -1
  11072. -   person_event SPRITE_COOLTRAINER_F, 51, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfKate, -1
  11073. -   person_event SPRITE_POKE_BALL, 30, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET
  11074. +   person_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerCamperTodd1, -1
  11075. +   person_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterSamuel, -1
  11076. +   person_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterIan, -1
  11077. +   person_event SPRITE_LASS, 26, 10, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerGina1, -1
  11078. +   person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7824c, -1
  11079. +   person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmBrandon, -1
  11080. +   person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x7803d, EVENT_DAYCARE_MAN_ON_ROUTE_34
  11081. +   person_event SPRITE_DAYCARE_MON_1, 18, 14, SPRITEMOVEFN_16, 2, 2, -1, -1, 0, 0, 0, DaycareMon1Script_0x78065, EVENT_DAYCARE_MON_1
  11082. +   person_event SPRITE_DAYCARE_MON_2, 19, 17, SPRITEMOVEFN_16, 2, 2, -1, -1, 0, 0, 0, DaycareMon2Script_0x7806b, EVENT_DAYCARE_MON_2
  11083. +   person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainerfIrene, -1
  11084. +   person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfJenn, -1
  11085. +   person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfKate, -1
  11086. +   person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET
  11087. diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
  11088. index 6f6cdd7..26d883b 100644
  11089. --- a/maps/Route34IlexForestGate.asm
  11090. +++ b/maps/Route34IlexForestGate.asm
  11091. @@ -152,7 +152,7 @@ Route34IlexForestGate_MapEventHeader:
  11092.  
  11093.  .PersonEvents:
  11094.     db 4
  11095. -   person_event SPRITE_TEACHER, 3, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
  11096. -   person_event SPRITE_BUTTERFREE, 4, 9, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ButterfreeScript_0x62d8a, -1
  11097. -   person_event SPRITE_LASS, 4, 3, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
  11098. -   person_event SPRITE_TEACHER, 7, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
  11099. +   person_event SPRITE_TEACHER, 3, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
  11100. +   person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ButterfreeScript_0x62d8a, -1
  11101. +   person_event SPRITE_LASS, 4, 3, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
  11102. +   person_event SPRITE_TEACHER, 7, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
  11103. diff --git a/maps/Route35.asm b/maps/Route35.asm
  11104. index 6d2c677..e4d0f22 100644
  11105. --- a/maps/Route35.asm
  11106. +++ b/maps/Route35.asm
  11107. @@ -6,7 +6,7 @@ Route35_MapScriptHeader:
  11108.     db 0
  11109.  
  11110.  TrainerBird_keeperBryan:
  11111.     trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, $0000, Bird_keeperBryanScript
  11112.  
  11113.  Bird_keeperBryanScript:
  11114.     talkaftercancel
  11115. @@ -17,7 +17,7 @@ Bird_keeperBryanScript:
  11116.     end
  11117.  
  11118.  TrainerJugglerIrwin:
  11119.     trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, $0000, JugglerIrwin1Script
  11120.  
  11121.  JugglerIrwin1Script:
  11122.     writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN
  11123. @@ -72,7 +72,7 @@ UnknownScript_0x19c91b:
  11124.     end
  11125.  
  11126.  TrainerCamperIvan:
  11127.     trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, $0000, CamperIvanScript
  11128.  
  11129.  CamperIvanScript:
  11130.     talkaftercancel
  11131. @@ -83,7 +83,7 @@ CamperIvanScript:
  11132.     end
  11133.  
  11134.  TrainerCamperElliot:
  11135.     trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, $0000, CamperElliotScript
  11136.  
  11137.  CamperElliotScript:
  11138.     talkaftercancel
  11139. @@ -94,7 +94,7 @@ CamperElliotScript:
  11140.     end
  11141.  
  11142.  TrainerPicnickerBrooke:
  11143.     trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, $0000, PicnickerBrookeScript
  11144.  
  11145.  PicnickerBrookeScript:
  11146.     talkaftercancel
  11147. @@ -105,7 +105,7 @@ PicnickerBrookeScript:
  11148.     end
  11149.  
  11150.  TrainerPicnickerKim:
  11151.     trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, $0000, PicnickerKimScript
  11152.  
  11153.  PicnickerKimScript:
  11154.     talkaftercancel
  11155. @@ -116,7 +116,7 @@ PicnickerKimScript:
  11156.     end
  11157.  
  11158.  TrainerBug_catcherArnie1:
  11159.     trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, $0000, Bug_catcherArnie1Script
  11160.  
  11161.  Bug_catcherArnie1Script:
  11162.     writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
  11163. @@ -148,7 +148,7 @@ UnknownScript_0x19c9a7:
  11164.  
  11165.  UnknownScript_0x19c9bb:
  11166.     scall UnknownScript_0x19c91b
  11167.     winlosstext Bug_catcherArnie1BeatenText, $0000
  11168.     copybytetovar wArnieFightCount
  11169.     if_equal 4, .Fight4
  11170.     if_equal 3, .Fight3
  11171. @@ -213,7 +213,7 @@ UnknownScript_0x19ca2f:
  11172.     end
  11173.  
  11174.  TrainerFirebreatherWalt:
  11175.     trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, $0000, FirebreatherWaltScript
  11176.  
  11177.  FirebreatherWaltScript:
  11178.     talkaftercancel
  11179. @@ -234,7 +234,7 @@ OfficerScript_0x19ca49:
  11180.     writetext UnknownText_0x19ceea
  11181.     closetext
  11182.     loadmovesprites
  11183.     winlosstext UnknownText_0x19cf06, $0000
  11184.     loadtrainer OFFICER, DIRK
  11185.     startbattle
  11186.     returnafterbattle
  11187. @@ -469,14 +469,14 @@ Route35_MapEventHeader:
  11188.  
  11189.  .PersonEvents:
  11190.     db 11
  11191. -   person_event SPRITE_YOUNGSTER, 19, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperIvan, -1
  11192. -   person_event SPRITE_YOUNGSTER, 20, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperElliot, -1
  11193. -   person_event SPRITE_LASS, 20, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerBrooke, -1
  11194. -   person_event SPRITE_LASS, 26, 10, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerKim, -1
  11195. -   person_event SPRITE_YOUNGSTER, 28, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerBird_keeperBryan, -1
  11196. -   person_event SPRITE_FISHER, 10, 2, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherWalt, -1
  11197. -   person_event SPRITE_BUG_CATCHER, 7, 16, $6, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherArnie1, -1
  11198. -   person_event SPRITE_SUPER_NERD, 10, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerJugglerIrwin, -1
  11199. -   person_event SPRITE_OFFICER, 6, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19ca49, -1
  11200. -   person_event SPRITE_FRUIT_TREE, 25, 2, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19ca7e, -1
  11201. -   person_event SPRITE_POKE_BALL, 16, 13, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT
  11202. +   person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperIvan, -1
  11203. +   person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperElliot, -1
  11204. +   person_event SPRITE_LASS, 20, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerBrooke, -1
  11205. +   person_event SPRITE_LASS, 26, 10, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerKim, -1
  11206. +   person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerBird_keeperBryan, -1
  11207. +   person_event SPRITE_FISHER, 10, 2, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherWalt, -1
  11208. +   person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEFN_06, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherArnie1, -1
  11209. +   person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerJugglerIrwin, -1
  11210. +   person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19ca49, -1
  11211. +   person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19ca7e, -1
  11212. +   person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT
  11213. diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm
  11214. index 5a0c370..1209e7d 100644
  11215. --- a/maps/Route35Goldenrodgate.asm
  11216. +++ b/maps/Route35Goldenrodgate.asm
  11217. @@ -209,6 +209,6 @@ Route35Goldenrodgate_MapEventHeader:
  11218.  
  11219.  .PersonEvents:
  11220.     db 3
  11221. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x69d37, -1
  11222. -   person_event SPRITE_POKEFAN_F, 4, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x69dc6, -1
  11223. -   person_event SPRITE_FISHER, 2, 3, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x69dda, -1
  11224. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x69d37, -1
  11225. +   person_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x69dc6, -1
  11226. +   person_event SPRITE_FISHER, 2, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x69dda, -1
  11227. diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
  11228. index b631517..41c11f8 100644
  11229. --- a/maps/Route35NationalParkgate.asm
  11230. +++ b/maps/Route35NationalParkgate.asm
  11231. @@ -3,9 +3,9 @@ Route35NationalParkgate_MapScriptHeader:
  11232.     db 3
  11233.  
  11234.     ; triggers
  11235.     dw Route35NationalParkgate_Trigger1, $0000
  11236.     dw Route35NationalParkgate_Trigger2, $0000
  11237.     dw Route35NationalParkgate_Trigger3, $0000
  11238.  
  11239.  .MapCallbacks:
  11240.     db 2
  11241. @@ -458,6 +458,6 @@ Route35NationalParkgate_MapEventHeader:
  11242.  
  11243.  .PersonEvents:
  11244.     db 3
  11245. -   person_event SPRITE_OFFICER, 1, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
  11246. -   person_event SPRITE_YOUNGSTER, 5, 6, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
  11247. -   person_event SPRITE_OFFICER, 3, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
  11248. +   person_event SPRITE_OFFICER, 1, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
  11249. +   person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
  11250. +   person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
  11251. diff --git a/maps/Route36.asm b/maps/Route36.asm
  11252. index ee24cb6..67ebd82 100644
  11253. --- a/maps/Route36.asm
  11254. +++ b/maps/Route36.asm
  11255. @@ -3,8 +3,8 @@ Route36_MapScriptHeader:
  11256.     db 2
  11257.  
  11258.     ; triggers
  11259.     dw UnknownScript_0x19400d, $0000
  11260.     dw UnknownScript_0x19400e, $0000
  11261.  
  11262.  .MapCallbacks:
  11263.     db 1
  11264. @@ -162,7 +162,7 @@ UnknownScript_0x1940ee:
  11265.     end
  11266.  
  11267.  TrainerSchoolboyAlan1:
  11268.     trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, $0000, SchoolboyAlan1Script
  11269.  
  11270.  SchoolboyAlan1Script:
  11271.     writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
  11272. @@ -194,7 +194,7 @@ UnknownScript_0x19412c:
  11273.  
  11274.  UnknownScript_0x194140:
  11275.     scall UnknownScript_0x1941e1
  11276.     winlosstext SchoolboyAlan1BeatenText, $0000
  11277.     copybytetovar wAlanFightCount
  11278.     if_equal 4, .Fight4
  11279.     if_equal 3, .Fight3
  11280. @@ -300,7 +300,7 @@ UnknownScript_0x1941e9:
  11281.     end
  11282.  
  11283.  TrainerPsychicMark:
  11284.     trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, $0000, PsychicMarkScript
  11285.  
  11286.  PsychicMarkScript:
  11287.     talkaftercancel
  11288. @@ -679,12 +679,12 @@ Route36_MapEventHeader:
  11289.  
  11290.  .PersonEvents:
  11291.     db 9
  11292. -   person_event SPRITE_YOUNGSTER, 13, 20, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicMark, -1
  11293. -   person_event SPRITE_YOUNGSTER, 14, 31, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSchoolboyAlan1, -1
  11294. -   person_event SPRITE_WEIRD_TREE, 9, 35, $17, 0, 0, -1, -1, 0, 0, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO
  11295. -   person_event SPRITE_LASS, 8, 51, $5, 0, 2, -1, -1, 0, 0, 0, LassScript_0x1940e0, -1
  11296. -   person_event SPRITE_FISHER, 9, 44, $8, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1940b9, -1
  11297. -   person_event SPRITE_FRUIT_TREE, 4, 21, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x194247, -1
  11298. -   person_event SPRITE_YOUNGSTER, 6, 46, $2, 1, 1, -1, -1, 0, 0, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
  11299. -   person_event SPRITE_LASS, 12, 33, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO
  11300. -   person_event SPRITE_SUICUNE, 6, 21, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
  11301. +   person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicMark, -1
  11302. +   person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSchoolboyAlan1, -1
  11303. +   person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEFN_17, 0, 0, -1, -1, 0, 0, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO
  11304. +   person_event SPRITE_LASS, 8, 51, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, LassScript_0x1940e0, -1
  11305. +   person_event SPRITE_FISHER, 9, 44, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1940b9, -1
  11306. +   person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x194247, -1
  11307. +   person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
  11308. +   person_event SPRITE_LASS, 12, 33, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO
  11309. +   person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
  11310. diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
  11311. index a157e00..f26e233 100644
  11312. --- a/maps/Route36NationalParkgate.asm
  11313. +++ b/maps/Route36NationalParkgate.asm
  11314. @@ -3,9 +3,9 @@ Route36NationalParkgate_MapScriptHeader:
  11315.     db 3
  11316.  
  11317.     ; triggers
  11318.     dw .Trigger1, $0000
  11319.     dw .Trigger2, $0000
  11320.     dw .Trigger3, $0000
  11321.  
  11322.  .MapCallbacks:
  11323.     db 2
  11324. @@ -862,15 +862,15 @@ Route36NationalParkgate_MapEventHeader:
  11325.  
  11326.  .PersonEvents:
  11327.     db 12
  11328. -   person_event SPRITE_OFFICER, 3, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
  11329. -   person_event SPRITE_YOUNGSTER, 5, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
  11330. -   person_event SPRITE_YOUNGSTER, 5, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
  11331. -   person_event SPRITE_ROCKER, 6, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
  11332. -   person_event SPRITE_POKEFAN_M, 5, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
  11333. -   person_event SPRITE_YOUNGSTER, 7, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
  11334. -   person_event SPRITE_YOUNGSTER, 6, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
  11335. -   person_event SPRITE_LASS, 6, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
  11336. -   person_event SPRITE_YOUNGSTER, 7, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
  11337. -   person_event SPRITE_YOUNGSTER, 7, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
  11338. -   person_event SPRITE_YOUNGSTER, 6, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
  11339. -   person_event SPRITE_OFFICER, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
  11340. +   person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
  11341. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
  11342. +   person_event SPRITE_YOUNGSTER, 5, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
  11343. +   person_event SPRITE_ROCKER, 6, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
  11344. +   person_event SPRITE_POKEFAN_M, 5, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
  11345. +   person_event SPRITE_YOUNGSTER, 7, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
  11346. +   person_event SPRITE_YOUNGSTER, 6, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
  11347. +   person_event SPRITE_LASS, 6, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
  11348. +   person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
  11349. +   person_event SPRITE_YOUNGSTER, 7, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
  11350. +   person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
  11351. +   person_event SPRITE_OFFICER, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
  11352. diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm
  11353. index 7d6dbbd..09e5cce 100644
  11354. --- a/maps/Route36RuinsofAlphgate.asm
  11355. +++ b/maps/Route36RuinsofAlphgate.asm
  11356. @@ -49,5 +49,5 @@ Route36RuinsofAlphgate_MapEventHeader:
  11357.  
  11358.  .PersonEvents:
  11359.     db 2
  11360. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x6aa1a, -1
  11361. -   person_event SPRITE_GRAMPS, 5, 7, $2, 2, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x6aa1d, -1
  11362. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x6aa1a, -1
  11363. +   person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEFN_02, 2, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x6aa1d, -1
  11364. diff --git a/maps/Route37.asm b/maps/Route37.asm
  11365. index a6e49b3..65f08f1 100644
  11366. --- a/maps/Route37.asm
  11367. +++ b/maps/Route37.asm
  11368. @@ -20,7 +20,7 @@ SunnyCallback:
  11369.     return
  11370.  
  11371.  TrainerTwinsAnnandanne1:
  11372.     trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, $0000, TwinsAnnandanne1Script
  11373.  
  11374.  TwinsAnnandanne1Script:
  11375.     talkaftercancel
  11376. @@ -31,7 +31,7 @@ TwinsAnnandanne1Script:
  11377.     end
  11378.  
  11379.  TrainerTwinsAnnandanne2:
  11380.     trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, $0000, TwinsAnnandanne2Script
  11381.  
  11382.  TwinsAnnandanne2Script:
  11383.     talkaftercancel
  11384. @@ -42,7 +42,7 @@ TwinsAnnandanne2Script:
  11385.     end
  11386.  
  11387.  TrainerPsychicGreg:
  11388.     trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, $0000, PsychicGregScript
  11389.  
  11390.  PsychicGregScript:
  11391.     talkaftercancel
  11392. @@ -249,10 +249,10 @@ Route37_MapEventHeader:
  11393.  
  11394.  .PersonEvents:
  11395.     db 7
  11396. -   person_event SPRITE_WEIRD_TREE, 12, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAnnandanne1, -1
  11397. -   person_event SPRITE_WEIRD_TREE, 12, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAnnandanne2, -1
  11398. -   person_event SPRITE_YOUNGSTER, 6, 6, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicGreg, -1
  11399. -   person_event SPRITE_FRUIT_TREE, 5, 13, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e09, -1
  11400. -   person_event SPRITE_BUG_CATCHER, 8, 16, $2, 1, 1, -1, -1, 0, 0, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
  11401. -   person_event SPRITE_FRUIT_TREE, 5, 16, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e0b, -1
  11402. -   person_event SPRITE_FRUIT_TREE, 7, 15, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e0d, -1
  11403. +   person_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAnnandanne1, -1
  11404. +   person_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAnnandanne2, -1
  11405. +   person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicGreg, -1
  11406. +   person_event SPRITE_FRUIT_TREE, 5, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e09, -1
  11407. +   person_event SPRITE_BUG_CATCHER, 8, 16, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
  11408. +   person_event SPRITE_FRUIT_TREE, 5, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e0b, -1
  11409. +   person_event SPRITE_FRUIT_TREE, 7, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e0d, -1
  11410. diff --git a/maps/Route38.asm b/maps/Route38.asm
  11411. index 4c6ffa6..3f71576 100644
  11412. --- a/maps/Route38.asm
  11413. +++ b/maps/Route38.asm
  11414. @@ -6,7 +6,7 @@ Route38_MapScriptHeader:
  11415.     db 0
  11416.  
  11417.  TrainerBird_keeperToby:
  11418.     trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, $0000, Bird_keeperTobyScript
  11419.  
  11420.  Bird_keeperTobyScript:
  11421.     talkaftercancel
  11422. @@ -17,7 +17,7 @@ Bird_keeperTobyScript:
  11423.     end
  11424.  
  11425.  TrainerSailorHarry:
  11426.     trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, $0000, SailorHarryScript
  11427.  
  11428.  SailorHarryScript:
  11429.     talkaftercancel
  11430. @@ -28,7 +28,7 @@ SailorHarryScript:
  11431.     end
  11432.  
  11433.  TrainerLassDana1:
  11434.     trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, $0000, LassDana1Script
  11435.  
  11436.  LassDana1Script:
  11437.     writecode VAR_CALLERID, PHONE_LASS_DANA
  11438. @@ -60,7 +60,7 @@ UnknownScript_0x1a1d6e:
  11439.  
  11440.  UnknownScript_0x1a1d82:
  11441.     scall UnknownScript_0x1a1e23
  11442.     winlosstext LassDana1BeatenText, $0000
  11443.     copybytetovar wDanaFightCount
  11444.     if_equal 4, .Fight4
  11445.     if_equal 3, .Fight3
  11446. @@ -166,7 +166,7 @@ UnknownScript_0x1a1e2b:
  11447.     end
  11448.  
  11449.  TrainerSchoolboyChad1:
  11450.     trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, $0000, SchoolboyChad1Script
  11451.  
  11452.  SchoolboyChad1Script:
  11453.     writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
  11454. @@ -196,7 +196,7 @@ UnknownScript_0x1a1e61:
  11455.  
  11456.  UnknownScript_0x1a1e75:
  11457.     scall UnknownScript_0x1a1f01
  11458.     winlosstext SchoolboyChad1BeatenText, $0000
  11459.     copybytetovar wChadFightCount
  11460.     if_equal 4, .Fight4
  11461.     if_equal 3, .Fight3
  11462. @@ -283,7 +283,7 @@ UnknownScript_0x1a1f01:
  11463.     end
  11464.  
  11465.  TrainerBeautyValerie:
  11466.     trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, $0000, BeautyValerieScript
  11467.  
  11468.  BeautyValerieScript:
  11469.     talkaftercancel
  11470. @@ -294,7 +294,7 @@ BeautyValerieScript:
  11471.     end
  11472.  
  11473.  TrainerBeautyOlivia:
  11474.     trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, $0000, BeautyOliviaScript
  11475.  
  11476.  BeautyOliviaScript:
  11477.     talkaftercancel
  11478. @@ -482,10 +482,10 @@ Route38_MapEventHeader:
  11479.  
  11480.  .PersonEvents:
  11481.     db 7
  11482. -   person_event SPRITE_STANDING_YOUNGSTER, 1, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyChad1, -1
  11483. -   person_event SPRITE_LASS, 3, 15, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassDana1, -1
  11484. -   person_event SPRITE_STANDING_YOUNGSTER, 15, 12, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBird_keeperToby, -1
  11485. -   person_event SPRITE_BUENA, 9, 19, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBeautyValerie, -1
  11486. -   person_event SPRITE_SAILOR, 5, 24, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerSailorHarry, -1
  11487. -   person_event SPRITE_FRUIT_TREE, 10, 12, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a1f33, -1
  11488. -   person_event SPRITE_BUENA, 8, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBeautyOlivia, -1
  11489. +   person_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyChad1, -1
  11490. +   person_event SPRITE_LASS, 3, 15, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassDana1, -1
  11491. +   person_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBird_keeperToby, -1
  11492. +   person_event SPRITE_BUENA, 9, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBeautyValerie, -1
  11493. +   person_event SPRITE_SAILOR, 5, 24, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerSailorHarry, -1
  11494. +   person_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a1f33, -1
  11495. +   person_event SPRITE_BUENA, 8, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBeautyOlivia, -1
  11496. diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
  11497. index 1be28e2..01e1028 100644
  11498. --- a/maps/Route38EcruteakGate.asm
  11499. +++ b/maps/Route38EcruteakGate.asm
  11500. @@ -40,4 +40,4 @@ Route38EcruteakGate_MapEventHeader:
  11501.  
  11502.  .PersonEvents:
  11503.     db 1
  11504. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x9cbd7, -1
  11505. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x9cbd7, -1
  11506. diff --git a/maps/Route39.asm b/maps/Route39.asm
  11507. index 2afc322..e526c56 100644
  11508. --- a/maps/Route39.asm
  11509. +++ b/maps/Route39.asm
  11510. @@ -14,7 +14,7 @@ TaurosScript_0x1a5af5:
  11511.     end
  11512.  
  11513.  TrainerPokefanmDerek1:
  11514.     trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, $0000, PokefanmDerek1Script
  11515.  
  11516.  PokefanmDerek1Script:
  11517.     writecode VAR_CALLERID, PHONE_POKEFANM_DEREK
  11518. @@ -93,7 +93,7 @@ UnknownScript_0x1a5b7e:
  11519.     end
  11520.  
  11521.  TrainerPokefanfRuth:
  11522.     trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, $0000, PokefanfRuthScript
  11523.  
  11524.  PokefanfRuthScript:
  11525.     talkaftercancel
  11526. @@ -104,7 +104,7 @@ PokefanfRuthScript:
  11527.     end
  11528.  
  11529.  TrainerSailorEugene:
  11530.     trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, $0000, SailorEugeneScript
  11531.  
  11532.  SailorEugeneScript:
  11533.     talkaftercancel
  11534. @@ -115,7 +115,7 @@ SailorEugeneScript:
  11535.     end
  11536.  
  11537.  TrainerPsychicNorman:
  11538.     trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, $0000, PsychicNormanScript
  11539.  
  11540.  PsychicNormanScript:
  11541.     talkaftercancel
  11542. @@ -135,7 +135,7 @@ PokefanFScript_0x1a5bbe:
  11543.     writetext UnknownText_0x1a5ee8
  11544.     closetext
  11545.     loadmovesprites
  11546.     winlosstext UnknownText_0x1a5f17, $0000
  11547.     loadtrainer POKEFANF, JAIME
  11548.     startbattle
  11549.     returnafterbattle
  11550. @@ -353,13 +353,13 @@ Route39_MapEventHeader:
  11551.  
  11552.  .PersonEvents:
  11553.     db 10
  11554. -   person_event SPRITE_SAILOR, 29, 13, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSailorEugene, -1
  11555. -   person_event SPRITE_POKEFAN_M, 22, 10, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanmDerek1, -1
  11556. -   person_event SPRITE_POKEFAN_F, 19, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanfRuth, -1
  11557. -   person_event SPRITE_TAUROS, 12, 3, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11558. -   person_event SPRITE_TAUROS, 11, 6, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11559. -   person_event SPRITE_TAUROS, 15, 4, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11560. -   person_event SPRITE_TAUROS, 13, 8, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11561. -   person_event SPRITE_STANDING_YOUNGSTER, 7, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicNorman, -1
  11562. -   person_event SPRITE_FRUIT_TREE, 3, 9, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a5bf4, -1
  11563. -   person_event SPRITE_POKEFAN_F, 22, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x1a5bbe, -1
  11564. +   person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSailorEugene, -1
  11565. +   person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanmDerek1, -1
  11566. +   person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanfRuth, -1
  11567. +   person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11568. +   person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11569. +   person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11570. +   person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11571. +   person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicNorman, -1
  11572. +   person_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a5bf4, -1
  11573. +   person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x1a5bbe, -1
  11574. diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
  11575. index e2420e1..5dd4972 100644
  11576. --- a/maps/Route39Barn.asm
  11577. +++ b/maps/Route39Barn.asm
  11578. @@ -200,6 +200,6 @@ Route39Barn_MapEventHeader:
  11579.  
  11580.  .PersonEvents:
  11581.     db 3
  11582. -   person_event SPRITE_TWIN, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, TwinScript_0x9cc76, -1
  11583. -   person_event SPRITE_TWIN, 3, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x9cc90, -1
  11584. -   person_event SPRITE_TAUROS, 3, 3, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x9ccaa, -1
  11585. +   person_event SPRITE_TWIN, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, TwinScript_0x9cc76, -1
  11586. +   person_event SPRITE_TWIN, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x9cc90, -1
  11587. +   person_event SPRITE_TAUROS, 3, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x9ccaa, -1
  11588. diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
  11589. index 16ad6ca..37b1d05 100644
  11590. --- a/maps/Route39Farmhouse.asm
  11591. +++ b/maps/Route39Farmhouse.asm
  11592. @@ -207,5 +207,5 @@ Route39Farmhouse_MapEventHeader:
  11593.  
  11594.  .PersonEvents:
  11595.     db 2
  11596. -   person_event SPRITE_POKEFAN_M, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanMScript_0x9ceb4, -1
  11597. -   person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanFScript_0x9cf0e, -1
  11598. +   person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanMScript_0x9ceb4, -1
  11599. +   person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanFScript_0x9cf0e, -1
  11600. diff --git a/maps/Route4.asm b/maps/Route4.asm
  11601. index d0d8704..00f53e3 100644
  11602. --- a/maps/Route4.asm
  11603. +++ b/maps/Route4.asm
  11604. @@ -6,7 +6,7 @@ Route4_MapScriptHeader:
  11605.     db 0
  11606.  
  11607.  TrainerBird_keeperHank:
  11608.     trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, $0000, Bird_keeperHankScript
  11609.  
  11610.  Bird_keeperHankScript:
  11611.     talkaftercancel
  11612. @@ -17,7 +17,7 @@ Bird_keeperHankScript:
  11613.     end
  11614.  
  11615.  TrainerPicnickerHope:
  11616.     trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, $0000, PicnickerHopeScript
  11617.  
  11618.  PicnickerHopeScript:
  11619.     talkaftercancel
  11620. @@ -28,7 +28,7 @@ PicnickerHopeScript:
  11621.     end
  11622.  
  11623.  TrainerPicnickerSharon:
  11624.     trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, $0000, PicnickerSharonScript
  11625.  
  11626.  PicnickerSharonScript:
  11627.     talkaftercancel
  11628. @@ -133,7 +133,7 @@ Route4_MapEventHeader:
  11629.  
  11630.  .PersonEvents:
  11631.     db 4
  11632. -   person_event SPRITE_YOUNGSTER, 9, 17, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperHank, -1
  11633. -   person_event SPRITE_LASS, 8, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerPicnickerHope, -1
  11634. -   person_event SPRITE_LASS, 6, 21, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerPicnickerSharon, -1
  11635. -   person_event SPRITE_POKE_BALL, 3, 26, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP
  11636. +   person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperHank, -1
  11637. +   person_event SPRITE_LASS, 8, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerPicnickerHope, -1
  11638. +   person_event SPRITE_LASS, 6, 21, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerPicnickerSharon, -1
  11639. +   person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP
  11640. diff --git a/maps/Route40.asm b/maps/Route40.asm
  11641. index 09f92f1..8fed30e 100644
  11642. --- a/maps/Route40.asm
  11643. +++ b/maps/Route40.asm
  11644. @@ -21,7 +21,7 @@ MonicaCallback:
  11645.     return
  11646.  
  11647.  TrainerSwimmerfElaine:
  11648.     trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, $0000, SwimmerfElaineScript
  11649.  
  11650.  SwimmerfElaineScript:
  11651.     talkaftercancel
  11652. @@ -32,7 +32,7 @@ SwimmerfElaineScript:
  11653.     end
  11654.  
  11655.  TrainerSwimmerfPaula:
  11656.     trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, $0000, SwimmerfPaulaScript
  11657.  
  11658.  SwimmerfPaulaScript:
  11659.     talkaftercancel
  11660. @@ -43,7 +43,7 @@ SwimmerfPaulaScript:
  11661.     end
  11662.  
  11663.  TrainerSwimmermSimon:
  11664.     trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, $0000, SwimmermSimonScript
  11665.  
  11666.  SwimmermSimonScript:
  11667.     talkaftercancel
  11668. @@ -54,7 +54,7 @@ SwimmermSimonScript:
  11669.     end
  11670.  
  11671.  TrainerSwimmermRandall:
  11672.     trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, $0000, SwimmermRandallScript
  11673.  
  11674.  SwimmermRandallScript:
  11675.     talkaftercancel
  11676. @@ -344,15 +344,15 @@ Route40_MapEventHeader:
  11677.  
  11678.  .PersonEvents:
  11679.     db 12
  11680. -   person_event SPRITE_OLIVINE_RIVAL, 15, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerSwimmermSimon, -1
  11681. -   person_event SPRITE_OLIVINE_RIVAL, 30, 18, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerSwimmermRandall, -1
  11682. -   person_event SPRITE_SWIMMER_GIRL, 19, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerSwimmerfElaine, -1
  11683. -   person_event SPRITE_SWIMMER_GIRL, 25, 10, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfPaula, -1
  11684. -   person_event SPRITE_ROCK, 11, 7, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11685. -   person_event SPRITE_ROCK, 9, 6, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11686. -   person_event SPRITE_ROCK, 8, 7, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11687. -   person_event SPRITE_LASS, 13, 11, $6, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a61c4, -1
  11688. -   person_event SPRITE_BUENA, 10, 8, $3, 0, 0, -1, -1, 0, 0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
  11689. -   person_event SPRITE_POKEFAN_M, 6, 7, $9, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1a61c7, -1
  11690. -   person_event SPRITE_LASS, 4, 13, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x1a61d3, -1
  11691. -   person_event SPRITE_STANDING_YOUNGSTER, 9, 16, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
  11692. +   person_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerSwimmermSimon, -1
  11693. +   person_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerSwimmermRandall, -1
  11694. +   person_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerSwimmerfElaine, -1
  11695. +   person_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfPaula, -1
  11696. +   person_event SPRITE_ROCK, 11, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11697. +   person_event SPRITE_ROCK, 9, 6, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11698. +   person_event SPRITE_ROCK, 8, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11699. +   person_event SPRITE_LASS, 13, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a61c4, -1
  11700. +   person_event SPRITE_BUENA, 10, 8, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
  11701. +   person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1a61c7, -1
  11702. +   person_event SPRITE_LASS, 4, 13, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x1a61d3, -1
  11703. +   person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
  11704. diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
  11705. index f99b652..0721b07 100644
  11706. --- a/maps/Route40BattleTowerGate.asm
  11707. +++ b/maps/Route40BattleTowerGate.asm
  11708. @@ -88,5 +88,5 @@ Route40BattleTowerGate_MapEventHeader:
  11709.  
  11710.  .PersonEvents:
  11711.     db 2
  11712. -   person_event SPRITE_ROCKER, 3, 3, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
  11713. -   person_event SPRITE_TWIN, 5, 7, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TwinScript_0x9f66c, -1
  11714. +   person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
  11715. +   person_event SPRITE_TWIN, 5, 7, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TwinScript_0x9f66c, -1
  11716. diff --git a/maps/Route41.asm b/maps/Route41.asm
  11717. index 872fb53..47cffc8 100644
  11718. --- a/maps/Route41.asm
  11719. +++ b/maps/Route41.asm
  11720. @@ -6,7 +6,7 @@ Route41_MapScriptHeader:
  11721.     db 0
  11722.  
  11723.  TrainerSwimmerfKaylee:
  11724.     trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, $0000, SwimmerfKayleeScript
  11725.  
  11726.  SwimmerfKayleeScript:
  11727.     talkaftercancel
  11728. @@ -17,7 +17,7 @@ SwimmerfKayleeScript:
  11729.     end
  11730.  
  11731.  TrainerSwimmerfSusie:
  11732.     trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, $0000, SwimmerfSusieScript
  11733.  
  11734.  SwimmerfSusieScript:
  11735.     talkaftercancel
  11736. @@ -28,7 +28,7 @@ SwimmerfSusieScript:
  11737.     end
  11738.  
  11739.  TrainerSwimmerfDenise:
  11740.     trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, $0000, SwimmerfDeniseScript
  11741.  
  11742.  SwimmerfDeniseScript:
  11743.     talkaftercancel
  11744. @@ -39,7 +39,7 @@ SwimmerfDeniseScript:
  11745.     end
  11746.  
  11747.  TrainerSwimmerfKara:
  11748.     trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, $0000, SwimmerfKaraScript
  11749.  
  11750.  SwimmerfKaraScript:
  11751.     talkaftercancel
  11752. @@ -50,7 +50,7 @@ SwimmerfKaraScript:
  11753.     end
  11754.  
  11755.  TrainerSwimmerfWendy:
  11756.     trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, $0000, SwimmerfWendyScript
  11757.  
  11758.  SwimmerfWendyScript:
  11759.     talkaftercancel
  11760. @@ -61,7 +61,7 @@ SwimmerfWendyScript:
  11761.     end
  11762.  
  11763.  TrainerSwimmermCharlie:
  11764.     trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, $0000, SwimmermCharlieScript
  11765.  
  11766.  SwimmermCharlieScript:
  11767.     talkaftercancel
  11768. @@ -72,7 +72,7 @@ SwimmermCharlieScript:
  11769.     end
  11770.  
  11771.  TrainerSwimmermGeorge:
  11772.     trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, $0000, SwimmermGeorgeScript
  11773.  
  11774.  SwimmermGeorgeScript:
  11775.     talkaftercancel
  11776. @@ -83,7 +83,7 @@ SwimmermGeorgeScript:
  11777.     end
  11778.  
  11779.  TrainerSwimmermBerke:
  11780.     trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, $0000, SwimmermBerkeScript
  11781.  
  11782.  SwimmermBerkeScript:
  11783.     talkaftercancel
  11784. @@ -94,7 +94,7 @@ SwimmermBerkeScript:
  11785.     end
  11786.  
  11787.  TrainerSwimmermKirk:
  11788.     trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, $0000, SwimmermKirkScript
  11789.  
  11790.  SwimmermKirkScript:
  11791.     talkaftercancel
  11792. @@ -105,7 +105,7 @@ SwimmermKirkScript:
  11793.     end
  11794.  
  11795.  TrainerSwimmermMathew:
  11796.     trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, $0000, SwimmermMathewScript
  11797.  
  11798.  SwimmermMathewScript:
  11799.     talkaftercancel
  11800. @@ -349,13 +349,13 @@ Route41_MapEventHeader:
  11801.  
  11802.  .PersonEvents:
  11803.     db 10
  11804. -   person_event SPRITE_OLIVINE_RIVAL, 6, 32, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermCharlie, -1
  11805. -   person_event SPRITE_OLIVINE_RIVAL, 8, 46, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermGeorge, -1
  11806. -   person_event SPRITE_OLIVINE_RIVAL, 26, 20, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermBerke, -1
  11807. -   person_event SPRITE_OLIVINE_RIVAL, 30, 32, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermKirk, -1
  11808. -   person_event SPRITE_OLIVINE_RIVAL, 46, 19, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermMathew, -1
  11809. -   person_event SPRITE_SWIMMER_GIRL, 4, 17, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfKaylee, -1
  11810. -   person_event SPRITE_SWIMMER_GIRL, 19, 23, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfSusie, -1
  11811. -   person_event SPRITE_SWIMMER_GIRL, 34, 27, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfDenise, -1
  11812. -   person_event SPRITE_SWIMMER_GIRL, 28, 44, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerSwimmerfKara, -1
  11813. -   person_event SPRITE_SWIMMER_GIRL, 50, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerSwimmerfWendy, -1
  11814. +   person_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermCharlie, -1
  11815. +   person_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermGeorge, -1
  11816. +   person_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermBerke, -1
  11817. +   person_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermKirk, -1
  11818. +   person_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermMathew, -1
  11819. +   person_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfKaylee, -1
  11820. +   person_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfSusie, -1
  11821. +   person_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfDenise, -1
  11822. +   person_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerSwimmerfKara, -1
  11823. +   person_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerSwimmerfWendy, -1
  11824. diff --git a/maps/Route42.asm b/maps/Route42.asm
  11825. index 04a5088..b427b3d 100644
  11826. --- a/maps/Route42.asm
  11827. +++ b/maps/Route42.asm
  11828. @@ -3,8 +3,8 @@ Route42_MapScriptHeader:
  11829.     db 2
  11830.  
  11831.     ; triggers
  11832.     dw UnknownScript_0x1a9216, $0000
  11833.     dw UnknownScript_0x1a9217, $0000
  11834.  
  11835.  .MapCallbacks:
  11836.     db 0
  11837. @@ -28,7 +28,7 @@ UnknownScript_0x1a9218:
  11838.     end
  11839.  
  11840.  TrainerFisherTully1:
  11841.     trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, $0000, FisherTully1Script
  11842.  
  11843.  FisherTully1Script:
  11844.     writecode VAR_CALLERID, PHONE_FISHER_TULLY
  11845. @@ -60,7 +60,7 @@ UnknownScript_0x1a926b:
  11846.  
  11847.  UnknownScript_0x1a927f:
  11848.     scall UnknownScript_0x1a9309
  11849.     winlosstext FisherTully1BeatenText, $0000
  11850.     copybytetovar wTullyFightCount
  11851.     if_equal 3, .Fight3
  11852.     if_equal 2, .Fight2
  11853. @@ -154,7 +154,7 @@ UnknownScript_0x1a9311:
  11854.     end
  11855.  
  11856.  TrainerPokemaniacShane:
  11857.     trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, $0000, PokemaniacShaneScript
  11858.  
  11859.  PokemaniacShaneScript:
  11860.     talkaftercancel
  11861. @@ -165,7 +165,7 @@ PokemaniacShaneScript:
  11862.     end
  11863.  
  11864.  TrainerHikerBenjamin:
  11865.     trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, $0000, HikerBenjaminScript
  11866.  
  11867.  HikerBenjaminScript:
  11868.     talkaftercancel
  11869. @@ -336,12 +336,12 @@ Route42_MapEventHeader:
  11870.  
  11871.  .PersonEvents:
  11872.     db 9
  11873. -   person_event SPRITE_FISHER, 10, 40, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherTully1, -1
  11874. -   person_event SPRITE_POKEFAN_M, 9, 51, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerBenjamin, -1
  11875. -   person_event SPRITE_SUPER_NERD, 8, 47, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacShane, -1
  11876. -   person_event SPRITE_FRUIT_TREE, 16, 27, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a934d, -1
  11877. -   person_event SPRITE_FRUIT_TREE, 16, 28, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a934f, -1
  11878. -   person_event SPRITE_FRUIT_TREE, 16, 29, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a9351, -1
  11879. -   person_event SPRITE_POKE_BALL, 4, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL
  11880. -   person_event SPRITE_POKE_BALL, 8, 33, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION
  11881. -   person_event SPRITE_SUICUNE, 16, 26, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
  11882. +   person_event SPRITE_FISHER, 10, 40, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherTully1, -1
  11883. +   person_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerBenjamin, -1
  11884. +   person_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacShane, -1
  11885. +   person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a934d, -1
  11886. +   person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a934f, -1
  11887. +   person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a9351, -1
  11888. +   person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL
  11889. +   person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION
  11890. +   person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEFN_01, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
  11891. diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
  11892. index e23810d..31a9735 100644
  11893. --- a/maps/Route42EcruteakGate.asm
  11894. +++ b/maps/Route42EcruteakGate.asm
  11895. @@ -35,4 +35,4 @@ Route42EcruteakGate_MapEventHeader:
  11896.  
  11897.  .PersonEvents:
  11898.     db 1
  11899. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19a4b5, -1
  11900. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19a4b5, -1
  11901. diff --git a/maps/Route43.asm b/maps/Route43.asm
  11902. index a4fb28f..4535911 100644
  11903. --- a/maps/Route43.asm
  11904. +++ b/maps/Route43.asm
  11905. @@ -20,7 +20,7 @@ UnknownScript_0x19d05c:
  11906.     return
  11907.  
  11908.  TrainerCamperSpencer:
  11909.     trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, $0000, CamperSpencerScript
  11910.  
  11911.  CamperSpencerScript:
  11912.     talkaftercancel
  11913. @@ -31,7 +31,7 @@ CamperSpencerScript:
  11914.     end
  11915.  
  11916.  TrainerPokemaniacBen:
  11917.     trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, $0000, PokemaniacBenScript
  11918.  
  11919.  PokemaniacBenScript:
  11920.     talkaftercancel
  11921. @@ -42,7 +42,7 @@ PokemaniacBenScript:
  11922.     end
  11923.  
  11924.  TrainerPokemaniacBrent1:
  11925.     trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, $0000, PokemaniacBrent1Script
  11926.  
  11927.  PokemaniacBrent1Script:
  11928.     writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT
  11929. @@ -72,7 +72,7 @@ UnknownScript_0x19d0bb:
  11930.  
  11931.  UnknownScript_0x19d0cf:
  11932.     scall UnknownScript_0x19d144
  11933.     winlosstext PokemaniacBrent1BeatenText, $0000
  11934.     copybytetovar wBrentFightCount
  11935.     if_equal 3, .Fight3
  11936.     if_equal 2, .Fight2
  11937. @@ -147,7 +147,7 @@ UnknownScript_0x19d144:
  11938.     end
  11939.  
  11940.  TrainerPokemaniacRon:
  11941.     trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, $0000, PokemaniacRonScript
  11942.  
  11943.  PokemaniacRonScript:
  11944.     talkaftercancel
  11945. @@ -158,7 +158,7 @@ PokemaniacRonScript:
  11946.     end
  11947.  
  11948.  TrainerFisherMarvin:
  11949.     trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, $0000, FisherMarvinScript
  11950.  
  11951.  FisherMarvinScript:
  11952.     talkaftercancel
  11953. @@ -169,7 +169,7 @@ FisherMarvinScript:
  11954.     end
  11955.  
  11956.  TrainerPicnickerTiffany3:
  11957.     trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, $0000, PicnickerTiffany3Script
  11958.  
  11959.  PicnickerTiffany3Script:
  11960.     writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY
  11961. @@ -203,7 +203,7 @@ UnknownScript_0x19d1ad:
  11962.  
  11963.  UnknownScript_0x19d1c1:
  11964.     scall UnknownScript_0x19d251
  11965.     winlosstext PicnickerTiffany3BeatenText, $0000
  11966.     copybytetovar wTiffanyFightCount
  11967.     if_equal 3, .Fight3
  11968.     if_equal 2, .Fight2
  11969. @@ -516,11 +516,11 @@ Route43_MapEventHeader:
  11970.  
  11971.  .PersonEvents:
  11972.     db 8
  11973. -   person_event SPRITE_SUPER_NERD, 5, 13, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacBen, -1
  11974. -   person_event SPRITE_SUPER_NERD, 20, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacBrent1, -1
  11975. -   person_event SPRITE_SUPER_NERD, 7, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacRon, -1
  11976. -   person_event SPRITE_FISHER, 16, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerFisherMarvin, -1
  11977. -   person_event SPRITE_LASS, 25, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTiffany3, -1
  11978. -   person_event SPRITE_YOUNGSTER, 40, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperSpencer, -1
  11979. -   person_event SPRITE_FRUIT_TREE, 26, 1, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19d266, -1
  11980. -   person_event SPRITE_POKE_BALL, 32, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER
  11981. +   person_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacBen, -1
  11982. +   person_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacBrent1, -1
  11983. +   person_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacRon, -1
  11984. +   person_event SPRITE_FISHER, 16, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerFisherMarvin, -1
  11985. +   person_event SPRITE_LASS, 25, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTiffany3, -1
  11986. +   person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperSpencer, -1
  11987. +   person_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19d266, -1
  11988. +   person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER
  11989. diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
  11990. index 4fe15be..0ab9ba1 100644
  11991. --- a/maps/Route43Gate.asm
  11992. +++ b/maps/Route43Gate.asm
  11993. @@ -3,8 +3,8 @@ Route43Gate_MapScriptHeader:
  11994.     db 2
  11995.  
  11996.     ; triggers
  11997.     dw UnknownScript_0x19abc5, $0000
  11998.     dw UnknownScript_0x19abc9, $0000
  11999.  
  12000.  .MapCallbacks:
  12001.     db 1
  12002. @@ -264,6 +264,6 @@ Route43Gate_MapEventHeader:
  12003.  
  12004.  .PersonEvents:
  12005.     db 3
  12006. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19ac85, EVENT_LAKE_OF_RAGE_CIVILIANS
  12007. -   person_event SPRITE_ROCKET, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS
  12008. -   person_event SPRITE_ROCKET, 4, 7, $7, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS
  12009. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19ac85, EVENT_LAKE_OF_RAGE_CIVILIANS
  12010. +   person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS
  12011. +   person_event SPRITE_ROCKET, 4, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS
  12012. diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
  12013. index 588fa92..0f1354b 100644
  12014. --- a/maps/Route43MahoganyGate.asm
  12015. +++ b/maps/Route43MahoganyGate.asm
  12016. @@ -54,4 +54,4 @@ Route43MahoganyGate_MapEventHeader:
  12017.  
  12018.  .PersonEvents:
  12019.     db 1
  12020. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19ab0b, -1
  12021. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19ab0b, -1
  12022. diff --git a/maps/Route44.asm b/maps/Route44.asm
  12023. index b2a08a7..3911a9d 100644
  12024. --- a/maps/Route44.asm
  12025. +++ b/maps/Route44.asm
  12026. @@ -6,7 +6,7 @@ Route44_MapScriptHeader:
  12027.     db 0
  12028.  
  12029.  TrainerBird_keeperVance1:
  12030.     trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, $0000, Bird_keeperVance1Script
  12031.  
  12032.  Bird_keeperVance1Script:
  12033.     writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
  12034. @@ -36,7 +36,7 @@ UnknownScript_0x19d856:
  12035.  
  12036.  UnknownScript_0x19d86a:
  12037.     scall UnknownScript_0x19d8f7
  12038.     winlosstext Bird_keeperVance1BeatenText, $0000
  12039.     copybytetovar wVanceFightCount
  12040.     if_equal 2, .Fight2
  12041.     if_equal 1, .Fight1
  12042. @@ -137,7 +137,7 @@ UnknownScript_0x19d90a:
  12043.     end
  12044.  
  12045.  TrainerPsychicPhil:
  12046.     trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, $0000, PsychicPhilScript
  12047.  
  12048.  PsychicPhilScript:
  12049.     talkaftercancel
  12050. @@ -148,7 +148,7 @@ PsychicPhilScript:
  12051.     end
  12052.  
  12053.  TrainerFisherWilton1:
  12054.     trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, $0000, FisherWilton1Script
  12055.  
  12056.  FisherWilton1Script:
  12057.     writecode VAR_CALLERID, PHONE_FISHER_WILTON
  12058. @@ -180,7 +180,7 @@ UnknownScript_0x19d95a:
  12059.  
  12060.  UnknownScript_0x19d96e:
  12061.     scall UnknownScript_0x19d8f7
  12062.     winlosstext FisherWilton1BeatenText, $0000
  12063.     copybytetovar wWiltonFightCount
  12064.     if_equal 2, .Fight2
  12065.     if_equal 1, .Fight1
  12066. @@ -243,7 +243,7 @@ UnknownScript_0x19d9e7:
  12067.     jump UnknownScript_0x19d8ff
  12068.  
  12069.  TrainerFisherEdgar:
  12070.     trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, $0000, FisherEdgarScript
  12071.  
  12072.  FisherEdgarScript:
  12073.     talkaftercancel
  12074. @@ -254,7 +254,7 @@ FisherEdgarScript:
  12075.     end
  12076.  
  12077.  TrainerCooltrainerfCybil:
  12078.     trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, $0000, CooltrainerfCybilScript
  12079.  
  12080.  CooltrainerfCybilScript:
  12081.     talkaftercancel
  12082. @@ -265,7 +265,7 @@ CooltrainerfCybilScript:
  12083.     end
  12084.  
  12085.  TrainerPokemaniacZach:
  12086.     trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, $0000, PokemaniacZachScript
  12087.  
  12088.  PokemaniacZachScript:
  12089.     talkaftercancel
  12090. @@ -276,7 +276,7 @@ PokemaniacZachScript:
  12091.     end
  12092.  
  12093.  TrainerCooltrainermAllen:
  12094.     trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, $0000, CooltrainermAllenScript
  12095.  
  12096.  CooltrainermAllenScript:
  12097.     talkaftercancel
  12098. @@ -513,14 +513,14 @@ Route44_MapEventHeader:
  12099.  
  12100.  .PersonEvents:
  12101.     db 11
  12102. -   person_event SPRITE_FISHER, 3, 35, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherWilton1, -1
  12103. -   person_event SPRITE_FISHER, 13, 19, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherEdgar, -1
  12104. -   person_event SPRITE_YOUNGSTER, 9, 10, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicPhil, -1
  12105. -   person_event SPRITE_SUPER_NERD, 2, 43, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPokemaniacZach, -1
  12106. -   person_event SPRITE_YOUNGSTER, 5, 51, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBird_keeperVance1, -1
  12107. -   person_event SPRITE_COOLTRAINER_M, 15, 41, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainermAllen, -1
  12108. -   person_event SPRITE_COOLTRAINER_F, 14, 31, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainerfCybil, -1
  12109. -   person_event SPRITE_FRUIT_TREE, 5, 9, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19da40, -1
  12110. -   person_event SPRITE_POKE_BALL, 8, 30, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE
  12111. -   person_event SPRITE_POKE_BALL, 4, 45, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL
  12112. -   person_event SPRITE_POKE_BALL, 9, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL
  12113. +   person_event SPRITE_FISHER, 3, 35, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherWilton1, -1
  12114. +   person_event SPRITE_FISHER, 13, 19, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherEdgar, -1
  12115. +   person_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicPhil, -1
  12116. +   person_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPokemaniacZach, -1
  12117. +   person_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBird_keeperVance1, -1
  12118. +   person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainermAllen, -1
  12119. +   person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainerfCybil, -1
  12120. +   person_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19da40, -1
  12121. +   person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE
  12122. +   person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL
  12123. +   person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL
  12124. diff --git a/maps/Route45.asm b/maps/Route45.asm
  12125. index 19f4312..8832eb4 100644
  12126. --- a/maps/Route45.asm
  12127. +++ b/maps/Route45.asm
  12128. @@ -6,7 +6,7 @@ Route45_MapScriptHeader:
  12129.     db 0
  12130.  
  12131.  TrainerBlackbeltKenji:
  12132.     trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, $0000, BlackbeltKenji3Script
  12133.  
  12134.  BlackbeltKenji3Script:
  12135.     writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI
  12136. @@ -110,7 +110,7 @@ UnknownScript_0x19e146:
  12137.     end
  12138.  
  12139.  TrainerHikerErik:
  12140.     trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, $0000, HikerErikScript
  12141.  
  12142.  HikerErikScript:
  12143.     talkaftercancel
  12144. @@ -121,7 +121,7 @@ HikerErikScript:
  12145.     end
  12146.  
  12147.  TrainerHikerMichael:
  12148.     trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, $0000, HikerMichaelScript
  12149.  
  12150.  HikerMichaelScript:
  12151.     talkaftercancel
  12152. @@ -132,7 +132,7 @@ HikerMichaelScript:
  12153.     end
  12154.  
  12155.  TrainerHikerParry:
  12156.     trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, $0000, HikerParry3Script
  12157.  
  12158.  HikerParry3Script:
  12159.     writecode VAR_CALLERID, PHONE_HIKER_PARRY
  12160. @@ -162,7 +162,7 @@ UnknownScript_0x19e1a4:
  12161.  
  12162.  UnknownScript_0x19e1b8:
  12163.     scall UnknownScript_0x19e133
  12164.     winlosstext HikerParry3BeatenText, $0000
  12165.     copybytetovar wParryFightCount
  12166.     if_equal 2, .Fight2
  12167.     if_equal 1, .Fight1
  12168. @@ -218,7 +218,7 @@ UnknownScript_0x19e219:
  12169.     jump UnknownScript_0x19e127
  12170.  
  12171.  TrainerHikerTimothy:
  12172.     trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, $0000, HikerTimothyScript
  12173.  
  12174.  HikerTimothyScript:
  12175.     talkaftercancel
  12176. @@ -229,7 +229,7 @@ HikerTimothyScript:
  12177.     end
  12178.  
  12179.  TrainerCooltrainermRyan:
  12180.     trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, $0000, CooltrainermRyanScript
  12181.  
  12182.  CooltrainermRyanScript:
  12183.     talkaftercancel
  12184. @@ -240,7 +240,7 @@ CooltrainermRyanScript:
  12185.     end
  12186.  
  12187.  TrainerCooltrainerfKelly:
  12188.     trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, $0000, CooltrainerfKellyScript
  12189.  
  12190.  CooltrainerfKellyScript:
  12191.     talkaftercancel
  12192. @@ -258,7 +258,7 @@ YoungsterScript_0x19e269:
  12193.     writetext UnknownText_0x19e87f
  12194.     closetext
  12195.     loadmovesprites
  12196.     winlosstext UnknownText_0x19e899, $0000
  12197.     loadtrainer CAMPER, QUENTIN
  12198.     startbattle
  12199.     returnafterbattle
  12200. @@ -535,16 +535,16 @@ Route45_MapEventHeader:
  12201.  
  12202.  .PersonEvents:
  12203.     db 13
  12204. -   person_event SPRITE_POKEFAN_M, 16, 10, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerErik, -1
  12205. -   person_event SPRITE_POKEFAN_M, 65, 15, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerMichael, -1
  12206. -   person_event SPRITE_POKEFAN_M, 28, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerParry, -1
  12207. -   person_event SPRITE_POKEFAN_M, 65, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerTimothy, -1
  12208. -   person_event SPRITE_BLACK_BELT, 50, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltKenji, -1
  12209. -   person_event SPRITE_COOLTRAINER_M, 18, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermRyan, -1
  12210. -   person_event SPRITE_COOLTRAINER_F, 36, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfKelly, -1
  12211. -   person_event SPRITE_FRUIT_TREE, 82, 16, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19e294, -1
  12212. -   person_event SPRITE_POKE_BALL, 51, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET
  12213. -   person_event SPRITE_POKE_BALL, 66, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE
  12214. -   person_event SPRITE_POKE_BALL, 20, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER
  12215. -   person_event SPRITE_POKE_BALL, 33, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION
  12216. -   person_event SPRITE_YOUNGSTER, 70, 4, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x19e269, -1
  12217. +   person_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerErik, -1
  12218. +   person_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerMichael, -1
  12219. +   person_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerParry, -1
  12220. +   person_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerTimothy, -1
  12221. +   person_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltKenji, -1
  12222. +   person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermRyan, -1
  12223. +   person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfKelly, -1
  12224. +   person_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19e294, -1
  12225. +   person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET
  12226. +   person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE
  12227. +   person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER
  12228. +   person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION
  12229. +   person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x19e269, -1
  12230. diff --git a/maps/Route46.asm b/maps/Route46.asm
  12231. index bda4cc9..aeb6f74 100644
  12232. --- a/maps/Route46.asm
  12233. +++ b/maps/Route46.asm
  12234. @@ -6,7 +6,7 @@ Route46_MapScriptHeader:
  12235.     db 0
  12236.  
  12237.  TrainerCamperTed:
  12238.     trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, $0000, CamperTedScript
  12239.  
  12240.  CamperTedScript:
  12241.     talkaftercancel
  12242. @@ -17,7 +17,7 @@ CamperTedScript:
  12243.     end
  12244.  
  12245.  TrainerPicnickerErin1:
  12246.     trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, $0000, PicnickerErin1Script
  12247.  
  12248.  PicnickerErin1Script:
  12249.     writecode VAR_CALLERID, PHONE_PICNICKER_ERIN
  12250. @@ -47,7 +47,7 @@ UnknownScript_0x1a96c6:
  12251.  
  12252.  UnknownScript_0x1a96da:
  12253.     scall UnknownScript_0x1a9767
  12254.     winlosstext PicnickerErin1BeatenText, $0000
  12255.     copybytetovar wErinFightCount
  12256.     if_equal 2, .Fight2
  12257.     if_equal 1, .Fight1
  12258. @@ -140,7 +140,7 @@ UnknownScript_0x1a9772:
  12259.     end
  12260.  
  12261.  TrainerHikerBailey:
  12262.     trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, $0000, HikerBaileyScript
  12263.  
  12264.  HikerBaileyScript:
  12265.     talkaftercancel
  12266. @@ -261,9 +261,9 @@ Route46_MapEventHeader:
  12267.  
  12268.  .PersonEvents:
  12269.     db 6
  12270. -   person_event SPRITE_POKEFAN_M, 19, 12, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerBailey, -1
  12271. -   person_event SPRITE_YOUNGSTER, 14, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperTed, -1
  12272. -   person_event SPRITE_LASS, 13, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerErin1, -1
  12273. -   person_event SPRITE_FRUIT_TREE, 5, 7, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a978f, -1
  12274. -   person_event SPRITE_FRUIT_TREE, 6, 8, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a9791, -1
  12275. -   person_event SPRITE_POKE_BALL, 15, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED
  12276. +   person_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerBailey, -1
  12277. +   person_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperTed, -1
  12278. +   person_event SPRITE_LASS, 13, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerErin1, -1
  12279. +   person_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a978f, -1
  12280. +   person_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a9791, -1
  12281. +   person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED
  12282. diff --git a/maps/Route5.asm b/maps/Route5.asm
  12283. index 2335dd3..96c3325 100644
  12284. --- a/maps/Route5.asm
  12285. +++ b/maps/Route5.asm
  12286. @@ -57,4 +57,4 @@ Route5_MapEventHeader:
  12287.  
  12288.  .PersonEvents:
  12289.     db 1
  12290. -   person_event SPRITE_POKEFAN_M, 16, 17, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
  12291. +   person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
  12292. diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm
  12293. index 200e4ec..855029c 100644
  12294. --- a/maps/Route5CleanseTagSpeechHouse.asm
  12295. +++ b/maps/Route5CleanseTagSpeechHouse.asm
  12296. @@ -75,5 +75,5 @@ Route5CleanseTagSpeechHouse_MapEventHeader:
  12297.  
  12298.  .PersonEvents:
  12299.     db 2
  12300. -   person_event SPRITE_GRANNY, 5, 2, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x18b634, -1
  12301. -   person_event SPRITE_TEACHER, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x18b64f, -1
  12302. +   person_event SPRITE_GRANNY, 5, 2, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x18b634, -1
  12303. +   person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x18b64f, -1
  12304. diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm
  12305. index ee40d6d..1ce6d05 100644
  12306. --- a/maps/Route5SaffronCityGate.asm
  12307. +++ b/maps/Route5SaffronCityGate.asm
  12308. @@ -36,4 +36,4 @@ Route5SaffronCityGate_MapEventHeader:
  12309.  
  12310.  .PersonEvents:
  12311.     db 1
  12312. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x18b5b9, -1
  12313. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x18b5b9, -1
  12314. diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm
  12315. index 5029df0..d3c93cd 100644
  12316. --- a/maps/Route5UndergroundEntrance.asm
  12317. +++ b/maps/Route5UndergroundEntrance.asm
  12318. @@ -34,4 +34,4 @@ Route5UndergroundEntrance_MapEventHeader:
  12319.  
  12320.  .PersonEvents:
  12321.     db 1
  12322. -   person_event SPRITE_TEACHER, 2, 2, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x18b555, -1
  12323. +   person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x18b555, -1
  12324. diff --git a/maps/Route6.asm b/maps/Route6.asm
  12325. index 50b8990..de2a5c4 100644
  12326. --- a/maps/Route6.asm
  12327. +++ b/maps/Route6.asm
  12328. @@ -6,7 +6,7 @@ Route6_MapScriptHeader:
  12329.     db 0
  12330.  
  12331.  TrainerPokefanmRex:
  12332.     trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, $0000, PokefanmRexScript
  12333.  
  12334.  PokefanmRexScript:
  12335.     talkaftercancel
  12336. @@ -17,7 +17,7 @@ PokefanmRexScript:
  12337.     end
  12338.  
  12339.  TrainerPokefanmAllan:
  12340.     trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, $0000, PokefanmAllanScript
  12341.  
  12342.  PokefanmAllanScript:
  12343.     talkaftercancel
  12344. @@ -104,6 +104,6 @@ Route6_MapEventHeader:
  12345.  
  12346.  .PersonEvents:
  12347.     db 3
  12348. -   person_event SPRITE_POKEFAN_M, 4, 17, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
  12349. -   person_event SPRITE_POKEFAN_M, 12, 9, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerPokefanmRex, -1
  12350. -   person_event SPRITE_POKEFAN_M, 12, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerPokefanmAllan, -1
  12351. +   person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
  12352. +   person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerPokefanmRex, -1
  12353. +   person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerPokefanmAllan, -1
  12354. diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
  12355. index ab457f5..070f0be 100644
  12356. --- a/maps/Route6SaffronGate.asm
  12357. +++ b/maps/Route6SaffronGate.asm
  12358. @@ -3,7 +3,7 @@ Route6SaffronGate_MapScriptHeader:
  12359.     db 1
  12360.  
  12361.     ; triggers
  12362.     dw UnknownScript_0x1926e9, $0000
  12363.  
  12364.  .MapCallbacks:
  12365.     db 0
  12366. @@ -75,4 +75,4 @@ Route6SaffronGate_MapEventHeader:
  12367.  
  12368.  .PersonEvents:
  12369.     db 1
  12370. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x1926ea, -1
  12371. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x1926ea, -1
  12372. diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
  12373. index 05b09f0..c3e268d 100644
  12374. --- a/maps/Route7SaffronGate.asm
  12375. +++ b/maps/Route7SaffronGate.asm
  12376. @@ -61,4 +61,4 @@ Route7SaffronGate_MapEventHeader:
  12377.  
  12378.  .PersonEvents:
  12379.     db 1
  12380. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x73518, -1
  12381. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x73518, -1
  12382. diff --git a/maps/Route8.asm b/maps/Route8.asm
  12383. index c8dab80..cad14ef 100644
  12384. --- a/maps/Route8.asm
  12385. +++ b/maps/Route8.asm
  12386. @@ -6,7 +6,7 @@ Route8_MapScriptHeader:
  12387.     db 0
  12388.  
  12389.  TrainerBikerDwayne:
  12390.     trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, $0000, BikerDwayneScript
  12391.  
  12392.  BikerDwayneScript:
  12393.     talkaftercancel
  12394. @@ -17,7 +17,7 @@ BikerDwayneScript:
  12395.     end
  12396.  
  12397.  TrainerBikerHarris:
  12398.     trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, $0000, BikerHarrisScript
  12399.  
  12400.  BikerHarrisScript:
  12401.     talkaftercancel
  12402. @@ -28,7 +28,7 @@ BikerHarrisScript:
  12403.     end
  12404.  
  12405.  TrainerBikerZeke:
  12406.     trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, $0000, BikerZekeScript
  12407.  
  12408.  BikerZekeScript:
  12409.     talkaftercancel
  12410. @@ -39,7 +39,7 @@ BikerZekeScript:
  12411.     end
  12412.  
  12413.  TrainerSupernerdSam:
  12414.     trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, $0000, SupernerdSamScript
  12415.  
  12416.  SupernerdSamScript:
  12417.     talkaftercancel
  12418. @@ -50,7 +50,7 @@ SupernerdSamScript:
  12419.     end
  12420.  
  12421.  TrainerSupernerdTom:
  12422.     trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, $0000, SupernerdTomScript
  12423.  
  12424.  SupernerdTomScript:
  12425.     talkaftercancel
  12426. @@ -183,9 +183,9 @@ Route8_MapEventHeader:
  12427.  
  12428.  .PersonEvents:
  12429.     db 6
  12430. -   person_event SPRITE_BIKER, 8, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerBikerDwayne, -1
  12431. -   person_event SPRITE_BIKER, 9, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerBikerHarris, -1
  12432. -   person_event SPRITE_BIKER, 10, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerBikerZeke, -1
  12433. -   person_event SPRITE_SUPER_NERD, 2, 23, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdSam, -1
  12434. -   person_event SPRITE_SUPER_NERD, 12, 31, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerSupernerdTom, -1
  12435. -   person_event SPRITE_FRUIT_TREE, 5, 33, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x6c06c, -1
  12436. +   person_event SPRITE_BIKER, 8, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerBikerDwayne, -1
  12437. +   person_event SPRITE_BIKER, 9, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerBikerHarris, -1
  12438. +   person_event SPRITE_BIKER, 10, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerBikerZeke, -1
  12439. +   person_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdSam, -1
  12440. +   person_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerSupernerdTom, -1
  12441. +   person_event SPRITE_FRUIT_TREE, 5, 33, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x6c06c, -1
  12442. diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
  12443. index 607909e..deb58b6 100644
  12444. --- a/maps/Route8SaffronGate.asm
  12445. +++ b/maps/Route8SaffronGate.asm
  12446. @@ -35,4 +35,4 @@ Route8SaffronGate_MapEventHeader:
  12447.  
  12448.  .PersonEvents:
  12449.     db 1
  12450. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7f416, -1
  12451. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7f416, -1
  12452. diff --git a/maps/Route9.asm b/maps/Route9.asm
  12453. index 6f760ff..576e410 100644
  12454. --- a/maps/Route9.asm
  12455. +++ b/maps/Route9.asm
  12456. @@ -6,7 +6,7 @@ Route9_MapScriptHeader:
  12457.     db 0
  12458.  
  12459.  TrainerCamperDean:
  12460.     trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, $0000, CamperDeanScript
  12461.  
  12462.  CamperDeanScript:
  12463.     talkaftercancel
  12464. @@ -17,7 +17,7 @@ CamperDeanScript:
  12465.     end
  12466.  
  12467.  TrainerPicnickerHeidi:
  12468.     trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, $0000, PicnickerHeidiScript
  12469.  
  12470.  PicnickerHeidiScript:
  12471.     talkaftercancel
  12472. @@ -28,7 +28,7 @@ PicnickerHeidiScript:
  12473.     end
  12474.  
  12475.  TrainerCamperSid:
  12476.     trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, $0000, CamperSidScript
  12477.  
  12478.  CamperSidScript:
  12479.     talkaftercancel
  12480. @@ -39,7 +39,7 @@ CamperSidScript:
  12481.     end
  12482.  
  12483.  TrainerPicnickerEdna:
  12484.     trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, $0000, PicnickerEdnaScript
  12485.  
  12486.  PicnickerEdnaScript:
  12487.     talkaftercancel
  12488. @@ -50,7 +50,7 @@ PicnickerEdnaScript:
  12489.     end
  12490.  
  12491.  TrainerHikerTim:
  12492.     trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, $0000, HikerTimScript
  12493.  
  12494.  HikerTimScript:
  12495.     talkaftercancel
  12496. @@ -61,7 +61,7 @@ HikerTimScript:
  12497.     end
  12498.  
  12499.  TrainerHikerSidney:
  12500.     trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, $0000, HikerSidneyScript
  12501.  
  12502.  HikerSidneyScript:
  12503.     talkaftercancel
  12504. @@ -216,9 +216,9 @@ Route9_MapEventHeader:
  12505.  
  12506.  .PersonEvents:
  12507.     db 6
  12508. -   person_event SPRITE_YOUNGSTER, 11, 23, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperDean, -1
  12509. -   person_event SPRITE_LASS, 8, 39, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerHeidi, -1
  12510. -   person_event SPRITE_YOUNGSTER, 4, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerCamperSid, -1
  12511. -   person_event SPRITE_LASS, 15, 12, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerEdna, -1
  12512. -   person_event SPRITE_POKEFAN_M, 3, 28, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerTim, -1
  12513. -   person_event SPRITE_POKEFAN_M, 15, 36, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerHikerSidney, -1
  12514. +   person_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperDean, -1
  12515. +   person_event SPRITE_LASS, 8, 39, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerHeidi, -1
  12516. +   person_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerCamperSid, -1
  12517. +   person_event SPRITE_LASS, 15, 12, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerEdna, -1
  12518. +   person_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerTim, -1
  12519. +   person_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerHikerSidney, -1
  12520. diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm
  12521. index f8ce706..397ef58 100644
  12522. --- a/maps/RuinsofAlphAerodactylChamber.asm
  12523. +++ b/maps/RuinsofAlphAerodactylChamber.asm
  12524. @@ -3,8 +3,8 @@ RuinsofAlphAerodactylChamber_MapScriptHeader:
  12525.     db 2
  12526.  
  12527.     ; triggers
  12528.     dw UnknownScript_0x58dad, $0000
  12529.     dw UnknownScript_0x58db8, $0000
  12530.  
  12531.  .MapCallbacks:
  12532.     db 1
  12533. diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm
  12534. index 2ddcd70..abacc6e 100644
  12535. --- a/maps/RuinsofAlphAerodactylItemRoom.asm
  12536. +++ b/maps/RuinsofAlphAerodactylItemRoom.asm
  12537. @@ -47,7 +47,7 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader:
  12538.  
  12539.  .PersonEvents:
  12540.     db 4
  12541. -   person_event SPRITE_POKE_BALL, 6, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
  12542. -   person_event SPRITE_POKE_BALL, 6, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
  12543. -   person_event SPRITE_POKE_BALL, 4, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
  12544. -   person_event SPRITE_POKE_BALL, 4, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
  12545. +   person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
  12546. +   person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
  12547. +   person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
  12548. +   person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
  12549. diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm
  12550. index 2007107..dccd966 100644
  12551. --- a/maps/RuinsofAlphHoOhChamber.asm
  12552. +++ b/maps/RuinsofAlphHoOhChamber.asm
  12553. @@ -3,8 +3,8 @@ RuinsofAlphHoOhChamber_MapScriptHeader:
  12554.     db 2
  12555.  
  12556.     ; triggers
  12557.     dw UnknownScript_0x5856d, $0000
  12558.     dw UnknownScript_0x5857b, $0000
  12559.  
  12560.  .MapCallbacks:
  12561.     db 1
  12562. diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm
  12563. index c3af94b..25c86aa 100644
  12564. --- a/maps/RuinsofAlphHoOhItemRoom.asm
  12565. +++ b/maps/RuinsofAlphHoOhItemRoom.asm
  12566. @@ -47,7 +47,7 @@ RuinsofAlphHoOhItemRoom_MapEventHeader:
  12567.  
  12568.  .PersonEvents:
  12569.     db 4
  12570. -   person_event SPRITE_POKE_BALL, 6, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
  12571. -   person_event SPRITE_POKE_BALL, 6, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
  12572. -   person_event SPRITE_POKE_BALL, 4, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
  12573. -   person_event SPRITE_POKE_BALL, 4, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
  12574. +   person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
  12575. +   person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
  12576. +   person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
  12577. +   person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
  12578. diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm
  12579. index ae8bed5..2d36abb 100644
  12580. --- a/maps/RuinsofAlphInnerChamber.asm
  12581. +++ b/maps/RuinsofAlphInnerChamber.asm
  12582. @@ -3,8 +3,8 @@ RuinsofAlphInnerChamber_MapScriptHeader:
  12583.     db 2
  12584.  
  12585.     ; triggers
  12586.     dw UnknownScript_0x58f69, $0000
  12587.     dw UnknownScript_0x58f6a, $0000
  12588.  
  12589.  .MapCallbacks:
  12590.     db 0
  12591. @@ -125,6 +125,6 @@ RuinsofAlphInnerChamber_MapEventHeader:
  12592.  
  12593.  .PersonEvents:
  12594.     db 3
  12595. -   person_event SPRITE_FISHER, 7, 3, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
  12596. -   person_event SPRITE_TEACHER, 13, 14, $2, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
  12597. -   person_event SPRITE_GRAMPS, 19, 11, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
  12598. +   person_event SPRITE_FISHER, 7, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
  12599. +   person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
  12600. +   person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
  12601. diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm
  12602. index e20eaf7..d48cfb1 100644
  12603. --- a/maps/RuinsofAlphKabutoChamber.asm
  12604. +++ b/maps/RuinsofAlphKabutoChamber.asm
  12605. @@ -3,8 +3,8 @@ RuinsofAlphKabutoChamber_MapScriptHeader:
  12606.     db 2
  12607.  
  12608.     ; triggers
  12609.     dw UnknownScript_0x5872b, $0000
  12610.     dw UnknownScript_0x58736, $0000
  12611.  
  12612.  .MapCallbacks:
  12613.     db 1
  12614. @@ -284,5 +284,5 @@ RuinsofAlphKabutoChamber_MapEventHeader:
  12615.  
  12616.  .PersonEvents:
  12617.     db 2
  12618. -   person_event SPRITE_RECEPTIONIST, 5, 5, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
  12619. -   person_event SPRITE_SCIENTIST, 1, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x587a8, -1
  12620. +   person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
  12621. +   person_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x587a8, -1
  12622. diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm
  12623. index 02f9242..d27f5a8 100644
  12624. --- a/maps/RuinsofAlphKabutoItemRoom.asm
  12625. +++ b/maps/RuinsofAlphKabutoItemRoom.asm
  12626. @@ -47,7 +47,7 @@ RuinsofAlphKabutoItemRoom_MapEventHeader:
  12627.  
  12628.  .PersonEvents:
  12629.     db 4
  12630. -   person_event SPRITE_POKE_BALL, 6, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
  12631. -   person_event SPRITE_POKE_BALL, 6, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
  12632. -   person_event SPRITE_POKE_BALL, 4, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
  12633. -   person_event SPRITE_POKE_BALL, 4, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
  12634. +   person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
  12635. +   person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
  12636. +   person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
  12637. +   person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
  12638. diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm
  12639. index 3c0642a..4805ba9 100644
  12640. --- a/maps/RuinsofAlphOmanyteChamber.asm
  12641. +++ b/maps/RuinsofAlphOmanyteChamber.asm
  12642. @@ -3,8 +3,8 @@ RuinsofAlphOmanyteChamber_MapScriptHeader:
  12643.     db 2
  12644.  
  12645.     ; triggers
  12646.     dw UnknownScript_0x58be9, $0000
  12647.     dw UnknownScript_0x58bf7, $0000
  12648.  
  12649.  .MapCallbacks:
  12650.     db 1
  12651. diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm
  12652. index 5fb6227..5a37501 100644
  12653. --- a/maps/RuinsofAlphOmanyteItemRoom.asm
  12654. +++ b/maps/RuinsofAlphOmanyteItemRoom.asm
  12655. @@ -47,7 +47,7 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader:
  12656.  
  12657.  .PersonEvents:
  12658.     db 4
  12659. -   person_event SPRITE_POKE_BALL, 6, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
  12660. -   person_event SPRITE_POKE_BALL, 6, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
  12661. -   person_event SPRITE_POKE_BALL, 4, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
  12662. -   person_event SPRITE_POKE_BALL, 4, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
  12663. +   person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
  12664. +   person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
  12665. +   person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
  12666. +   person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
  12667. diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm
  12668. index e4748d9..3ac707d 100644
  12669. --- a/maps/RuinsofAlphOutside.asm
  12670. +++ b/maps/RuinsofAlphOutside.asm
  12671. @@ -3,8 +3,8 @@ RuinsofAlphOutside_MapScriptHeader:
  12672.     db 2
  12673.  
  12674.     ; triggers
  12675.     dw UnknownScript_0x5800d, $0000
  12676.     dw UnknownScript_0x5800e, $0000
  12677.  
  12678.  .MapCallbacks:
  12679.     db 1
  12680. @@ -100,7 +100,7 @@ YoungsterScript_0x5807e:
  12681.     end
  12682.  
  12683.  TrainerPsychicNathan:
  12684.     trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, $0000, PsychicNathanScript
  12685.  
  12686.  PsychicNathanScript:
  12687.     talkaftercancel
  12688. @@ -112,7 +112,7 @@ PsychicNathanScript:
  12689.  
  12690.  
  12691.  TrainerSuperNerdStan:
  12692.     trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, $0000, UnknownScript_0x580a9
  12693.  
  12694.  UnknownScript_0x580a9:
  12695.     talkaftercancel
  12696. @@ -311,8 +311,8 @@ RuinsofAlphOutside_MapEventHeader:
  12697.  
  12698.  .PersonEvents:
  12699.     db 5
  12700. -   person_event SPRITE_YOUNGSTER, 20, 4, $6, 0, 0, -1, -1, 0, 2, 1, TrainerPsychicNathan, -1
  12701. -   person_event SPRITE_SCIENTIST, 15, 11, $7, 0, 0, -1, -1, 0, 0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
  12702. -   person_event SPRITE_FISHER, 17, 13, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
  12703. -   person_event SPRITE_YOUNGSTER, 11, 14, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
  12704. -   person_event SPRITE_YOUNGSTER, 8, 12, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
  12705. +   person_event SPRITE_YOUNGSTER, 20, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 1, TrainerPsychicNathan, -1
  12706. +   person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
  12707. +   person_event SPRITE_FISHER, 17, 13, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
  12708. +   person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
  12709. +   person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
  12710. diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm
  12711. index 47aa063..205185d 100644
  12712. --- a/maps/RuinsofAlphResearchCenter.asm
  12713. +++ b/maps/RuinsofAlphResearchCenter.asm
  12714. @@ -3,8 +3,8 @@ RuinsofAlphResearchCenter_MapScriptHeader:
  12715.     db 2
  12716.  
  12717.     ; triggers
  12718.     dw UnknownScript_0x59180, $0000
  12719.     dw UnknownScript_0x59181, $0000
  12720.  
  12721.  .MapCallbacks:
  12722.     db 1
  12723. @@ -412,6 +412,6 @@ RuinsofAlphResearchCenter_MapEventHeader:
  12724.  
  12725.  .PersonEvents:
  12726.     db 3
  12727. -   person_event SPRITE_SCIENTIST, 5, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x591e5, -1
  12728. -   person_event SPRITE_SCIENTIST, 2, 5, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x59214, -1
  12729. -   person_event SPRITE_SCIENTIST, 5, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
  12730. +   person_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x591e5, -1
  12731. +   person_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEFN_02, 1, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x59214, -1
  12732. +   person_event SPRITE_SCIENTIST, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
  12733. diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
  12734. index 911da54..396aa31 100644
  12735. --- a/maps/SafariZoneWardensHome.asm
  12736. +++ b/maps/SafariZoneWardensHome.asm
  12737. @@ -94,4 +94,4 @@ SafariZoneWardensHome_MapEventHeader:
  12738.  
  12739.  .PersonEvents:
  12740.     db 1
  12741. -   person_event SPRITE_LASS, 4, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, WardensGranddaughter, -1
  12742. +   person_event SPRITE_LASS, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, WardensGranddaughter, -1
  12743. diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
  12744. index 363f930..a5fa856 100644
  12745. --- a/maps/SaffronCity.asm
  12746. +++ b/maps/SaffronCity.asm
  12747. @@ -295,11 +295,11 @@ SaffronCity_MapEventHeader:
  12748.  
  12749.  .PersonEvents:
  12750.     db 8
  12751. -   person_event SPRITE_LASS, 14, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x19932a, -1
  12752. -   person_event SPRITE_POKEFAN_M, 30, 19, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x19933e, -1
  12753. -   person_event SPRITE_COOLTRAINER_M, 7, 32, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x199352, -1
  12754. -   person_event SPRITE_COOLTRAINER_F, 24, 20, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x199355, -1
  12755. -   person_event SPRITE_FISHER, 12, 27, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x199358, -1
  12756. -   person_event SPRITE_YOUNGSTER, 19, 15, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x19936c, -1
  12757. -   person_event SPRITE_YOUNGSTER, 22, 35, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19936f, -1
  12758. -   person_event SPRITE_LASS, 8, 19, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x199372, -1
  12759. +   person_event SPRITE_LASS, 14, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x19932a, -1
  12760. +   person_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x19933e, -1
  12761. +   person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x199352, -1
  12762. +   person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x199355, -1
  12763. +   person_event SPRITE_FISHER, 12, 27, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x199358, -1
  12764. +   person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x19936c, -1
  12765. +   person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19936f, -1
  12766. +   person_event SPRITE_LASS, 8, 19, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x199372, -1
  12767. diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
  12768. index 8e7bb10..dfd476b 100644
  12769. --- a/maps/SaffronGym.asm
  12770. +++ b/maps/SaffronGym.asm
  12771. @@ -13,7 +13,7 @@ SabrinaScript_0x189c2e:
  12772.     writetext UnknownText_0x189cdf
  12773.     closetext
  12774.     loadmovesprites
  12775.     winlosstext UnknownText_0x189df4, $0000
  12776.     loadtrainer SABRINA, 1
  12777.     startbattle
  12778.     returnafterbattle
  12779. @@ -39,7 +39,7 @@ SabrinaScript_0x189c2e:
  12780.     end
  12781.  
  12782.  TrainerMediumRebecca:
  12783.     trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, $0000, MediumRebeccaScript
  12784.  
  12785.  MediumRebeccaScript:
  12786.     talkaftercancel
  12787. @@ -50,7 +50,7 @@ MediumRebeccaScript:
  12788.     end
  12789.  
  12790.  TrainerPsychicFranklin:
  12791.     trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, $0000, PsychicFranklinScript
  12792.  
  12793.  PsychicFranklinScript:
  12794.     talkaftercancel
  12795. @@ -61,7 +61,7 @@ PsychicFranklinScript:
  12796.     end
  12797.  
  12798.  TrainerMediumDoris:
  12799.     trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, $0000, MediumDorisScript
  12800.  
  12801.  MediumDorisScript:
  12802.     talkaftercancel
  12803. @@ -72,7 +72,7 @@ MediumDorisScript:
  12804.     end
  12805.  
  12806.  TrainerPsychicJared:
  12807.     trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, $0000, PsychicJaredScript
  12808.  
  12809.  PsychicJaredScript:
  12810.     talkaftercancel
  12811. @@ -330,9 +330,9 @@ SaffronGym_MapEventHeader:
  12812.  
  12813.  .PersonEvents:
  12814.     db 6
  12815. -   person_event SPRITE_SABRINA, 8, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SabrinaScript_0x189c2e, -1
  12816. -   person_event SPRITE_GRANNY, 16, 17, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerMediumRebecca, -1
  12817. -   person_event SPRITE_YOUNGSTER, 16, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicFranklin, -1
  12818. -   person_event SPRITE_GRANNY, 4, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerMediumDoris, -1
  12819. -   person_event SPRITE_YOUNGSTER, 4, 17, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPsychicJared, -1
  12820. -   person_event SPRITE_GYM_GUY, 14, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SaffronGymGuyScript, -1
  12821. +   person_event SPRITE_SABRINA, 8, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SabrinaScript_0x189c2e, -1
  12822. +   person_event SPRITE_GRANNY, 16, 17, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerMediumRebecca, -1
  12823. +   person_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicFranklin, -1
  12824. +   person_event SPRITE_GRANNY, 4, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerMediumDoris, -1
  12825. +   person_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPsychicJared, -1
  12826. +   person_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SaffronGymGuyScript, -1
  12827. diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
  12828. index 6a68113..63d0f24 100644
  12829. --- a/maps/SaffronMart.asm
  12830. +++ b/maps/SaffronMart.asm
  12831. @@ -49,6 +49,6 @@ SaffronMart_MapEventHeader:
  12832.  
  12833.  .PersonEvents:
  12834.     db 3
  12835. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18a3bf, -1
  12836. -   person_event SPRITE_COOLTRAINER_M, 2, 7, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CooltrainerMScript_0x18a3c6, -1
  12837. -   person_event SPRITE_COOLTRAINER_F, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18a3c9, -1
  12838. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18a3bf, -1
  12839. +   person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CooltrainerMScript_0x18a3c6, -1
  12840. +   person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18a3c9, -1
  12841. diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm
  12842. index 125e796..4b957a3 100644
  12843. --- a/maps/SaffronPokeCenter1F.asm
  12844. +++ b/maps/SaffronPokeCenter1F.asm
  12845. @@ -123,7 +123,7 @@ SaffronPokeCenter1F_MapEventHeader:
  12846.  
  12847.  .PersonEvents:
  12848.     db 4
  12849. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18a47d, -1
  12850. -   person_event SPRITE_TEACHER, 2, 7, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x18a480, -1
  12851. -   person_event SPRITE_FISHER, 6, 8, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18a48c, -1
  12852. -   person_event SPRITE_YOUNGSTER, 4, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x18a4a0, -1
  12853. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18a47d, -1
  12854. +   person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x18a480, -1
  12855. +   person_event SPRITE_FISHER, 6, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18a48c, -1
  12856. +   person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x18a4a0, -1
  12857. diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm
  12858. index 55587b1..06306c6 100644
  12859. --- a/maps/SaffronTrainStation.asm
  12860. +++ b/maps/SaffronTrainStation.asm
  12861. @@ -3,7 +3,7 @@ SaffronTrainStation_MapScriptHeader:
  12862.     db 1
  12863.  
  12864.     ; triggers
  12865.     dw .Trigger1, $0000
  12866.  
  12867.  .MapCallbacks:
  12868.     db 0
  12869. @@ -231,7 +231,7 @@ SaffronTrainStation_MapEventHeader:
  12870.  
  12871.  .PersonEvents:
  12872.     db 4
  12873. -   person_event SPRITE_OFFICER, 9, 9, $6, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x18a81e, -1
  12874. -   person_event SPRITE_GYM_GUY, 14, 10, $2, 1, 1, -1, -1, 0, 0, 0, GymGuyScript_0x18a875, -1
  12875. -   person_event SPRITE_TEACHER, 11, 6, $9, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION
  12876. -   person_event SPRITE_LASS, 10, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION
  12877. +   person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x18a81e, -1
  12878. +   person_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GymGuyScript_0x18a875, -1
  12879. +   person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION
  12880. +   person_event SPRITE_LASS, 10, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION
  12881. diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
  12882. index 558a979..1e556ee 100644
  12883. --- a/maps/SeafoamGym.asm
  12884. +++ b/maps/SeafoamGym.asm
  12885. @@ -3,7 +3,7 @@ SeafoamGym_MapScriptHeader:
  12886.     db 1
  12887.  
  12888.     ; triggers
  12889.     dw UnknownScript_0x1ab4fa, $0000
  12890.  
  12891.  .MapCallbacks:
  12892.     db 0
  12893. @@ -19,7 +19,7 @@ BlaineScript_0x1ab4fb:
  12894.     writetext UnknownText_0x1ab548
  12895.     closetext
  12896.     loadmovesprites
  12897.     winlosstext UnknownText_0x1ab646, $0000
  12898.     loadtrainer BLAINE, 1
  12899.     startbattle
  12900.     iftrue .ReturnAfterBattle
  12901. @@ -171,5 +171,5 @@ SeafoamGym_MapEventHeader:
  12902.  
  12903.  .PersonEvents:
  12904.     db 2
  12905. -   person_event SPRITE_BLAINE, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BlaineScript_0x1ab4fb, -1
  12906. -   person_event SPRITE_GYM_GUY, 5, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
  12907. +   person_event SPRITE_BLAINE, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BlaineScript_0x1ab4fb, -1
  12908. +   person_event SPRITE_GYM_GUY, 5, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
  12909. diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
  12910. index 0acff40..e3fa187 100644
  12911. --- a/maps/SilphCo1F.asm
  12912. +++ b/maps/SilphCo1F.asm
  12913. @@ -68,5 +68,5 @@ SilphCo1F_MapEventHeader:
  12914.  
  12915.  .PersonEvents:
  12916.     db 2
  12917. -   person_event SPRITE_RECEPTIONIST, 2, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ReceptionistScript_0x18abe5, -1
  12918. -   person_event SPRITE_OFFICER, 1, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x18abe8, -1
  12919. +   person_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ReceptionistScript_0x18abe5, -1
  12920. +   person_event SPRITE_OFFICER, 1, 13, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x18abe8, -1
  12921. diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
  12922. index e421dd7..1b63a1b 100644
  12923. --- a/maps/SilverCaveItemRooms.asm
  12924. +++ b/maps/SilverCaveItemRooms.asm
  12925. @@ -28,5 +28,5 @@ SilverCaveItemRooms_MapEventHeader:
  12926.  
  12927.  .PersonEvents:
  12928.     db 2
  12929. -   person_event SPRITE_POKE_BALL, 3, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
  12930. -   person_event SPRITE_POKE_BALL, 11, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
  12931. +   person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
  12932. +   person_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
  12933. diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm
  12934. index 1b53d49..2557e12 100644
  12935. --- a/maps/SilverCavePokeCenter1F.asm
  12936. +++ b/maps/SilverCavePokeCenter1F.asm
  12937. @@ -43,5 +43,5 @@ SilverCavePokeCenter1F_MapEventHeader:
  12938.  
  12939.  .PersonEvents:
  12940.     db 2
  12941. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ae59a, -1
  12942. -   person_event SPRITE_GRANNY, 5, 1, $8, 1, 2, -1, -1, 0, 0, 0, GrannyScript_0x1ae59d, -1
  12943. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ae59a, -1
  12944. +   person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEFN_08, 1, 2, -1, -1, 0, 0, 0, GrannyScript_0x1ae59d, -1
  12945. diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
  12946. index 97546a7..bc012df 100644
  12947. --- a/maps/SilverCaveRoom1.asm
  12948. +++ b/maps/SilverCaveRoom1.asm
  12949. @@ -44,7 +44,7 @@ SilverCaveRoom1_MapEventHeader:
  12950.  
  12951.  .PersonEvents:
  12952.     db 4
  12953. -   person_event SPRITE_POKE_BALL, 9, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
  12954. -   person_event SPRITE_POKE_BALL, 29, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
  12955. -   person_event SPRITE_POKE_BALL, 30, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
  12956. -   person_event SPRITE_POKE_BALL, 18, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
  12957. +   person_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
  12958. +   person_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
  12959. +   person_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
  12960. +   person_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
  12961. diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
  12962. index ff0e18d..5bb9ef9 100644
  12963. --- a/maps/SilverCaveRoom2.asm
  12964. +++ b/maps/SilverCaveRoom2.asm
  12965. @@ -38,6 +38,6 @@ SilverCaveRoom2_MapEventHeader:
  12966.  
  12967.  .PersonEvents:
  12968.     db 3
  12969. -   person_event SPRITE_POKE_BALL, 10, 24, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
  12970. -   person_event SPRITE_POKE_BALL, 24, 22, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
  12971. -   person_event SPRITE_POKE_BALL, 20, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP
  12972. +   person_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
  12973. +   person_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
  12974. +   person_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP
  12975. diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
  12976. index 4b61090..2b0b11b 100644
  12977. --- a/maps/SilverCaveRoom3.asm
  12978. +++ b/maps/SilverCaveRoom3.asm
  12979. @@ -63,4 +63,4 @@ SilverCaveRoom3_MapEventHeader:
  12980.  
  12981.  .PersonEvents:
  12982.     db 1
  12983. -   person_event SPRITE_RED, 10, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER
  12984. +   person_event SPRITE_RED, 10, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER
  12985. diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
  12986. index 9ace60a..c62c9ca 100644
  12987. --- a/maps/SlowpokeWellB1F.asm
  12988. +++ b/maps/SlowpokeWellB1F.asm
  12989. @@ -9,7 +9,7 @@ KurtScript_0x5a5d5:
  12990.     jumptextfaceplayer UnknownText_0x5a6b5
  12991.  
  12992.  TrainerGruntM29:
  12993.     trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, $0000, GruntM29Script
  12994.  
  12995.  GruntM29Script:
  12996.     talkaftercancel
  12997. @@ -20,7 +20,7 @@ GruntM29Script:
  12998.     end
  12999.  
  13000.  TrainerGruntM1:
  13001.     trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, $0000, GruntM1Script
  13002.  
  13003.  GruntM1Script:
  13004.     loadfont
  13005. @@ -63,7 +63,7 @@ GruntM1Script:
  13006.     end
  13007.  
  13008.  TrainerGruntM2:
  13009.     trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, $0000, GruntM2Script
  13010.  
  13011.  GruntM2Script:
  13012.     talkaftercancel
  13013. @@ -74,7 +74,7 @@ GruntM2Script:
  13014.     end
  13015.  
  13016.  TrainerGruntF1:
  13017.     trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, $0000, GruntF1Script
  13018.  
  13019.  GruntF1Script:
  13020.     talkaftercancel
  13021. @@ -326,12 +326,12 @@ SlowpokeWellB1F_MapEventHeader:
  13022.  
  13023.  .PersonEvents:
  13024.     db 9
  13025. -   person_event SPRITE_ROCKET, 7, 15, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
  13026. -   person_event SPRITE_ROCKET, 2, 5, $6, 0, 0, -1, -1, 0, 2, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
  13027. -   person_event SPRITE_ROCKET, 6, 5, $9, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
  13028. -   person_event SPRITE_ROCKET_GIRL, 4, 10, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
  13029. -   person_event SPRITE_SLOWPOKE, 4, 7, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES
  13030. -   person_event SPRITE_SLOWPOKE, 2, 6, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES
  13031. -   person_event SPRITE_KURT, 14, 16, $7, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT
  13032. -   person_event SPRITE_BOULDER, 2, 3, $19, 0, 0, -1, -1, 0, 0, 0, SlowpokeWellB1FBoulder, -1
  13033. -   person_event SPRITE_POKE_BALL, 3, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
  13034. +   person_event SPRITE_ROCKET, 7, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
  13035. +   person_event SPRITE_ROCKET, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
  13036. +   person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
  13037. +   person_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
  13038. +   person_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES
  13039. +   person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES
  13040. +   person_event SPRITE_KURT, 14, 16, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT
  13041. +   person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, SlowpokeWellB1FBoulder, -1
  13042. +   person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
  13043. diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
  13044. index fcf207b..d23b0c9 100644
  13045. --- a/maps/SlowpokeWellB2F.asm
  13046. +++ b/maps/SlowpokeWellB2F.asm
  13047. @@ -73,5 +73,5 @@ SlowpokeWellB2F_MapEventHeader:
  13048.  
  13049.  .PersonEvents:
  13050.     db 2
  13051. -   person_event SPRITE_GYM_GUY, 4, 5, $2, 2, 1, -1, -1, 0, 0, 1, GymGuyScript_0x5ad0b, -1
  13052. -   person_event SPRITE_POKE_BALL, 5, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
  13053. +   person_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 1, GymGuyScript_0x5ad0b, -1
  13054. +   person_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
  13055. diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
  13056. index f315a3b..6462f8b 100644
  13057. --- a/maps/SoulHouse.asm
  13058. +++ b/maps/SoulHouse.asm
  13059. @@ -83,7 +83,7 @@ SoulHouse_MapEventHeader:
  13060.  
  13061.  .PersonEvents:
  13062.     db 4
  13063. -   person_event SPRITE_GRAMPS, 2, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x7ec47, -1
  13064. -   person_event SPRITE_TEACHER, 3, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7ec4a, -1
  13065. -   person_event SPRITE_LASS, 5, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x7ec4d, -1
  13066. -   person_event SPRITE_GRANNY, 3, 1, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x7ec50, -1
  13067. +   person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x7ec47, -1
  13068. +   person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7ec4a, -1
  13069. +   person_event SPRITE_LASS, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x7ec4d, -1
  13070. +   person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x7ec50, -1
  13071. diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
  13072. index ee4eef4..ab460c3 100644
  13073. --- a/maps/SproutTower1F.asm
  13074. +++ b/maps/SproutTower1F.asm
  13075. @@ -18,7 +18,7 @@ TeacherScript_0x184507:
  13076.     jumptextfaceplayer UnknownText_0x18469d
  13077.  
  13078.  TrainerSageChow:
  13079.     trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, $0000, SageChowScript
  13080.  
  13081.  SageChowScript:
  13082.     talkaftercancel
  13083. @@ -116,9 +116,9 @@ SproutTower1F_MapEventHeader:
  13084.  
  13085.  .PersonEvents:
  13086.     db 6
  13087. -   person_event SPRITE_SAGE, 4, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageScript_0x1844fe, -1
  13088. -   person_event SPRITE_SAGE, 7, 6, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageScript_0x184501, -1
  13089. -   person_event SPRITE_GRANNY, 12, 11, $8, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x184504, -1
  13090. -   person_event SPRITE_TEACHER, 9, 9, $7, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x184507, -1
  13091. -   person_event SPRITE_SAGE, 5, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSageChow, -1
  13092. -   person_event SPRITE_POKE_BALL, 7, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
  13093. +   person_event SPRITE_SAGE, 4, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageScript_0x1844fe, -1
  13094. +   person_event SPRITE_SAGE, 7, 6, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageScript_0x184501, -1
  13095. +   person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x184504, -1
  13096. +   person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x184507, -1
  13097. +   person_event SPRITE_SAGE, 5, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSageChow, -1
  13098. +   person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
  13099. diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
  13100. index 946f57d..3fef9b0 100644
  13101. --- a/maps/SproutTower2F.asm
  13102. +++ b/maps/SproutTower2F.asm
  13103. @@ -6,7 +6,7 @@ SproutTower2F_MapScriptHeader:
  13104.     db 0
  13105.  
  13106.  TrainerSageNico:
  13107.     trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, $0000, SageNicoScript
  13108.  
  13109.  SageNicoScript:
  13110.     talkaftercancel
  13111. @@ -17,7 +17,7 @@ SageNicoScript:
  13112.     end
  13113.  
  13114.  TrainerSageEdmond:
  13115.     trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, $0000, SageEdmondScript
  13116.  
  13117.  SageEdmondScript:
  13118.     talkaftercancel
  13119. @@ -99,6 +99,6 @@ SproutTower2F_MapEventHeader:
  13120.  
  13121.  .PersonEvents:
  13122.     db 3
  13123. -   person_event SPRITE_SAGE, 3, 12, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSageNico, -1
  13124. -   person_event SPRITE_SAGE, 14, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSageEdmond, -1
  13125. -   person_event SPRITE_POKE_BALL, 1, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY
  13126. +   person_event SPRITE_SAGE, 3, 12, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSageNico, -1
  13127. +   person_event SPRITE_SAGE, 14, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSageEdmond, -1
  13128. +   person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY
  13129. diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
  13130. index 7656bde..165f31e 100644
  13131. --- a/maps/SproutTower3F.asm
  13132. +++ b/maps/SproutTower3F.asm
  13133. @@ -3,8 +3,8 @@ SproutTower3F_MapScriptHeader:
  13134.     db 2
  13135.  
  13136.     ; triggers
  13137.     dw UnknownScript_0x184945, $0000
  13138.     dw UnknownScript_0x184946, $0000
  13139.  
  13140.  .MapCallbacks:
  13141.     db 0
  13142. @@ -64,7 +64,7 @@ SageLiScript:
  13143.     writetext SageLiSeenText
  13144.     closetext
  13145.     loadmovesprites
  13146.     winlosstext SageLiBeatenText, $0000
  13147.     loadtrainer SAGE, LI
  13148.     startbattle
  13149.     returnafterbattle
  13150. @@ -86,7 +86,7 @@ UnknownScript_0x1849d1:
  13151.     end
  13152.  
  13153.  TrainerSageJin:
  13154.     trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, $0000, SageJinScript
  13155.  
  13156.  SageJinScript:
  13157.     talkaftercancel
  13158. @@ -97,7 +97,7 @@ SageJinScript:
  13159.     end
  13160.  
  13161.  TrainerSageTroy:
  13162.     trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, $0000, SageTroyScript
  13163.  
  13164.  SageTroyScript:
  13165.     talkaftercancel
  13166. @@ -108,7 +108,7 @@ SageTroyScript:
  13167.     end
  13168.  
  13169.  TrainerSageNeal:
  13170.     trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, $0000, SageNealScript
  13171.  
  13172.  SageNealScript:
  13173.     talkaftercancel
  13174. @@ -345,10 +345,10 @@ SproutTower3F_MapEventHeader:
  13175.  
  13176.  .PersonEvents:
  13177.     db 7
  13178. -   person_event SPRITE_SAGE, 13, 8, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSageJin, -1
  13179. -   person_event SPRITE_SAGE, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerSageTroy, -1
  13180. -   person_event SPRITE_SAGE, 2, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageLiScript, -1
  13181. -   person_event SPRITE_SAGE, 11, 11, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSageNeal, -1
  13182. -   person_event SPRITE_POKE_BALL, 14, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION
  13183. -   person_event SPRITE_POKE_BALL, 1, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
  13184. -   person_event SPRITE_SILVER, 4, 10, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
  13185. +   person_event SPRITE_SAGE, 13, 8, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSageJin, -1
  13186. +   person_event SPRITE_SAGE, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerSageTroy, -1
  13187. +   person_event SPRITE_SAGE, 2, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageLiScript, -1
  13188. +   person_event SPRITE_SAGE, 11, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSageNeal, -1
  13189. +   person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION
  13190. +   person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
  13191. +   person_event SPRITE_SILVER, 4, 10, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
  13192. diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
  13193. index 3f7f1f3..ed4f4d0 100644
  13194. --- a/maps/TeamRocketBaseB1F.asm
  13195. +++ b/maps/TeamRocketBaseB1F.asm
  13196. @@ -3,7 +3,7 @@ TeamRocketBaseB1F_MapScriptHeader:
  13197.     db 1
  13198.  
  13199.     ; triggers
  13200.     dw UnknownScript_0x6c65a, $0000
  13201.  
  13202.  .MapCallbacks:
  13203.     db 1
  13204. @@ -233,7 +233,7 @@ TrainerCameraGrunt1:
  13205.     writetext CameraGrunt1SeenText
  13206.     closetext
  13207.     loadmovesprites
  13208.     winlosstext CameraGrunt1BeatenText, $0000
  13209.     setlasttalked $2
  13210.     loadtrainer GRUNTM, 20
  13211.     startbattle
  13212. @@ -246,7 +246,7 @@ TrainerCameraGrunt2:
  13213.     writetext CameraGrunt2SeenText
  13214.     closetext
  13215.     loadmovesprites
  13216.     winlosstext CameraGrunt2BeatenText, $0000
  13217.     setlasttalked $2
  13218.     loadtrainer GRUNTM, 21
  13219.     startbattle
  13220. @@ -478,7 +478,7 @@ NoExplodingTrap:
  13221.     end
  13222.  
  13223.  TrainerScientistJed:
  13224.     trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, $0000, ScientistJedScript
  13225.  
  13226.  ScientistJedScript:
  13227.     talkaftercancel
  13228. @@ -489,7 +489,7 @@ ScientistJedScript:
  13229.     end
  13230.  
  13231.  TrainerGruntM16:
  13232.     trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, $0000, GruntM16Script
  13233.  
  13234.  GruntM16Script:
  13235.     talkaftercancel
  13236. @@ -786,9 +786,9 @@ TeamRocketBaseB1F_MapEventHeader:
  13237.  
  13238.  .PersonEvents:
  13239.     db 6
  13240. -   person_event SPRITE_ROCKET, 0, 0, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
  13241. -   person_event SPRITE_ROCKET, 4, 2, $9, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
  13242. -   person_event SPRITE_SCIENTIST, 12, 18, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
  13243. -   person_event SPRITE_POKE_BALL, 6, 27, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
  13244. -   person_event SPRITE_POKE_BALL, 15, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
  13245. -   person_event SPRITE_POKE_BALL, 12, 21, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
  13246. +   person_event SPRITE_ROCKET, 0, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
  13247. +   person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
  13248. +   person_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
  13249. +   person_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
  13250. +   person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
  13251. +   person_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
  13252. diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
  13253. index b6363cb..5cb4c58 100644
  13254. --- a/maps/TeamRocketBaseB2F.asm
  13255. +++ b/maps/TeamRocketBaseB2F.asm
  13256. @@ -3,10 +3,10 @@ TeamRocketBaseB2F_MapScriptHeader:
  13257.     db 4
  13258.  
  13259.     ; triggers
  13260.     dw UnknownScript_0x6cf85, $0000
  13261.     dw UnknownScript_0x6cf86, $0000
  13262.     dw UnknownScript_0x6cf87, $0000
  13263.     dw UnknownScript_0x6cf88, $0000
  13264.  
  13265.  .MapCallbacks:
  13266.     db 1
  13267. @@ -84,7 +84,7 @@ UnknownScript_0x6cfac:
  13268.     loadmovesprites
  13269.     applymovement $2, MovementData_0x6d24a
  13270.     applymovement $3, MovementData_0x6d248
  13271.     winlosstext UnknownText_0x6d45c, $0000
  13272.     setlasttalked $3
  13273.     loadtrainer EXECUTIVEF, 2
  13274.     startbattle
  13275. @@ -178,7 +178,7 @@ UnknownScript_0x6d0be:
  13276.     end
  13277.  
  13278.  TrainerGruntM17:
  13279.     trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, $0000, GruntM17Script
  13280.  
  13281.  GruntM17Script:
  13282.     talkaftercancel
  13283. @@ -189,7 +189,7 @@ GruntM17Script:
  13284.     end
  13285.  
  13286.  TrainerGruntM18:
  13287.     trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, $0000, GruntM18Script
  13288.  
  13289.  GruntM18Script:
  13290.     talkaftercancel
  13291. @@ -200,7 +200,7 @@ GruntM18Script:
  13292.     end
  13293.  
  13294.  TrainerGruntM19:
  13295.     trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, $0000, GruntM19Script
  13296.  
  13297.  GruntM19Script:
  13298.     talkaftercancel
  13299. @@ -952,17 +952,17 @@ TeamRocketBaseB2F_MapEventHeader:
  13300.  
  13301.  .PersonEvents:
  13302.     db 14
  13303. -   person_event SPRITE_ROCKET, 16, 20, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
  13304. -   person_event SPRITE_ROCKET_GIRL, 16, 20, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
  13305. -   person_event SPRITE_LANCE, 13, 5, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
  13306. -   person_event SPRITE_DRAGON, 13, 9, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
  13307. -   person_event SPRITE_VOLTORB, 5, 7, $16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d101, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
  13308. -   person_event SPRITE_VOLTORB, 7, 7, $16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d12c, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
  13309. -   person_event SPRITE_VOLTORB, 9, 7, $16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d157, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
  13310. -   person_event SPRITE_VOLTORB, 5, 22, $16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
  13311. -   person_event SPRITE_VOLTORB, 7, 22, $16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
  13312. -   person_event SPRITE_VOLTORB, 9, 22, $16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
  13313. -   person_event SPRITE_ROCKET, 13, 25, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
  13314. -   person_event SPRITE_ROCKET, 1, 4, $a, 0, 0, -1, -1, 0, 2, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
  13315. -   person_event SPRITE_ROCKET, 14, 21, $8, 0, 0, -1, -1, 0, 2, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
  13316. -   person_event SPRITE_POKE_BALL, 10, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6d20d, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
  13317. +   person_event SPRITE_ROCKET, 16, 20, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
  13318. +   person_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
  13319. +   person_event SPRITE_LANCE, 13, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
  13320. +   person_event SPRITE_DRAGON, 13, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
  13321. +   person_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d101, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
  13322. +   person_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d12c, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
  13323. +   person_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d157, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
  13324. +   person_event SPRITE_VOLTORB, 5, 22, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
  13325. +   person_event SPRITE_VOLTORB, 7, 22, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
  13326. +   person_event SPRITE_VOLTORB, 9, 22, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
  13327. +   person_event SPRITE_ROCKET, 13, 25, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
  13328. +   person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, 0, 2, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
  13329. +   person_event SPRITE_ROCKET, 14, 21, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 2, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
  13330. +   person_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6d20d, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
  13331. diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
  13332. index 91b2a83..aed71a2 100644
  13333. --- a/maps/TeamRocketBaseB3F.asm
  13334. +++ b/maps/TeamRocketBaseB3F.asm
  13335. @@ -3,10 +3,10 @@ TeamRocketBaseB3F_MapScriptHeader:
  13336.     db 4
  13337.  
  13338.     ; triggers
  13339.     dw .Trigger1, $0000
  13340.     dw .Trigger2, $0000
  13341.     dw .Trigger3, $0000
  13342.     dw .Trigger4, $0000
  13343.  
  13344.  .MapCallbacks:
  13345.     db 1
  13346. @@ -91,7 +91,7 @@ UnknownScript_0x6e056:
  13347.     closetext
  13348.     loadmovesprites
  13349.     applymovement $3, MovementData_0x6e142
  13350.     winlosstext UnknownText_0x6e511, $0000
  13351.     setlasttalked $3
  13352.     loadtrainer EXECUTIVEM, 4
  13353.     startbattle
  13354. @@ -117,7 +117,7 @@ MoltresScript_0x6e091:
  13355.     end
  13356.  
  13357.  TrainerGruntF5:
  13358.     trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, $0000, GruntF5Script
  13359.  
  13360.  GruntF5Script:
  13361.     talkaftercancel
  13362. @@ -129,7 +129,7 @@ GruntF5Script:
  13363.     end
  13364.  
  13365.  TrainerGruntM28:
  13366.     trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, $0000, GruntM28Script
  13367.  
  13368.  GruntM28Script:
  13369.     talkaftercancel
  13370. @@ -141,7 +141,7 @@ GruntM28Script:
  13371.     end
  13372.  
  13373.  TrainerScientistRoss:
  13374.     trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, $0000, ScientistRossScript
  13375.  
  13376.  ScientistRossScript:
  13377.     talkaftercancel
  13378. @@ -152,7 +152,7 @@ ScientistRossScript:
  13379.     end
  13380.  
  13381.  TrainerScientistMitch:
  13382.     trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, $0000, ScientistMitchScript
  13383.  
  13384.  ScientistMitchScript:
  13385.     talkaftercancel
  13386. @@ -587,17 +587,17 @@ TeamRocketBaseB3F_MapEventHeader:
  13387.  
  13388.  .PersonEvents:
  13389.     db 14
  13390. -   person_event SPRITE_LANCE, 14, 25, $6, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
  13391. -   person_event SPRITE_ROCKET, 3, 8, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
  13392. -   person_event SPRITE_MOLTRES, 2, 7, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MoltresScript_0x6e091, EVENT_TEAM_ROCKET_BASE_POPULATION
  13393. -   person_event SPRITE_ROCKET_GIRL, 7, 21, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerGruntF5, EVENT_TEAM_ROCKET_BASE_POPULATION
  13394. -   person_event SPRITE_ROCKET, 14, 5, $a, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM28, EVENT_TEAM_ROCKET_BASE_POPULATION
  13395. -   person_event SPRITE_SCIENTIST, 11, 23, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION
  13396. -   person_event SPRITE_SCIENTIST, 15, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
  13397. -   person_event SPRITE_ROCKET, 14, 24, $6, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION
  13398. -   person_event SPRITE_SILVER, 5, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
  13399. -   person_event SPRITE_POKE_BALL, 12, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
  13400. -   person_event SPRITE_POKE_BALL, 12, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e122, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
  13401. -   person_event SPRITE_POKE_BALL, 9, 28, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e124, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
  13402. -   person_event SPRITE_POKE_BALL, 2, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e126, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
  13403. -   person_event SPRITE_POKE_BALL, 10, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e128, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
  13404. +   person_event SPRITE_LANCE, 14, 25, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
  13405. +   person_event SPRITE_ROCKET, 3, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
  13406. +   person_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MoltresScript_0x6e091, EVENT_TEAM_ROCKET_BASE_POPULATION
  13407. +   person_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerGruntF5, EVENT_TEAM_ROCKET_BASE_POPULATION
  13408. +   person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM28, EVENT_TEAM_ROCKET_BASE_POPULATION
  13409. +   person_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION
  13410. +   person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
  13411. +   person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION
  13412. +   person_event SPRITE_SILVER, 5, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
  13413. +   person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
  13414. +   person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e122, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
  13415. +   person_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e124, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
  13416. +   person_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e126, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
  13417. +   person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e128, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
  13418. diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
  13419. index c568f3f..3231514 100644
  13420. --- a/maps/TimeCapsule.asm
  13421. +++ b/maps/TimeCapsule.asm
  13422. @@ -3,8 +3,8 @@ TimeCapsule_MapScriptHeader:
  13423.     db 2
  13424.  
  13425.     ; triggers
  13426.     dw .Trigger1, $0000
  13427.     dw .Trigger2, $0000
  13428.  
  13429.  .MapCallbacks:
  13430.     db 1
  13431. @@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader:
  13432.  
  13433.  .PersonEvents:
  13434.     db 2
  13435. -   person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
  13436. -   person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT
  13437. +   person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
  13438. +   person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT
  13439. diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
  13440. index f9bd586..a8b8e2b 100644
  13441. --- a/maps/TinTower1F.asm
  13442. +++ b/maps/TinTower1F.asm
  13443. @@ -3,8 +3,8 @@ TinTower1F_MapScriptHeader:
  13444.     db 2
  13445.  
  13446.     ; triggers
  13447.     dw UnknownScript_0x18502a, $0000
  13448.     dw UnknownScript_0x18502e, $0000
  13449.  
  13450.  .MapCallbacks:
  13451.     db 2
  13452. @@ -534,13 +534,13 @@ TinTower1F_MapEventHeader:
  13453.  
  13454.  .PersonEvents:
  13455.     db 10
  13456. -   person_event SPRITE_SUICUNE, 9, 9, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
  13457. -   person_event SPRITE_RAIKOU, 9, 7, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
  13458. -   person_event SPRITE_ENTEI, 9, 12, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
  13459. -   person_event SPRITE_SUPER_NERD, 3, 8, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x1851c8, EVENT_TIN_TOWER_1F_EUSINE
  13460. -   person_event SPRITE_SAGE, 9, 5, $3, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13461. -   person_event SPRITE_SAGE, 11, 11, $3, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13462. -   person_event SPRITE_SAGE, 6, 14, $3, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13463. -   person_event SPRITE_SAGE, 2, 4, $4, 1, 0, -1, -1, 0, 0, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13464. -   person_event SPRITE_SAGE, 1, 9, $6, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13465. -   person_event SPRITE_SAGE, 2, 14, $5, 0, 1, -1, -1, 0, 0, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13466. +   person_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
  13467. +   person_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
  13468. +   person_event SPRITE_ENTEI, 9, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
  13469. +   person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x1851c8, EVENT_TIN_TOWER_1F_EUSINE
  13470. +   person_event SPRITE_SAGE, 9, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13471. +   person_event SPRITE_SAGE, 11, 11, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13472. +   person_event SPRITE_SAGE, 6, 14, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13473. +   person_event SPRITE_SAGE, 2, 4, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13474. +   person_event SPRITE_SAGE, 1, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13475. +   person_event SPRITE_SAGE, 2, 14, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13476. diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
  13477. index 308dac3..5644439 100644
  13478. --- a/maps/TinTower3F.asm
  13479. +++ b/maps/TinTower3F.asm
  13480. @@ -25,4 +25,4 @@ TinTower3F_MapEventHeader:
  13481.  
  13482.  .PersonEvents:
  13483.     db 1
  13484. -   person_event SPRITE_POKE_BALL, 14, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL
  13485. +   person_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL
  13486. diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
  13487. index 9532ad7..ccecac1 100644
  13488. --- a/maps/TinTower4F.asm
  13489. +++ b/maps/TinTower4F.asm
  13490. @@ -38,6 +38,6 @@ TinTower4F_MapEventHeader:
  13491.  
  13492.  .PersonEvents:
  13493.     db 3
  13494. -   person_event SPRITE_POKE_BALL, 10, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL
  13495. -   person_event SPRITE_POKE_BALL, 14, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP
  13496. -   person_event SPRITE_POKE_BALL, 12, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
  13497. +   person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL
  13498. +   person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP
  13499. +   person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
  13500. diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
  13501. index 1425010..ea77e81 100644
  13502. --- a/maps/TinTower5F.asm
  13503. +++ b/maps/TinTower5F.asm
  13504. @@ -37,4 +37,4 @@ TinTower5F_MapEventHeader:
  13505.  
  13506.  .PersonEvents:
  13507.     db 1
  13508. -   person_event SPRITE_POKE_BALL, 9, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY
  13509. +   person_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY
  13510. diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
  13511. index 3084eea..6ba2c0e 100644
  13512. --- a/maps/TinTower6F.asm
  13513. +++ b/maps/TinTower6F.asm
  13514. @@ -25,4 +25,4 @@ TinTower6F_MapEventHeader:
  13515.  
  13516.  .PersonEvents:
  13517.     db 1
  13518. -   person_event SPRITE_POKE_BALL, 8, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION
  13519. +   person_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION
  13520. diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
  13521. index 868539f..a38a182 100644
  13522. --- a/maps/TinTower7F.asm
  13523. +++ b/maps/TinTower7F.asm
  13524. @@ -28,4 +28,4 @@ TinTower7F_MapEventHeader:
  13525.  
  13526.  .PersonEvents:
  13527.     db 1
  13528. -   person_event SPRITE_POKE_BALL, 1, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE
  13529. +   person_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE
  13530. diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
  13531. index 59cce2a..3dfff24 100644
  13532. --- a/maps/TinTower8F.asm
  13533. +++ b/maps/TinTower8F.asm
  13534. @@ -35,6 +35,6 @@ TinTower8F_MapEventHeader:
  13535.  
  13536.  .PersonEvents:
  13537.     db 3
  13538. -   person_event SPRITE_POKE_BALL, 13, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET
  13539. -   person_event SPRITE_POKE_BALL, 6, 11, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER
  13540. -   person_event SPRITE_POKE_BALL, 1, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE
  13541. +   person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET
  13542. +   person_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER
  13543. +   person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE
  13544. diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
  13545. index c76deab..d2ee20e 100644
  13546. --- a/maps/TinTower9F.asm
  13547. +++ b/maps/TinTower9F.asm
  13548. @@ -38,4 +38,4 @@ TinTower9F_MapEventHeader:
  13549.  
  13550.  .PersonEvents:
  13551.     db 1
  13552. -   person_event SPRITE_POKE_BALL, 1, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP
  13553. +   person_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP
  13554. diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
  13555. index f9aaa2f..705c8e7 100644
  13556. --- a/maps/TinTowerRoof.asm
  13557. +++ b/maps/TinTowerRoof.asm
  13558. @@ -60,4 +60,4 @@ TinTowerRoof_MapEventHeader:
  13559.  
  13560.  .PersonEvents:
  13561.     db 1
  13562. -   person_event SPRITE_HO_OH, 5, 9, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, HoOhScript_0x77244, EVENT_TIN_TOWER_ROOF_HO_OH
  13563. +   person_event SPRITE_HO_OH, 5, 9, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, HoOhScript_0x77244, EVENT_TIN_TOWER_ROOF_HO_OH
  13564. diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
  13565. index 7d6cc15..1c9db6c 100644
  13566. --- a/maps/TohjoFalls.asm
  13567. +++ b/maps/TohjoFalls.asm
  13568. @@ -25,4 +25,4 @@ TohjoFalls_MapEventHeader:
  13569.  
  13570.  .PersonEvents:
  13571.     db 1
  13572. -   person_event SPRITE_POKE_BALL, 6, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE
  13573. +   person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE
  13574. diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
  13575. index 8df21cb..38a9d2a 100644
  13576. --- a/maps/TradeCenter.asm
  13577. +++ b/maps/TradeCenter.asm
  13578. @@ -3,8 +3,8 @@ TradeCenter_MapScriptHeader:
  13579.     db 2
  13580.  
  13581.     ; triggers
  13582.     dw .Trigger1, $0000
  13583.     dw .Trigger2, $0000
  13584.  
  13585.  .MapCallbacks:
  13586.     db 1
  13587. @@ -73,5 +73,5 @@ TradeCenter_MapEventHeader:
  13588.  
  13589.  .PersonEvents:
  13590.     db 2
  13591. -   person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
  13592. -   person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
  13593. +   person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
  13594. +   person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
  13595. diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
  13596. index fbed606..a12748a 100644
  13597. --- a/maps/TrainerHouse1F.asm
  13598. +++ b/maps/TrainerHouse1F.asm
  13599. @@ -151,8 +151,8 @@ TrainerHouse1F_MapEventHeader:
  13600.  
  13601.  .PersonEvents:
  13602.     db 5
  13603. -   person_event SPRITE_RECEPTIONIST, 11, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x9af67, -1
  13604. -   person_event SPRITE_COOLTRAINER_M, 11, 7, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x9af6a, -1
  13605. -   person_event SPRITE_COOLTRAINER_F, 2, 6, $6, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9af6d, -1
  13606. -   person_event SPRITE_YOUNGSTER, 8, 4, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x9af70, -1
  13607. -   person_event SPRITE_GENTLEMAN, 4, 2, $9, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x9af73, -1
  13608. +   person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x9af67, -1
  13609. +   person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x9af6a, -1
  13610. +   person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEFN_06, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9af6d, -1
  13611. +   person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x9af70, -1
  13612. +   person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x9af73, -1
  13613. diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
  13614. index 7f58cdf..9f4136c 100644
  13615. --- a/maps/TrainerHouseB1F.asm
  13616. +++ b/maps/TrainerHouseB1F.asm
  13617. @@ -3,7 +3,7 @@ TrainerHouseB1F_MapScriptHeader:
  13618.     db 1
  13619.  
  13620.     ; triggers
  13621.     dw UnknownScript_0x9b38a, $0000
  13622.  
  13623.  .MapCallbacks:
  13624.     db 0
  13625. @@ -42,14 +42,14 @@ UnknownScript_0x9b3aa:
  13626.     loadmovesprites
  13627.     special SpecialTrainerHouse
  13628.     iffalse UnknownScript_0x9b3dc
  13629.     winlosstext UnknownText_0x9b578, $0000
  13630.     setlasttalked $3
  13631.     loadtrainer CAL, CAL2
  13632.     startbattle
  13633.     returnafterbattle
  13634.     iffalse UnknownScript_0x9b3e8
  13635.  UnknownScript_0x9b3dc:
  13636.     winlosstext UnknownText_0x9b578, $0000
  13637.     setlasttalked $3
  13638.     loadtrainer CAL, CAL3
  13639.     startbattle
  13640. @@ -184,5 +184,5 @@ TrainerHouseB1F_MapEventHeader:
  13641.  
  13642.  .PersonEvents:
  13643.     db 2
  13644. -   person_event SPRITE_RECEPTIONIST, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
  13645. -   person_event SPRITE_CHRIS, 11, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, -1
  13646. +   person_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
  13647. +   person_event SPRITE_CHRIS, 11, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, -1
  13648. diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm
  13649. index 63222b8..f826534 100644
  13650. --- a/maps/UndergroundPathSwitchRoomEntrances.asm
  13651. +++ b/maps/UndergroundPathSwitchRoomEntrances.asm
  13652. @@ -3,8 +3,8 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader:
  13653.     db 2
  13654.  
  13655.     ; triggers
  13656.     dw UnknownScript_0x7c9f5, $0000
  13657.     dw UnknownScript_0x7c9f6, $0000
  13658.  
  13659.  .MapCallbacks:
  13660.     db 1
  13661. @@ -166,7 +166,7 @@ UnknownScript_0x7cb29:
  13662.     end
  13663.  
  13664.  TrainerGruntM11:
  13665.     trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, $0000, GruntM11Script
  13666.  
  13667.  GruntM11Script:
  13668.     talkaftercancel
  13669. @@ -177,7 +177,7 @@ GruntM11Script:
  13670.     end
  13671.  
  13672.  TrainerGruntM25:
  13673.     trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, $0000, GruntM25Script
  13674.  
  13675.  GruntM25Script:
  13676.     talkaftercancel
  13677. @@ -188,7 +188,7 @@ GruntM25Script:
  13678.     end
  13679.  
  13680.  TrainerBurglarDuncan:
  13681.     trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, $0000, BurglarDuncanScript
  13682.  
  13683.  BurglarDuncanScript:
  13684.     talkaftercancel
  13685. @@ -199,7 +199,7 @@ BurglarDuncanScript:
  13686.     end
  13687.  
  13688.  TrainerBurglarEddie:
  13689.     trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, $0000, BurglarEddieScript
  13690.  
  13691.  BurglarEddieScript:
  13692.     talkaftercancel
  13693. @@ -210,7 +210,7 @@ BurglarEddieScript:
  13694.     end
  13695.  
  13696.  TrainerGruntM13:
  13697.     trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, $0000, GruntM13Script
  13698.  
  13699.  GruntM13Script:
  13700.     talkaftercancel
  13701. @@ -221,7 +221,7 @@ GruntM13Script:
  13702.     end
  13703.  
  13704.  TrainerGruntF3:
  13705.     trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, $0000, GruntF3Script
  13706.  
  13707.  GruntF3Script:
  13708.     talkaftercancel
  13709. @@ -923,14 +923,14 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
  13710.  
  13711.  .PersonEvents:
  13712.     db 11
  13713. -   person_event SPRITE_PHARMACIST, 12, 9, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13714. -   person_event SPRITE_PHARMACIST, 8, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13715. -   person_event SPRITE_ROCKET, 2, 17, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13716. -   person_event SPRITE_ROCKET, 2, 11, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13717. -   person_event SPRITE_ROCKET, 2, 3, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13718. -   person_event SPRITE_ROCKET_GIRL, 12, 19, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13719. -   person_event SPRITE_TEACHER, 27, 3, $6, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x7ca7d, -1
  13720. -   person_event SPRITE_SUPER_NERD, 27, 19, $6, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7ca7a, -1
  13721. -   person_event SPRITE_POKE_BALL, 12, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ce7d, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
  13722. -   person_event SPRITE_POKE_BALL, 9, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ce7f, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL
  13723. -   person_event SPRITE_SILVER, 3, 23, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH
  13724. +   person_event SPRITE_PHARMACIST, 12, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13725. +   person_event SPRITE_PHARMACIST, 8, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13726. +   person_event SPRITE_ROCKET, 2, 17, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13727. +   person_event SPRITE_ROCKET, 2, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13728. +   person_event SPRITE_ROCKET, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13729. +   person_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13730. +   person_event SPRITE_TEACHER, 27, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x7ca7d, -1
  13731. +   person_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7ca7a, -1
  13732. +   person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ce7d, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
  13733. +   person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ce7f, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL
  13734. +   person_event SPRITE_SILVER, 3, 23, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH
  13735. diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm
  13736. index 3f73eed..53aa2c0 100644
  13737. --- a/maps/UndergroundWarehouse.asm
  13738. +++ b/maps/UndergroundWarehouse.asm
  13739. @@ -30,7 +30,7 @@ UndergroundWarehouse_MapScriptHeader:
  13740.     return
  13741.  
  13742.  TrainerGruntM24:
  13743.     trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, $0000, GruntM24Script
  13744.  
  13745.  GruntM24Script:
  13746.     talkaftercancel
  13747. @@ -41,7 +41,7 @@ GruntM24Script:
  13748.     end
  13749.  
  13750.  TrainerGruntM14:
  13751.     trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, $0000, GruntM14Script
  13752.  
  13753.  GruntM14Script:
  13754.     talkaftercancel
  13755. @@ -52,7 +52,7 @@ GruntM14Script:
  13756.     end
  13757.  
  13758.  TrainerGruntM15:
  13759.     trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, $0000, GruntM15Script
  13760.  
  13761.  GruntM15Script:
  13762.     talkaftercancel
  13763. @@ -222,10 +222,10 @@ UndergroundWarehouse_MapEventHeader:
  13764.  
  13765.  .PersonEvents:
  13766.     db 7
  13767. -   person_event SPRITE_ROCKET, 8, 9, $7, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13768. -   person_event SPRITE_ROCKET, 15, 8, $7, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13769. -   person_event SPRITE_ROCKET, 3, 14, $9, 0, 0, -1, -1, 0, 2, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13770. -   person_event SPRITE_GENTLEMAN, 8, 12, $3, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13771. -   person_event SPRITE_POKE_BALL, 15, 18, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
  13772. -   person_event SPRITE_POKE_BALL, 9, 13, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
  13773. -   person_event SPRITE_POKE_BALL, 1, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
  13774. +   person_event SPRITE_ROCKET, 8, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13775. +   person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13776. +   person_event SPRITE_ROCKET, 3, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 2, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13777. +   person_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13778. +   person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
  13779. +   person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
  13780. +   person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
  13781. diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
  13782. index d663d2f..f5f9baa 100644
  13783. --- a/maps/UnionCave1F.asm
  13784. +++ b/maps/UnionCave1F.asm
  13785. @@ -6,7 +6,7 @@ UnionCave1F_MapScriptHeader:
  13786.     db 0
  13787.  
  13788.  TrainerPokemaniacLarry:
  13789.     trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, $0000, PokemaniacLarryScript
  13790.  
  13791.  PokemaniacLarryScript:
  13792.     talkaftercancel
  13793. @@ -17,7 +17,7 @@ PokemaniacLarryScript:
  13794.     end
  13795.  
  13796.  TrainerHikerRussell:
  13797.     trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, $0000, HikerRussellScript
  13798.  
  13799.  HikerRussellScript:
  13800.     talkaftercancel
  13801. @@ -28,7 +28,7 @@ HikerRussellScript:
  13802.     end
  13803.  
  13804.  TrainerHikerDaniel:
  13805.     trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, $0000, HikerDanielScript
  13806.  
  13807.  HikerDanielScript:
  13808.     talkaftercancel
  13809. @@ -39,7 +39,7 @@ HikerDanielScript:
  13810.     end
  13811.  
  13812.  TrainerFirebreatherBill:
  13813.     trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, $0000, FirebreatherBillScript
  13814.  
  13815.  FirebreatherBillScript:
  13816.     talkaftercancel
  13817. @@ -50,7 +50,7 @@ FirebreatherBillScript:
  13818.     end
  13819.  
  13820.  TrainerFirebreatherRay:
  13821.     trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, $0000, FirebreatherRayScript
  13822.  
  13823.  FirebreatherRayScript:
  13824.     talkaftercancel
  13825. @@ -207,12 +207,12 @@ UnionCave1F_MapEventHeader:
  13826.  
  13827.  .PersonEvents:
  13828.     db 9
  13829. -   person_event SPRITE_POKEFAN_M, 6, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerDaniel, -1
  13830. -   person_event SPRITE_SUPER_NERD, 21, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacLarry, -1
  13831. -   person_event SPRITE_POKEFAN_M, 8, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerRussell, -1
  13832. -   person_event SPRITE_FISHER, 27, 15, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerFirebreatherRay, -1
  13833. -   person_event SPRITE_FISHER, 19, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerFirebreatherBill, -1
  13834. -   person_event SPRITE_POKE_BALL, 21, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL
  13835. -   person_event SPRITE_POKE_BALL, 2, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK
  13836. -   person_event SPRITE_POKE_BALL, 17, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION
  13837. -   person_event SPRITE_POKE_BALL, 33, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING
  13838. +   person_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerDaniel, -1
  13839. +   person_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacLarry, -1
  13840. +   person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerRussell, -1
  13841. +   person_event SPRITE_FISHER, 27, 15, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerFirebreatherRay, -1
  13842. +   person_event SPRITE_FISHER, 19, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerFirebreatherBill, -1
  13843. +   person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL
  13844. +   person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK
  13845. +   person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION
  13846. +   person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING
  13847. diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
  13848. index 44f6669..14439c8 100644
  13849. --- a/maps/UnionCaveB1F.asm
  13850. +++ b/maps/UnionCaveB1F.asm
  13851. @@ -6,7 +6,7 @@ UnionCaveB1F_MapScriptHeader:
  13852.     db 0
  13853.  
  13854.  TrainerPokemaniacAndrew:
  13855.     trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, $0000, PokemaniacAndrewScript
  13856.  
  13857.  PokemaniacAndrewScript:
  13858.     talkaftercancel
  13859. @@ -17,7 +17,7 @@ PokemaniacAndrewScript:
  13860.     end
  13861.  
  13862.  TrainerPokemaniacCalvin:
  13863.     trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, $0000, PokemaniacCalvinScript
  13864.  
  13865.  PokemaniacCalvinScript:
  13866.     talkaftercancel
  13867. @@ -28,7 +28,7 @@ PokemaniacCalvinScript:
  13868.     end
  13869.  
  13870.  TrainerHikerPhillip:
  13871.     trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, $0000, HikerPhillipScript
  13872.  
  13873.  HikerPhillipScript:
  13874.     talkaftercancel
  13875. @@ -39,7 +39,7 @@ HikerPhillipScript:
  13876.     end
  13877.  
  13878.  TrainerHikerLeonard:
  13879.     trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, $0000, HikerLeonardScript
  13880.  
  13881.  HikerLeonardScript:
  13882.     talkaftercancel
  13883. @@ -163,10 +163,10 @@ UnionCaveB1F_MapEventHeader:
  13884.  
  13885.  .PersonEvents:
  13886.     db 7
  13887. -   person_event SPRITE_POKEFAN_M, 4, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerPhillip, -1
  13888. -   person_event SPRITE_POKEFAN_M, 7, 16, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerLeonard, -1
  13889. -   person_event SPRITE_SUPER_NERD, 32, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacAndrew, -1
  13890. -   person_event SPRITE_SUPER_NERD, 30, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacCalvin, -1
  13891. -   person_event SPRITE_POKE_BALL, 16, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT
  13892. -   person_event SPRITE_BOULDER, 10, 7, $19, 0, 0, -1, -1, 0, 0, 0, UnionCaveB1FBoulder, -1
  13893. -   person_event SPRITE_POKE_BALL, 23, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND
  13894. +   person_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerPhillip, -1
  13895. +   person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerLeonard, -1
  13896. +   person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacAndrew, -1
  13897. +   person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacCalvin, -1
  13898. +   person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT
  13899. +   person_event SPRITE_BOULDER, 10, 7, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, UnionCaveB1FBoulder, -1
  13900. +   person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND
  13901. diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
  13902. index 34f0b61..bce92a4 100644
  13903. --- a/maps/UnionCaveB2F.asm
  13904. +++ b/maps/UnionCaveB2F.asm
  13905. @@ -33,7 +33,7 @@ SurfScript_0x5a31f:
  13906.     end
  13907.  
  13908.  TrainerCooltrainermNick:
  13909.     trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, $0000, CooltrainermNickScript
  13910.  
  13911.  CooltrainermNickScript:
  13912.     talkaftercancel
  13913. @@ -44,7 +44,7 @@ CooltrainermNickScript:
  13914.     end
  13915.  
  13916.  TrainerCooltrainerfGwen:
  13917.     trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, $0000, CooltrainerfGwenScript
  13918.  
  13919.  CooltrainerfGwenScript:
  13920.     talkaftercancel
  13921. @@ -55,7 +55,7 @@ CooltrainerfGwenScript:
  13922.     end
  13923.  
  13924.  TrainerCooltrainerfEmma:
  13925.     trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, $0000, CooltrainerfEmmaScript
  13926.  
  13927.  CooltrainerfEmmaScript:
  13928.     talkaftercancel
  13929. @@ -152,9 +152,9 @@ UnionCaveB2F_MapEventHeader:
  13930.  
  13931.  .PersonEvents:
  13932.     db 6
  13933. -   person_event SPRITE_ROCKER, 19, 15, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermNick, -1
  13934. -   person_event SPRITE_COOLTRAINER_F, 13, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfGwen, -1
  13935. -   person_event SPRITE_COOLTRAINER_F, 30, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfEmma, -1
  13936. -   person_event SPRITE_POKE_BALL, 2, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER
  13937. -   person_event SPRITE_POKE_BALL, 19, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION
  13938. -   person_event SPRITE_SURF, 31, 11, $24, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS
  13939. +   person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermNick, -1
  13940. +   person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfGwen, -1
  13941. +   person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfEmma, -1
  13942. +   person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER
  13943. +   person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION
  13944. +   person_event SPRITE_SURF, 31, 11, SPRITEMOVEFN_24, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS
  13945. diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
  13946. index aeb998a..9f965d9 100644
  13947. --- a/maps/VermilionCity.asm
  13948. +++ b/maps/VermilionCity.asm
  13949. @@ -294,9 +294,9 @@ VermilionCity_MapEventHeader:
  13950.  
  13951.  .PersonEvents:
  13952.     db 6
  13953. -   person_event SPRITE_TEACHER, 9, 18, $2, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x1aa983, -1
  13954. -   person_event SPRITE_GRAMPS, 6, 23, $9, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1aa986, -1
  13955. -   person_event SPRITE_MACHOP, 7, 26, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, VermilionMachop, -1
  13956. -   person_event SPRITE_SUPER_NERD, 16, 14, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x1aa99b, -1
  13957. -   person_event SPRITE_BIG_SNORLAX, 8, 34, $15, 0, 0, -1, -1, 0, 0, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
  13958. -   person_event SPRITE_POKEFAN_M, 12, 31, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, VermilionGymBadgeGuy, -1
  13959. +   person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x1aa983, -1
  13960. +   person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1aa986, -1
  13961. +   person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, VermilionMachop, -1
  13962. +   person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x1aa99b, -1
  13963. +   person_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEFN_15, 0, 0, -1, -1, 0, 0, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
  13964. +   person_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, VermilionGymBadgeGuy, -1
  13965. diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
  13966. index 911f1e6..bee3656 100644
  13967. --- a/maps/VermilionGym.asm
  13968. +++ b/maps/VermilionGym.asm
  13969. @@ -13,7 +13,7 @@ SurgeScript_0x1920a5:
  13970.     writetext UnknownText_0x192142
  13971.     closetext
  13972.     loadmovesprites
  13973.     winlosstext UnknownText_0x192238, $0000
  13974.     loadtrainer LT_SURGE, 1
  13975.     startbattle
  13976.     returnafterbattle
  13977. @@ -38,7 +38,7 @@ SurgeScript_0x1920a5:
  13978.     end
  13979.  
  13980.  TrainerGentlemanGregory:
  13981.     trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, $0000, GentlemanGregoryScript
  13982.  
  13983.  GentlemanGregoryScript:
  13984.     talkaftercancel
  13985. @@ -49,7 +49,7 @@ GentlemanGregoryScript:
  13986.     end
  13987.  
  13988.  TrainerGuitaristVincent:
  13989.     trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, $0000, GuitaristVincentScript
  13990.  
  13991.  GuitaristVincentScript:
  13992.     talkaftercancel
  13993. @@ -60,7 +60,7 @@ GuitaristVincentScript:
  13994.     end
  13995.  
  13996.  TrainerJugglerHorton:
  13997.     trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, $0000, JugglerHortonScript
  13998.  
  13999.  JugglerHortonScript:
  14000.     talkaftercancel
  14001. @@ -287,8 +287,8 @@ VermilionGym_MapEventHeader:
  14002.  
  14003.  .PersonEvents:
  14004.     db 5
  14005. -   person_event SPRITE_SURGE, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SurgeScript_0x1920a5, -1
  14006. -   person_event SPRITE_GENTLEMAN, 8, 8, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerGentlemanGregory, -1
  14007. -   person_event SPRITE_ROCKER, 7, 4, $6, 0, 3, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerGuitaristVincent, -1
  14008. -   person_event SPRITE_SUPER_NERD, 10, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerJugglerHorton, -1
  14009. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, VermilionGymGuyScript, -1
  14010. +   person_event SPRITE_SURGE, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SurgeScript_0x1920a5, -1
  14011. +   person_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerGentlemanGregory, -1
  14012. +   person_event SPRITE_ROCKER, 7, 4, SPRITEMOVEFN_06, 0, 3, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerGuitaristVincent, -1
  14013. +   person_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerJugglerHorton, -1
  14014. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, VermilionGymGuyScript, -1
  14015. diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
  14016. index 9aec5f3..e2f94d2 100644
  14017. --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
  14018. +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
  14019. @@ -34,4 +34,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader:
  14020.  
  14021.  .PersonEvents:
  14022.     db 1
  14023. -   person_event SPRITE_GENTLEMAN, 3, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x192031, -1
  14024. +   person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x192031, -1
  14025. diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm
  14026. index 0081bac..08f516f 100644
  14027. --- a/maps/VermilionHouseFishingSpeechHouse.asm
  14028. +++ b/maps/VermilionHouseFishingSpeechHouse.asm
  14029. @@ -65,4 +65,4 @@ VermilionHouseFishingSpeechHouse_MapEventHeader:
  14030.  
  14031.  .PersonEvents:
  14032.     db 1
  14033. -   person_event SPRITE_FISHING_GURU, 4, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingDude, -1
  14034. +   person_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingDude, -1
  14035. diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
  14036. index 6dbee12..3126726 100644
  14037. --- a/maps/VermilionMagnetTrainSpeechHouse.asm
  14038. +++ b/maps/VermilionMagnetTrainSpeechHouse.asm
  14039. @@ -48,5 +48,5 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader:
  14040.  
  14041.  .PersonEvents:
  14042.     db 2
  14043. -   person_event SPRITE_POKEFAN_F, 3, 2, $8, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x191eb7, -1
  14044. -   person_event SPRITE_YOUNGSTER, 3, 0, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x191eba, -1
  14045. +   person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x191eb7, -1
  14046. +   person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x191eba, -1
  14047. diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
  14048. index 21ea465..3070ce0 100644
  14049. --- a/maps/VermilionMart.asm
  14050. +++ b/maps/VermilionMart.asm
  14051. @@ -48,6 +48,6 @@ VermilionMart_MapEventHeader:
  14052.  
  14053.  .PersonEvents:
  14054.     db 3
  14055. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x191f7e, -1
  14056. -   person_event SPRITE_SUPER_NERD, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x191f85, -1
  14057. -   person_event SPRITE_BUENA, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x191f88, -1
  14058. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x191f7e, -1
  14059. +   person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x191f85, -1
  14060. +   person_event SPRITE_BUENA, 6, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x191f88, -1
  14061. diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm
  14062. index 428c85d..971ee27 100644
  14063. --- a/maps/VermilionPokeCenter1F.asm
  14064. +++ b/maps/VermilionPokeCenter1F.asm
  14065. @@ -88,7 +88,7 @@ VermilionPokeCenter1F_MapEventHeader:
  14066.  
  14067.  .PersonEvents:
  14068.     db 4
  14069. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x191603, -1
  14070. -   person_event SPRITE_FISHING_GURU, 2, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x191606, -1
  14071. -   person_event SPRITE_SAILOR, 5, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x19161a, -1
  14072. -   person_event SPRITE_BUG_CATCHER, 5, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x19161d, -1
  14073. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x191603, -1
  14074. +   person_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x191606, -1
  14075. +   person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x19161a, -1
  14076. +   person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x19161d, -1
  14077. diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
  14078. index 93543dc..0b9fcc1 100644
  14079. --- a/maps/VermilionPort.asm
  14080. +++ b/maps/VermilionPort.asm
  14081. @@ -3,8 +3,8 @@ VermilionPort_MapScriptHeader:
  14082.     db 2
  14083.  
  14084.     ; triggers
  14085.     dw .Trigger1, $0000
  14086.     dw .Trigger2, $0000
  14087.  
  14088.  .MapCallbacks:
  14089.     db 1
  14090. @@ -317,6 +317,6 @@ VermilionPort_MapEventHeader:
  14091.  
  14092.  .PersonEvents:
  14093.     db 3
  14094. -   person_event SPRITE_SAILOR, 17, 7, $7, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
  14095. -   person_event SPRITE_SAILOR, 11, 6, $9, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x74e97, -1
  14096. -   person_event SPRITE_SUPER_NERD, 11, 11, $5, 0, 2, -1, -1, 0, 0, 0, SuperNerdScript_0x74ee6, -1
  14097. +   person_event SPRITE_SAILOR, 17, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
  14098. +   person_event SPRITE_SAILOR, 11, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x74e97, -1
  14099. +   person_event SPRITE_SUPER_NERD, 11, 11, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, SuperNerdScript_0x74ee6, -1
  14100. diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
  14101. index 2910622..a00fd5c 100644
  14102. --- a/maps/VermilionPortPassage.asm
  14103. +++ b/maps/VermilionPortPassage.asm
  14104. @@ -35,4 +35,4 @@ VermilionPortPassage_MapEventHeader:
  14105.  
  14106.  .PersonEvents:
  14107.     db 1
  14108. -   person_event SPRITE_TEACHER, 1, 17, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x7701a, -1
  14109. +   person_event SPRITE_TEACHER, 1, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x7701a, -1
  14110. diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
  14111. index dbcfef7..b917d7a 100644
  14112. --- a/maps/VictoryRoad.asm
  14113. +++ b/maps/VictoryRoad.asm
  14114. @@ -3,8 +3,8 @@ VictoryRoad_MapScriptHeader:
  14115.     db 2
  14116.  
  14117.     ; triggers
  14118.     dw UnknownScript_0x74490, $0000
  14119.     dw UnknownScript_0x74491, $0000
  14120.  
  14121.  .MapCallbacks:
  14122.     db 0
  14123. @@ -263,9 +263,9 @@ VictoryRoad_MapEventHeader:
  14124.  
  14125.  .PersonEvents:
  14126.     db 6
  14127. -   person_event SPRITE_SILVER, 13, 18, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
  14128. -   person_event SPRITE_POKE_BALL, 28, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
  14129. -   person_event SPRITE_POKE_BALL, 48, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE
  14130. -   person_event SPRITE_POKE_BALL, 29, 18, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE
  14131. -   person_event SPRITE_POKE_BALL, 48, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL
  14132. -   person_event SPRITE_POKE_BALL, 38, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP
  14133. +   person_event SPRITE_SILVER, 13, 18, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
  14134. +   person_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
  14135. +   person_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE
  14136. +   person_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE
  14137. +   person_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL
  14138. +   person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP
  14139. diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
  14140. index 8562ccf..6fc0843 100644
  14141. --- a/maps/VictoryRoadGate.asm
  14142. +++ b/maps/VictoryRoadGate.asm
  14143. @@ -3,8 +3,8 @@ VictoryRoadGate_MapScriptHeader:
  14144.     db 2
  14145.  
  14146.     ; triggers
  14147.     dw UnknownScript_0x9b9fb, $0000
  14148.     dw UnknownScript_0x9b9fc, $0000
  14149.  
  14150.  .MapCallbacks:
  14151.     db 0
  14152. @@ -118,6 +118,6 @@ VictoryRoadGate_MapEventHeader:
  14153.  
  14154.  .PersonEvents:
  14155.     db 3
  14156. -   person_event SPRITE_OFFICER, 11, 8, $9, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x9ba03, -1
  14157. -   person_event SPRITE_BLACK_BELT, 5, 7, $9, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER
  14158. -   person_event SPRITE_BLACK_BELT, 5, 12, $8, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX
  14159. +   person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x9ba03, -1
  14160. +   person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER
  14161. +   person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX
  14162. diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
  14163. index 18207d9..1e6ff89 100644
  14164. --- a/maps/VioletCity.asm
  14165. +++ b/maps/VioletCity.asm
  14166. @@ -301,11 +301,11 @@ VioletCity_MapEventHeader:
  14167.  
  14168.  .PersonEvents:
  14169.     db 8
  14170. -   person_event SPRITE_FISHER, 16, 13, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a83bb, EVENT_VIOLET_CITY_EARL
  14171. -   person_event SPRITE_LASS, 28, 28, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x1a8403, -1
  14172. -   person_event SPRITE_SUPER_NERD, 14, 24, $2, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a8406, -1
  14173. -   person_event SPRITE_GRAMPS, 20, 17, $5, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a8409, -1
  14174. -   person_event SPRITE_YOUNGSTER, 18, 5, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a840c, -1
  14175. -   person_event SPRITE_FRUIT_TREE, 29, 14, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8425, -1
  14176. -   person_event SPRITE_POKE_BALL, 1, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP
  14177. -   person_event SPRITE_POKE_BALL, 5, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY
  14178. +   person_event SPRITE_FISHER, 16, 13, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a83bb, EVENT_VIOLET_CITY_EARL
  14179. +   person_event SPRITE_LASS, 28, 28, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x1a8403, -1
  14180. +   person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEFN_02, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a8406, -1
  14181. +   person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a8409, -1
  14182. +   person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a840c, -1
  14183. +   person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8425, -1
  14184. +   person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP
  14185. +   person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY
  14186. diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
  14187. index a3b0515..4654f1f 100644
  14188. --- a/maps/VioletGym.asm
  14189. +++ b/maps/VioletGym.asm
  14190. @@ -13,7 +13,7 @@ FalknerScript_0x683c2:
  14191.     writetext UnknownText_0x68473
  14192.     closetext
  14193.     loadmovesprites
  14194.     winlosstext UnknownText_0x6854a, $0000
  14195.     loadtrainer FALKNER, 1
  14196.     startbattle
  14197.     returnafterbattle
  14198. @@ -61,7 +61,7 @@ VioletGymTriggerRockets:
  14199.     jumpstd radiotowerrockets
  14200.  
  14201.  TrainerBird_keeperRod:
  14202.     trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, $0000, Bird_keeperRodScript
  14203.  
  14204.  Bird_keeperRodScript:
  14205.     talkaftercancel
  14206. @@ -72,7 +72,7 @@ Bird_keeperRodScript:
  14207.     end
  14208.  
  14209.  TrainerBird_keeperAbe:
  14210.     trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, $0000, Bird_keeperAbeScript
  14211.  
  14212.  Bird_keeperAbeScript:
  14213.     talkaftercancel
  14214. @@ -294,7 +294,7 @@ VioletGym_MapEventHeader:
  14215.  
  14216.  .PersonEvents:
  14217.     db 4
  14218. -   person_event SPRITE_FALKNER, 1, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FalknerScript_0x683c2, -1
  14219. -   person_event SPRITE_YOUNGSTER, 6, 7, $8, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperRod, -1
  14220. -   person_event SPRITE_YOUNGSTER, 10, 2, $9, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperAbe, -1
  14221. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, VioletGymGuyScript, -1
  14222. +   person_event SPRITE_FALKNER, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FalknerScript_0x683c2, -1
  14223. +   person_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEFN_08, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperRod, -1
  14224. +   person_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEFN_09, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperAbe, -1
  14225. +   person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, VioletGymGuyScript, -1
  14226. diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
  14227. index cd878e8..1c63cae 100644
  14228. --- a/maps/VioletMart.asm
  14229. +++ b/maps/VioletMart.asm
  14230. @@ -60,6 +60,6 @@ VioletMart_MapEventHeader:
  14231.  
  14232.  .PersonEvents:
  14233.     db 3
  14234. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x68295, -1
  14235. -   person_event SPRITE_GRANNY, 6, 7, $5, 0, 1, -1, -1, 0, 0, 0, GrannyScript_0x6829c, -1
  14236. -   person_event SPRITE_COOLTRAINER_M, 2, 5, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x6829f, -1
  14237. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x68295, -1
  14238. +   person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GrannyScript_0x6829c, -1
  14239. +   person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x6829f, -1
  14240. diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
  14241. index 5447e30..232dca2 100644
  14242. --- a/maps/VioletNicknameSpeechHouse.asm
  14243. +++ b/maps/VioletNicknameSpeechHouse.asm
  14244. @@ -56,6 +56,6 @@ VioletNicknameSpeechHouse_MapEventHeader:
  14245.  
  14246.  .PersonEvents:
  14247.     db 3
  14248. -   person_event SPRITE_TEACHER, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x693e9, -1
  14249. -   person_event SPRITE_LASS, 4, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x693ec, -1
  14250. -   person_event SPRITE_BIRD, 2, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BirdScript_0x693ef, -1
  14251. +   person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x693e9, -1
  14252. +   person_event SPRITE_LASS, 4, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x693ec, -1
  14253. +   person_event SPRITE_BIRD, 2, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BirdScript_0x693ef, -1
  14254. diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm
  14255. index 134c561..cef27de 100644
  14256. --- a/maps/VioletOnixTradeHouse.asm
  14257. +++ b/maps/VioletOnixTradeHouse.asm
  14258. @@ -45,5 +45,5 @@ VioletOnixTradeHouse_MapEventHeader:
  14259.  
  14260.  .PersonEvents:
  14261.     db 2
  14262. -   person_event SPRITE_POKEFAN_M, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x6998d, -1
  14263. -   person_event SPRITE_YOUNGSTER, 5, 6, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x69990, -1
  14264. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x6998d, -1
  14265. +   person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x69990, -1
  14266. diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm
  14267. index 3172efb..253c6b5 100644
  14268. --- a/maps/VioletPokeCenter1F.asm
  14269. +++ b/maps/VioletPokeCenter1F.asm
  14270. @@ -226,8 +226,8 @@ VioletPokeCenter1F_MapEventHeader:
  14271.  
  14272.  .PersonEvents:
  14273.     db 5
  14274. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x694c9, -1
  14275. -   person_event SPRITE_GAMEBOY_KID, 6, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GameboyKidScript_0x69540, -1
  14276. -   person_event SPRITE_GENTLEMAN, 4, 1, $3, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x69543, -1
  14277. -   person_event SPRITE_YOUNGSTER, 1, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x69546, -1
  14278. -   person_event SPRITE_SCIENTIST, 3, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
  14279. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x694c9, -1
  14280. +   person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GameboyKidScript_0x69540, -1
  14281. +   person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x69543, -1
  14282. +   person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x69546, -1
  14283. +   person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
  14284. diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
  14285. index 2ebd02c..763c308 100644
  14286. --- a/maps/ViridianCity.asm
  14287. +++ b/maps/ViridianCity.asm
  14288. @@ -237,7 +237,7 @@ ViridianCity_MapEventHeader:
  14289.  
  14290.  .PersonEvents:
  14291.     db 4
  14292. -   person_event SPRITE_GRAMPS, 5, 18, $2, 2, 2, -1, -1, 0, 0, 0, GrampsScript_0x1a9a4c, -1
  14293. -   person_event SPRITE_GRAMPS, 8, 30, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x1a9a61, -1
  14294. -   person_event SPRITE_FISHER, 23, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x1a9a75, -1
  14295. -   person_event SPRITE_YOUNGSTER, 21, 17, $2, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9a90, -1
  14296. +   person_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, GrampsScript_0x1a9a4c, -1
  14297. +   person_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x1a9a61, -1
  14298. +   person_event SPRITE_FISHER, 23, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x1a9a75, -1
  14299. +   person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEFN_02, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9a90, -1
  14300. diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
  14301. index 2508938..8e8a54e 100644
  14302. --- a/maps/ViridianGym.asm
  14303. +++ b/maps/ViridianGym.asm
  14304. @@ -13,7 +13,7 @@ BlueScript_0x9aa26:
  14305.     writetext UnknownText_0x9aa7b
  14306.     closetext
  14307.     loadmovesprites
  14308.     winlosstext UnknownText_0x9abae, $0000
  14309.     loadtrainer BLUE, 1
  14310.     startbattle
  14311.     returnafterbattle
  14312. @@ -183,5 +183,5 @@ ViridianGym_MapEventHeader:
  14313.  
  14314.  .PersonEvents:
  14315.     db 2
  14316. -   person_event SPRITE_BLUE, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE
  14317. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
  14318. +   person_event SPRITE_BLUE, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE
  14319. +   person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
  14320. diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
  14321. index 8ca273c..1177c0c 100644
  14322. --- a/maps/ViridianMart.asm
  14323. +++ b/maps/ViridianMart.asm
  14324. @@ -48,6 +48,6 @@ ViridianMart_MapEventHeader:
  14325.  
  14326.  .PersonEvents:
  14327.     db 3
  14328. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x9b5e7, -1
  14329. -   person_event SPRITE_LASS, 2, 7, $5, 0, 2, -1, -1, 0, 0, 0, LassScript_0x9b5ee, -1
  14330. -   person_event SPRITE_COOLTRAINER_M, 6, 1, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x9b5f1, -1
  14331. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x9b5e7, -1
  14332. +   person_event SPRITE_LASS, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, LassScript_0x9b5ee, -1
  14333. +   person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x9b5f1, -1
  14334. diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
  14335. index c7aa1e0..6689a12 100644
  14336. --- a/maps/ViridianNicknameSpeechHouse.asm
  14337. +++ b/maps/ViridianNicknameSpeechHouse.asm
  14338. @@ -72,7 +72,7 @@ ViridianNicknameSpeechHouse_MapEventHeader:
  14339.  
  14340.  .PersonEvents:
  14341.     db 4
  14342. -   person_event SPRITE_POKEFAN_M, 4, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x9ae3a, -1
  14343. -   person_event SPRITE_LASS, 4, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9ae3d, -1
  14344. -   person_event SPRITE_MOLTRES, 2, 5, $16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MoltresScript_0x9ae40, -1
  14345. -   person_event SPRITE_GROWLITHE, 3, 6, $16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrowlitheScript_0x9ae4a, -1
  14346. +   person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x9ae3a, -1
  14347. +   person_event SPRITE_LASS, 4, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9ae3d, -1
  14348. +   person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEFN_16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MoltresScript_0x9ae40, -1
  14349. +   person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEFN_16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrowlitheScript_0x9ae4a, -1
  14350. diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm
  14351. index 1c44183..0fdac5a 100644
  14352. --- a/maps/ViridianPokeCenter1F.asm
  14353. +++ b/maps/ViridianPokeCenter1F.asm
  14354. @@ -83,7 +83,7 @@ ViridianPokeCenter1F_MapEventHeader:
  14355.  
  14356.  .PersonEvents:
  14357.     db 4
  14358. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9b690, -1
  14359. -   person_event SPRITE_COOLTRAINER_M, 4, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x9b693, -1
  14360. -   person_event SPRITE_COOLTRAINER_F, 3, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerFScript_0x9b6a7, -1
  14361. -   person_event SPRITE_BUG_CATCHER, 6, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x9b6aa, -1
  14362. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9b690, -1
  14363. +   person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x9b693, -1
  14364. +   person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerFScript_0x9b6a7, -1
  14365. +   person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x9b6aa, -1
  14366. diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm
  14367. index 0d1b786..7bc4b8d 100644
  14368. --- a/maps/WarehouseEntrance.asm
  14369. +++ b/maps/WarehouseEntrance.asm
  14370. @@ -105,7 +105,7 @@ WarehouseEntrance_MapScriptHeader:
  14371.     return
  14372.  
  14373.  TrainerSupernerdEric:
  14374.     trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, $0000, SupernerdEricScript
  14375.  
  14376.  SupernerdEricScript:
  14377.     talkaftercancel
  14378. @@ -116,7 +116,7 @@ SupernerdEricScript:
  14379.     end
  14380.  
  14381.  TrainerSupernerdTeru:
  14382.     trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, $0000, SupernerdTeruScript
  14383.  
  14384.  SupernerdTeruScript:
  14385.     talkaftercancel
  14386. @@ -127,7 +127,7 @@ SupernerdTeruScript:
  14387.     end
  14388.  
  14389.  TrainerPokemaniacIssac:
  14390.     trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, $0000, PokemaniacIssacScript
  14391.  
  14392.  PokemaniacIssacScript:
  14393.     talkaftercancel
  14394. @@ -138,7 +138,7 @@ PokemaniacIssacScript:
  14395.     end
  14396.  
  14397.  TrainerPokemaniacDonald:
  14398.     trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, $0000, PokemaniacDonaldScript
  14399.  
  14400.  PokemaniacDonaldScript:
  14401.     talkaftercancel
  14402. @@ -171,7 +171,7 @@ GrampsScript_0x7c146:
  14403.  .CheckMorn:
  14404.     checkmorn
  14405.     iffalse WarehouseEntranceScript_ShopClosed
  14406.     pokemart $2, $0000
  14407.     loadmovesprites
  14408.     end
  14409.  
  14410. @@ -669,12 +669,12 @@ WarehouseEntrance_MapEventHeader:
  14411.  
  14412.  .PersonEvents:
  14413.     db 9
  14414. -   person_event SPRITE_SUPER_NERD, 31, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdEric, -1
  14415. -   person_event SPRITE_SUPER_NERD, 9, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdTeru, -1
  14416. -   person_event SPRITE_SUPER_NERD, 27, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacIssac, -1
  14417. -   person_event SPRITE_SUPER_NERD, 6, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacDonald, -1
  14418. -   person_event SPRITE_POKE_BALL, 25, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
  14419. -   person_event SPRITE_GRAMPS, 11, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS
  14420. -   person_event SPRITE_SUPER_NERD, 14, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER
  14421. -   person_event SPRITE_SUPER_NERD, 15, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER
  14422. -   person_event SPRITE_GRANNY, 21, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY
  14423. +   person_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdEric, -1
  14424. +   person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdTeru, -1
  14425. +   person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacIssac, -1
  14426. +   person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacDonald, -1
  14427. +   person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
  14428. +   person_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS
  14429. +   person_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER
  14430. +   person_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER
  14431. +   person_event SPRITE_GRANNY, 21, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY
  14432. diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
  14433. index bae2a02..70f4ee1 100644
  14434. --- a/maps/WhirlIslandB1F.asm
  14435. +++ b/maps/WhirlIslandB1F.asm
  14436. @@ -62,9 +62,9 @@ WhirlIslandB1F_MapEventHeader:
  14437.  
  14438.  .PersonEvents:
  14439.     db 6
  14440. -   person_event SPRITE_POKE_BALL, 13, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
  14441. -   person_event SPRITE_POKE_BALL, 18, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS
  14442. -   person_event SPRITE_POKE_BALL, 23, 33, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM
  14443. -   person_event SPRITE_POKE_BALL, 8, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET
  14444. -   person_event SPRITE_POKE_BALL, 26, 19, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
  14445. -   person_event SPRITE_BOULDER, 26, 23, $19, 0, 0, -1, -1, 0, 0, 0, WhirlIslandB1FBoulder, -1
  14446. +   person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
  14447. +   person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS
  14448. +   person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM
  14449. +   person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET
  14450. +   person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
  14451. +   person_event SPRITE_BOULDER, 26, 23, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, WhirlIslandB1FBoulder, -1
  14452. diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
  14453. index 091dc6f..d86648d 100644
  14454. --- a/maps/WhirlIslandB2F.asm
  14455. +++ b/maps/WhirlIslandB2F.asm
  14456. @@ -33,6 +33,6 @@ WhirlIslandB2F_MapEventHeader:
  14457.  
  14458.  .PersonEvents:
  14459.     db 3
  14460. -   person_event SPRITE_POKE_BALL, 11, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
  14461. -   person_event SPRITE_POKE_BALL, 4, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
  14462. -   person_event SPRITE_POKE_BALL, 12, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
  14463. +   person_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
  14464. +   person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
  14465. +   person_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
  14466. diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
  14467. index e92fac7..c4dc628 100644
  14468. --- a/maps/WhirlIslandLugiaChamber.asm
  14469. +++ b/maps/WhirlIslandLugiaChamber.asm
  14470. @@ -59,4 +59,4 @@ WhirlIslandLugiaChamber_MapEventHeader:
  14471.  
  14472.  .PersonEvents:
  14473.     db 1
  14474. -   person_event SPRITE_LUGIA, 5, 9, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LugiaScript_0x18c518, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
  14475. +   person_event SPRITE_LUGIA, 5, 9, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LugiaScript_0x18c518, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
  14476. diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
  14477. index dce0357..2ba3274 100644
  14478. --- a/maps/WhirlIslandNE.asm
  14479. +++ b/maps/WhirlIslandNE.asm
  14480. @@ -26,4 +26,4 @@ WhirlIslandNE_MapEventHeader:
  14481.  
  14482.  .PersonEvents:
  14483.     db 1
  14484. -   person_event SPRITE_POKE_BALL, 11, 11, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
  14485. +   person_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
  14486. diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
  14487. index e8132d1..d688328 100644
  14488. --- a/maps/WhirlIslandSW.asm
  14489. +++ b/maps/WhirlIslandSW.asm
  14490. @@ -28,4 +28,4 @@ WhirlIslandSW_MapEventHeader:
  14491.  
  14492.  .PersonEvents:
  14493.     db 1
  14494. -   person_event SPRITE_POKE_BALL, 2, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
  14495. +   person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
  14496. diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
  14497. index 6bc754d..28ad4df 100644
  14498. --- a/maps/WillsRoom.asm
  14499. +++ b/maps/WillsRoom.asm
  14500. @@ -3,8 +3,8 @@ WillsRoom_MapScriptHeader:
  14501.     db 2
  14502.  
  14503.     ; triggers
  14504.     dw UnknownScript_0x1804c6, $0000
  14505.     dw UnknownScript_0x1804ca, $0000
  14506.  
  14507.  .MapCallbacks:
  14508.     db 1
  14509. @@ -52,7 +52,7 @@ WillScript_0x1804f8:
  14510.     writetext UnknownText_0x180531
  14511.     closetext
  14512.     loadmovesprites
  14513.     winlosstext UnknownText_0x18062c, $0000
  14514.     loadtrainer WILL, 1
  14515.     startbattle
  14516.     returnafterbattle
  14517. @@ -148,4 +148,4 @@ WillsRoom_MapEventHeader:
  14518.  
  14519.  .PersonEvents:
  14520.     db 1
  14521. -   person_event SPRITE_WILL, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, WillScript_0x1804f8, -1
  14522. +   person_event SPRITE_WILL, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, WillScript_0x1804f8, -1
  14523. diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
  14524. index 783dd39..f7abb4f 100644
  14525. --- a/maps/WiseTriosRoom.asm
  14526. +++ b/maps/WiseTriosRoom.asm
  14527. @@ -3,8 +3,8 @@ WiseTriosRoom_MapScriptHeader:
  14528.     db 2
  14529.  
  14530.     ; triggers
  14531.     dw UnknownScript_0x98572, $0000
  14532.     dw UnknownScript_0x98573, $0000
  14533.  
  14534.  .MapCallbacks:
  14535.     db 1
  14536. @@ -66,7 +66,7 @@ UnknownScript_0x985a3:
  14537.     end
  14538.  
  14539.  TrainerSageGaku:
  14540.     trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, $0000, SageGakuScript
  14541.  
  14542.  SageGakuScript:
  14543.     loadfont
  14544. @@ -76,7 +76,7 @@ SageGakuScript:
  14545.     end
  14546.  
  14547.  TrainerSageMasa:
  14548.     trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, $0000, SageMasaScript
  14549.  
  14550.  SageMasaScript:
  14551.     loadfont
  14552. @@ -86,7 +86,7 @@ SageMasaScript:
  14553.     end
  14554.  
  14555.  TrainerSageKoji:
  14556.     trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, $0000, SageKojiScript
  14557.  
  14558.  SageKojiScript:
  14559.     checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
  14560. @@ -360,9 +360,9 @@ WiseTriosRoom_MapEventHeader:
  14561.  
  14562.  .PersonEvents:
  14563.     db 6
  14564. -   person_event SPRITE_SAGE, 2, 6, $3, 0, 0, -1, -1, 0, 0, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14565. -   person_event SPRITE_SAGE, 7, 6, $5, 0, 1, -1, -1, 0, 0, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14566. -   person_event SPRITE_SAGE, 5, 7, $8, 0, 0, -1, -1, 0, 0, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14567. -   person_event SPRITE_SAGE, 2, 4, $6, 0, 0, -1, -1, 0, 2, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14568. -   person_event SPRITE_SAGE, 6, 4, $7, 0, 0, -1, -1, 0, 2, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14569. -   person_event SPRITE_SAGE, 4, 6, $8, 0, 0, -1, -1, 0, 2, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14570. +   person_event SPRITE_SAGE, 2, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14571. +   person_event SPRITE_SAGE, 7, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14572. +   person_event SPRITE_SAGE, 5, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14573. +   person_event SPRITE_SAGE, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14574. +   person_event SPRITE_SAGE, 6, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14575. +   person_event SPRITE_SAGE, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 2, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14576. diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
  14577. index 6e9091f..b6c61ee 100644
  14578. --- a/misc/mobile_22_2.asm
  14579. +++ b/misc/mobile_22_2.asm
  14580. @@ -939,7 +939,7 @@ Function8b88c: ; 8b88c
  14581.     call Function8931b
  14582.     call Function8932d
  14583.     jr c, .asm_8b8a3
  14584.     ld hl, $0000
  14585.     add hl, bc
  14586.     ld d, h
  14587.     ld e, l
  14588. diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
  14589. index b6664ca..0de6c5c 100644
  14590. --- a/misc/mobile_40.asm
  14591. +++ b/misc/mobile_40.asm
  14592. @@ -246,17 +246,17 @@ Function10016f: ; 10016f
  14593.  
  14594.  .asm_1001af
  14595.     ld a, $d7
  14596.     ld de, $0000
  14597.     jr .asm_1001d7
  14598.  
  14599.  .asm_1001b6
  14600.     ld a, $d5
  14601.     ld de, $0000
  14602.     jr .asm_1001d7
  14603.  
  14604.  .asm_1001bd
  14605.     ld a, $d6
  14606.     ld de, $0000
  14607.     jr .asm_1001d7
  14608.  
  14609.  .asm_1001c4
  14610. @@ -271,7 +271,7 @@ Function10016f: ; 10016f
  14611.  
  14612.  .asm_1001d2
  14613.     ld a, $d0
  14614.     ld de, $0000
  14615.  
  14616.  .asm_1001d7
  14617.     ld [wc300], a
  14618. @@ -645,7 +645,7 @@ Function100406: ; 100406
  14619.  Function10043a: ; 10043a
  14620.     push hl
  14621.     push bc
  14622.     ld de, $0000
  14623.  .asm_10043f
  14624.     ld a, [hli]
  14625.     add e
  14626. @@ -3636,7 +3636,7 @@ Function10177b: ; 10177b
  14627.     ld c, a
  14628.     ld b, $0
  14629.     ld a, [wcd3a]
  14630.     ld hl, $0000
  14631.     call AddNTimes
  14632.     ld e, l
  14633.     ld d, h
  14634. @@ -6666,7 +6666,7 @@ Function102cee: ; 102cee
  14635.     sub c
  14636.     ret z
  14637.     ld bc, $002f
  14638.     ld hl, $0000
  14639.     call AddNTimes
  14640.     push hl
  14641.     ld a, [wJumptableIndex]
  14642. @@ -7473,7 +7473,7 @@ Function10343c: ; 10343c
  14643.     call Function1034e0
  14644.  
  14645.  .asm_10345f
  14646.     ld bc, $0000
  14647.     call Function10350f
  14648.     ld bc, $0001
  14649.     call Function103487
  14650. diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
  14651. index 52a2a65..c978bff 100644
  14652. --- a/misc/mobile_45.asm
  14653. +++ b/misc/mobile_45.asm
  14654. @@ -14428,7 +14428,7 @@ Function11ad1b: ; 11ad1b
  14655.     ld a, [wcfa9]
  14656.     ld [wcd82], a
  14657.     dec a
  14658. -   ld [hConnectedMapWidth], a
  14659. +   ld [hMapObjectIndexBuffer2], a
  14660.     ld a, $10
  14661.     ld [wc3b7], a
  14662.     ld hl, Function8e83f
  14663. @@ -15521,7 +15521,7 @@ Function11b3d9: ; 11b3d9
  14664.     add [hl]
  14665.     cp e
  14666.     jr z, .asm_11b40d
  14667.     ld hl, $0000
  14668.     ld bc, $0070
  14669.     call AddNTimes
  14670.     ld e, l
  14671. @@ -16413,7 +16413,7 @@ Function11b98f: ; 11b98f
  14672.  ; 11ba38
  14673.  
  14674.  Function11ba38: ; 11ba38
  14675. -   callba Functione538
  14676. +   callba CheckCurPartyMonFainted
  14677.     ret c
  14678.     xor a
  14679.     ld [ScriptVar], a
  14680. diff --git a/wram.asm b/wram.asm
  14681. index 08de7d7..bde772d 100644
  14682. --- a/wram.asm
  14683. +++ b/wram.asm
  14684. @@ -1644,9 +1644,9 @@ NorthConnectionStripPointer:: ; d1ab
  14685.     ds 2
  14686.  NorthConnectionStripLocation:: ; d1ad
  14687.     ds 2
  14688. -NorthConnectionStripLength:: ; d1af
  14689. +NorthMapObjectIndexBuffer1:: ; d1af
  14690.     ds 1
  14691. -NorthConnectedMapWidth:: ; d1b0
  14692. +NorthMapObjectIndexBuffer2:: ; d1b0
  14693.     ds 1
  14694.  NorthConnectionStripYOffset:: ; d1b1
  14695.     ds 1
  14696. @@ -1664,9 +1664,9 @@ SouthConnectionStripPointer:: ; d1b7
  14697.     ds 2
  14698.  SouthConnectionStripLocation:: ; d1b9
  14699.     ds 2
  14700. -SouthConnectionStripLength:: ; d1bb
  14701. +SouthMapObjectIndexBuffer1:: ; d1bb
  14702.     ds 1
  14703. -SouthConnectedMapWidth:: ; d1bc
  14704. +SouthMapObjectIndexBuffer2:: ; d1bc
  14705.     ds 1
  14706.  SouthConnectionStripYOffset:: ; d1bd
  14707.     ds 1
  14708. --
  14709. 2.5.3
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!