API tools faq
paste
Advertisement
PikalaxALT

none.diff

PikalaxALT
Nov 2nd, 2015
291
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 625.62 KB | None | 0 0
raw download clone embed print report
  1. commit ed29db5841849345c5971a9b08681dfb6560c07d
  2. Author: PikalaxALT <PikalaxALT@gmail.com>
  3. Date:   Thu Oct 29 23:32:11 2015 -0400
  4.  
  5.     No more -bash000; engine/movement.asm, SPRITEMOVEFN
  6.  
  7. diff --git a/audio/cries.asm b/audio/cries.asm
  8. index 85abcc6..6f15d02 100644
  9. --- a/audio/cries.asm
  10. +++ b/audio/cries.asm
  11. @@ -370,7 +370,7 @@ Cry_2C_branch_f3022: ; f3022
  12.     unknownmusic0xde $52
  13.     sound $4, $f1, $0796
  14.     sound $4, $f1, $072d
  15.     sound $7, $0, $0000
  16.     sound $10, $f1, $07a7
  17.     endchannel
  18.  ; f3035
  19. @@ -381,7 +381,7 @@ Cry_2C_Ch6: ; f3038
  20.  Cry_2C_branch_f3038: ; f3038
  21.     callchannel Cry_2C_branch_f3022
  22.     loopchannel 2, Cry_2C_branch_f3038
  23.     sound $e, $0, $0000
  24.     sound $8, $f2, $07c2
  25.     endchannel
  26.  ; f3048
  27. @@ -398,7 +398,7 @@ Cry_27_Ch5: ; f3048
  28.  Cry_27_Ch6: ; f305b
  29.     unknownmusic0xde $2a
  30.     sound $3, $2c, $07c7
  31.     sound $1, $0, $0000
  32.     sound $5, $59, $07be
  33.     sound $6, $b4, $07bd
  34.     endchannel
  35. @@ -621,7 +621,7 @@ Cry_36_Ch6: ; f3200
  36.  Cry_36_branch_f3202: ; f3202
  37.     sound $3, $f8, $0791
  38.     sound $3, $d8, $078d
  39.     sound $2, $0, $0000
  40.     sound $1, $78, $06c1
  41.     sound $1, $f8, $0741
  42.     sound $4, $e1, $0751
  43. @@ -646,7 +646,7 @@ Cry_43_Ch5: ; f322e
  44.     sound $8, $ab, $0734
  45.     sound $4, $d6, $0716
  46.     sound $8, $d1, $0712
  47.     sound $8, $0, $0000
  48.     endchannel
  49.  ; f3249
  50.  
  51. @@ -658,7 +658,7 @@ Cry_43_Ch6: ; f3249
  52.     sound $8, $cb, $0754
  53.     sound $4, $f6, $0736
  54.     sound $8, $f1, $0732
  55.     sound $8, $0, $0000
  56.     endchannel
  57.  ; f3264
  58.  
  59. @@ -1213,7 +1213,7 @@ Cry_09_Ch5: ; f361f
  60.  
  61.  Cry_09_Ch6: ; f363c
  62.     unknownmusic0xde $5
  63.     sound $2, $8, $0000
  64.     sound $f, $a7, $06a1
  65.     sound $6, $86, $06a2
  66.     sound $a, $74, $06a1
  67. @@ -1312,7 +1312,7 @@ Cry_11_Ch5: ; f3703
  68.  
  69.  Cry_11_Ch6: ; f3722
  70.     unknownmusic0xde $a
  71.     sound $4, $8, $0000
  72.     sound $6, $a7, $0741
  73.     sound $8, $86, $0743
  74.     sound $4, $76, $0741
  75. @@ -1587,7 +1587,7 @@ Cry_0B_Ch5: ; f394b
  76.  
  77.  Cry_0B_Ch6: ; f3976
  78.     unknownmusic0xde $44
  79.     sound $c, $8, $0000
  80.     sound $4, $f1, $0701
  81.     sound $4, $e1, $0782
  82.     sound $4, $d1, $0741
  83. @@ -1670,7 +1670,7 @@ Cry_0D_branch_f3a1a: ; f3a1a
  84.  
  85.  Cry_0D_Ch6: ; f3a39
  86.     unknownmusic0xde $40
  87.     sound $4, $8, $0000
  88.     sound $5, $f2, $0651
  89.     sound $9, $d1, $0661
  90.     sound $5, $e2, $0614
  91. @@ -1738,7 +1738,7 @@ Cry_0A_Ch5: ; f3aba
  92.  
  93.  Cry_0A_Ch6: ; f3ad9
  94.     unknownmusic0xde $5
  95.     sound $3, $8, $0000
  96.     sound $8, $a7, $06a1
  97.     sound $6, $86, $06a3
  98.     sound $3, $74, $06a1
  99. diff --git a/audio/engine.asm b/audio/engine.asm
  100. index b86d919..a995dd2 100644
  101. --- a/audio/engine.asm
  102. +++ b/audio/engine.asm
  103. @@ -2773,7 +2773,7 @@ LoadMusicByte:: ; e8d76
  104.  ; e8d80
  105.  
  106.  FrequencyTable: ; e8d80
  107.     dw $0000 ; filler
  108.     dw $f82c
  109.     dw $f89d
  110.     dw $f907
  111. diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm
  112. index a7001d9..4f9c320 100644
  113. --- a/audio/music/battletowertheme.asm
  114. +++ b/audio/music/battletowertheme.asm
  115. @@ -242,7 +242,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970
  116.     note __, 1
  117.     note F_, 4
  118.     note __, 4
  119.     tone $0000
  120.     intensity $b7
  121.     note G_, 2
  122.     octave 4
  123. diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm
  124. index bbad6dc..a595b8c 100644
  125. --- a/audio/music/lookkimonogirl.asm
  126. +++ b/audio/music/lookkimonogirl.asm
  127. @@ -14,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2
  128.     notetype $6, $87
  129.     tone $0001
  130.     callchannel Music_LookKimonoGirl_branch_f7aa8
  131.     tone $0000
  132.  Music_LookKimonoGirl_branch_f79d7: ; f79d7
  133.     notetype $c, $b2
  134.     callchannel Music_LookKimonoGirl_branch_f7a13
  135. diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
  136. index d46102b..b70823b 100644
  137. --- a/audio/music/titlescreen.asm
  138. +++ b/audio/music/titlescreen.asm
  139. @@ -490,7 +490,7 @@ Music_TitleScreen_Ch2: ; eb984
  140.     octave 4
  141.     note A_, 4
  142.     stereopanning $ff
  143.     tone $0000
  144.     notetype $c, $b0
  145.     octave 3
  146.     note B_, 6
  147. @@ -775,7 +775,7 @@ Music_TitleScreen_Ch3: ; ebb01
  148.     note __, 1
  149.     stereopanning $ff
  150.     notetype $c, $16
  151.     tone $0000
  152.     octave 4
  153.     note A_, 2
  154.     octave 5
  155. diff --git a/audio/sfx.asm b/audio/sfx.asm
  156. index b063378..820f5ce 100644
  157. --- a/audio/sfx.asm
  158. +++ b/audio/sfx.asm
  159. @@ -151,7 +151,7 @@ Sfx_Save_Ch5: ; f09b6
  160.  
  161.  Sfx_Save_Ch6: ; f09d5
  162.     dutycycle $2
  163.     sound $2, $8, $0000
  164.     sound $2, $a1, $0701
  165.     sound $1, $91, $0601
  166.     sound $1, $91, $0681
  167. @@ -2291,7 +2291,7 @@ Sfx_Sketch_Ch5: ; f12f9
  168.  Sfx_Sketch_branch_f12fd: ; f12fd
  169.     sound $2, $f1, $06e0
  170.     sound $d, $af, $05b0
  171.     sound $4, $0, $0000
  172.     sound $9, $f4, $0718
  173.     loopchannel 3, Sfx_Sketch_branch_f12fd
  174.     soundinput $8
  175. @@ -2490,15 +2490,15 @@ Sfx_Nightmare_Ch5: ; f1420
  176.     soundinput $34
  177.  Sfx_Nightmare_branch_f1424: ; f1424
  178.     sound $3, $ba, $0631
  179.     sound $2, $0, $0000
  180.     sound $3, $f8, $0621
  181.     sound $2, $0, $0000
  182.     sound $3, $f8, $0611
  183.     sound $2, $0, $0000
  184.     sound $3, $e8, $0601
  185.     sound $2, $0, $0000
  186.     sound $3, $e8, $05f1
  187.     sound $2, $0, $0000
  188.     loopchannel 2, Sfx_Nightmare_branch_f1424
  189.     soundinput $8
  190.     endchannel
  191. @@ -2540,11 +2540,11 @@ Sfx_SweetKiss2_Ch5: ; f1482
  192.     dutycycle $0
  193.     soundinput $97
  194.     sound $2, $f4, $0772
  195.     sound $4, $0, $0000
  196.     sound $2, $c4, $0772
  197.     sound $4, $0, $0000
  198.     sound $2, $b4, $0772
  199.     sound $4, $0, $0000
  200.     sound $2, $a1, $0772
  201.     soundinput $8
  202.     endchannel
  203. @@ -2591,7 +2591,7 @@ Sfx_SludgeBomb_Ch5: ; f14d6
  204.     dutycycle $2
  205.     soundinput $c5
  206.     sound $3, $f8, $0581
  207.     sound $1, $0, $0000
  208.     soundinput $cb
  209.     sound $10, $f2, $05d1
  210.     soundinput $8
  211. @@ -2613,9 +2613,9 @@ Sfx_Foresight_Ch5: ; f14f8
  212.     sound $3, $f4, $07b5
  213.     sound $3, $f5, $07c8
  214.     sound $8, $f4, $07da
  215.     sound $2, $0, $0000
  216.     sound $8, $c1, $07da
  217.     sound $2, $0, $0000
  218.     sound $8, $91, $07da
  219.     endchannel
  220.  ; f1515
  221. @@ -2811,7 +2811,7 @@ Sfx_Return_branch_f163c: ; f163c
  222.     sound $8, $f1, $0759
  223.     soundinput $57
  224.     sound $8, $f1, $0759
  225.     sound $10, $0, $0000
  226.     loopchannel 2, Sfx_Return_branch_f163c
  227.     soundinput $8
  228.     endchannel
  229. @@ -2849,7 +2849,7 @@ Sfx_MilkDrink_branch_f1684: ; f1684
  230.     sound $d, $f7, $0290
  231.     soundinput $9e
  232.     sound $4, $c9, $05e1
  233.     sound $2, $0, $0000
  234.     loopchannel 6, Sfx_MilkDrink_branch_f1684
  235.     soundinput $8
  236.     endchannel
  237. @@ -2864,7 +2864,7 @@ Sfx_Present_Ch5: ; f16a2
  238.     soundinput $d6
  239.  Sfx_Present_branch_f16a6: ; f16a6
  240.     sound $2, $f1, $0740
  241.     sound $1, $0, $0000
  242.     loopchannel 3, Sfx_Present_branch_f16a6
  243.     sound $10, $f1, $0780
  244.     soundinput $8
  245. @@ -2882,9 +2882,9 @@ Sfx_MorningSun_branch_f16be: ; f16be
  246.     sound $2, $f1, $07e0
  247.     sound $5, $f2, $07e7
  248.     loopchannel 3, Sfx_MorningSun_branch_f16be
  249.     sound $1, $0, $0000
  250.     sound $8, $c2, $07e7
  251.     sound $1, $0, $0000
  252.     sound $8, $82, $07e7
  253.     endchannel
  254.  ; f16df
  255. @@ -2913,10 +2913,10 @@ Sfx_Encore: ; f16fd
  256.  Sfx_Encore_Ch5: ; f1703
  257.     dutycycle $2
  258.     soundinput $ce
  259.     sound $10, $0, $0000
  260.  Sfx_Encore_branch_f170b: ; f170b
  261.     sound $2, $f8, $0774
  262.     sound $24, $0, $0000
  263.     loopchannel 2, Sfx_Encore_branch_f170b
  264.     soundinput $8
  265.     endchannel
  266. @@ -2966,9 +2966,9 @@ Sfx_BatonPass_Ch5: ; f1752
  267.     soundinput $f7
  268.     sound $20, $f2, $0680
  269.     sound $1, $f1, $0760
  270.     sound $20, $0, $0000
  271.     sound $1, $f1, $0760
  272.     sound $1a, $0, $0000
  273.     sound $1, $f1, $0760
  274.     soundinput $8
  275.     endchannel
  276. @@ -3836,27 +3836,27 @@ Sfx_BallBounce: ; f1b63
  277.  Sfx_BallBounce_Ch5: ; f1b69
  278.     dutycycle $2
  279.     sound $8, $e1, $0740
  280.     sound $17, $0, $0000
  281.     sound $8, $b1, $0740
  282.     sound $17, $0, $0000
  283.     sound $8, $81, $0740
  284.     sound $17, $0, $0000
  285.     sound $8, $51, $0740
  286.     sound $17, $0, $0000
  287.     endchannel
  288.  ; f1b8c
  289.  
  290.  Sfx_BallBounce_Ch6: ; f1b8c
  291.     dutycycle $2
  292.     sound $2, $8, $0000
  293.     sound $8, $b1, $0741
  294.     sound $17, $0, $0000
  295.     sound $8, $81, $0741
  296.     sound $17, $0, $0000
  297.     sound $8, $51, $0741
  298.     sound $17, $0, $0000
  299.     sound $8, $21, $0741
  300.     sound $17, $0, $0000
  301.     endchannel
  302.  ; f1bb3
  303.  
  304. @@ -3916,7 +3916,7 @@ Sfx_GiveTrademon: ; f1c10
  305.  ; f1c13
  306.  
  307.  Sfx_GiveTrademon_Ch5: ; f1c13
  308.     sound $20, $0, $0000
  309.     dutycycle $1
  310.     soundinput $a7
  311.     sound $1b, $f4, $0750
  312. @@ -3936,7 +3936,7 @@ Sfx_GetTrademon: ; f1c3e
  313.  ; f1c41
  314.  
  315.  Sfx_GetTrademon_Ch5: ; f1c41
  316.     sound $20, $0, $0000
  317.     dutycycle $2
  318.     soundinput $bf
  319.     sound $1b, $14, $07bc
  320. @@ -3959,7 +3959,7 @@ Sfx_TrainArrived: ; f1c6c
  321.  
  322.  Sfx_TrainArrived_Ch6: ; f1c75
  323.     tone $0008
  324.     sound $8, $0, $0000
  325.  Sfx_TrainArrived_Ch5: ; f1c7c
  326.     dutycycle $2
  327.     sound $4, $5f, $0691
  328. @@ -4060,7 +4060,7 @@ Sfx_SwitchPokemon_Ch5: ; f1d0f
  329.  
  330.  Sfx_SwitchPokemon_Ch6: ; f1d16
  331.     dutycycle $2
  332.     sound $2, $8, $0000
  333.     sound $8, $b1, $0741
  334.     endchannel
  335.  ; f1d21
  336. @@ -4093,7 +4093,7 @@ Sfx_Tally_Ch5: ; f1d43
  337.  
  338.  Sfx_Tally_Ch6: ; f1d4a
  339.     dutycycle $2
  340.     sound $1, $8, $0000
  341.     sound $4, $a1, $0761
  342.     endchannel
  343.  ; f1d55
  344. @@ -4107,7 +4107,7 @@ Sfx_Transaction_Ch5: ; f1d55
  345.  
  346.  Sfx_Transaction_Ch6: ; f1d60
  347.     dutycycle $2
  348.     sound $1, $8, $0000
  349.     sound $4, $91, $06c1
  350.     sound $18, $a2, $07a1
  351.     endchannel
  352. @@ -4183,7 +4183,7 @@ Sfx_GotSafariBalls_Ch5: ; f1dd4
  353.  Sfx_BootPc_Ch5: ; f1de3
  354.     dutycycle $2
  355.     sound $f, $f2, $07c0
  356.     sound $f, $0, $0000
  357.     sound $3, $a1, $0780
  358.     sound $3, $a1, $0700
  359.     sound $3, $a1, $0740
  360. @@ -4200,16 +4200,16 @@ Sfx_ShutDownPc_Ch5: ; f1e0e
  361.     sound $4, $f0, $0600
  362.     sound $4, $f0, $0400
  363.     sound $4, $f0, $0200
  364.     sound $1, $0, $0000
  365.     endchannel
  366.  ; f1e21
  367.  
  368.  Sfx_ChoosePcOption_Ch5: ; f1e21
  369.     dutycycle $2
  370.     sound $6, $f0, $0700
  371.     sound $4, $0, $0000
  372.     sound $6, $f0, $0700
  373.     sound $1, $0, $0000
  374.     endchannel
  375.  ; f1e34
  376.  
  377. @@ -4227,11 +4227,11 @@ Sfx_EscapeRope_Ch5: ; f1e34
  378.  
  379.  Sfx_PushButton_Ch5: ; f1e4f
  380.     dutycycle $2
  381.     sound $4, $0, $0000
  382.     sound $2, $f1, $0680
  383.     sound $1, $0, $0000
  384.     sound $4, $f1, $0780
  385.     sound $4, $0, $0000
  386.     endchannel
  387.  ; f1e66
  388.  
  389. @@ -4242,7 +4242,7 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
  390.     soundinput $22
  391.     sound $2, $f1, $0500
  392.     soundinput $8
  393.     sound $1, $0, $0000
  394.     endchannel
  395.  ; f1e7b
  396.  
  397. @@ -4319,18 +4319,18 @@ Sfx_Wrong_Ch5: ; f1f05
  398.     soundinput $5a
  399.     sound $4, $f0, $0500
  400.     soundinput $8
  401.     sound $4, $0, $0000
  402.     sound $f, $f0, $0500
  403.     sound $1, $0, $0000
  404.     endchannel
  405.  ; f1f1c
  406.  
  407.  Sfx_Wrong_Ch6: ; f1f1c
  408.     dutycycle $3
  409.     sound $4, $f0, $0401
  410.     sound $4, $0, $0000
  411.     sound $f, $f0, $0401
  412.     sound $1, $0, $0000
  413.     endchannel
  414.  ; f1f2f
  415.  
  416. @@ -4357,7 +4357,7 @@ Sfx_Strength_Ch8: ; f1f3a
  417.  Sfx_Boat_Ch5: ; f1f53
  418.     dutycycle $2
  419.     sound $f, $f0, $0500
  420.     sound $4, $0, $0000
  421.     sound $f, $f0, $0500
  422.     sound $f, $f0, $0500
  423.     sound $f, $f0, $0500
  424. @@ -4369,7 +4369,7 @@ Sfx_Boat_Ch5: ; f1f53
  425.  Sfx_Boat_Ch6: ; f1f72
  426.     dutycycle $3
  427.     sound $f, $f0, $0482
  428.     sound $4, $0, $0000
  429.     sound $f, $f0, $0482
  430.     sound $f, $f0, $0482
  431.     sound $f, $f0, $0482
  432. @@ -4423,7 +4423,7 @@ Sfx_Shine_Ch5: ; f1fd9
  433.     sound $0, $d2, $0780
  434.     sound $0, $d2, $07c0
  435.     sound $a, $e1, $07e0
  436.     sound $1, $0, $0000
  437.     endchannel
  438.  ; f1ff4
  439.  
  440. @@ -4493,7 +4493,7 @@ Sfx_Call_Ch5: ; f2052
  441.     sound $4, $f7, $07a0
  442.     sound $4, $f7, $07a0
  443.     soundinput $8
  444.     sound $4, $0, $0000
  445.     endchannel
  446.  ; f206f
  447.  
  448. @@ -5483,13 +5483,13 @@ Sfx_HangUp_Ch5: ; f26f1
  449.     dutycycle $2
  450.     sound $4, $b8, $077b
  451.     sound $2, $21, $077b
  452.     sound $10, $0, $0000
  453.  Sfx_HangUp_branch_f26ff: ; f26ff
  454.  Sfx_NoSignal_Ch5: ; f26ff
  455.  Sfx_NoSignal_branch_f26ff: ; f26ff
  456.     dutycycle $2
  457.     sound $14, $e8, $070b
  458.     sound $1c, $0, $0000
  459.     loopchannel 3, Sfx_HangUp_branch_f26ff
  460.     endchannel
  461.  ; f270e
  462. @@ -5526,8 +5526,8 @@ Sfx_Elevator_branch_f2726: ; f2726
  463.  
  464.  Sfx_Elevator_Ch6: ; f274b
  465.  Sfx_Elevator_Ch7: ; f274b
  466.     sound $60, $0, $0000
  467.     sound $53, $0, $0000
  468.     endchannel
  469.  ; f2754
  470.  
  471. diff --git a/audio/sfx_crystal.asm b/audio/sfx_crystal.asm
  472. index 08806a7..7970322 100644
  473. --- a/audio/sfx_crystal.asm
  474. +++ b/audio/sfx_crystal.asm
  475. @@ -84,7 +84,7 @@ Sfx_IntroPichu_Ch5: ; 1798ad
  476.     dutycycle $3
  477.     soundinput $4d
  478.     sound $1, $88, $0770
  479.     sound $3, $0, $0000
  480.     soundinput $17
  481.     sound $2, $88, $0776
  482.     endchannel
  483. diff --git a/audio/trainer_encounters.asm b/audio/trainer_encounters.asm
  484. index de748d2..622ba4a 100644
  485. --- a/audio/trainer_encounters.asm
  486. +++ b/audio/trainer_encounters.asm
  487. @@ -7,7 +7,7 @@ PlayTrainerEncounterMusic:: ; e900a
  488.     ld [MusicFade], a
  489.     ; play nothing for one frame
  490.     push de
  491.     ld de, $0000 ; id: Music_Nothing
  492.     call PlayMusic
  493.     call DelayFrame
  494.     ; play new song
  495. diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm
  496. index 5c4c435..21707f1 100644
  497. --- a/battle/anim_objects.asm
  498. +++ b/battle/anim_objects.asm
  499. @@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
  500.  
  501.  
  502.  Functioncc9bd: ; cc9bd
  503.     ld hl, $0000
  504.     add hl, bc
  505.     ld [hl], $0
  506.     ret
  507. diff --git a/battle/core.asm b/battle/core.asm
  508. index 6fc9a6f..a0d72da 100644
  509. --- a/battle/core.asm
  510. +++ b/battle/core.asm
  511. @@ -3240,7 +3240,7 @@ MonFaintedAnimation: ; 3d444
  512.  
  513.  
  514.  Function3d490: ; 3d490
  515. -   ld [hConnectionStripLength], a
  516. +   ld [hMapObjectIndexBuffer1], a
  517.     ld c, a
  518.  .asm_3d493
  519.     push bc
  520. @@ -3264,7 +3264,7 @@ Function3d490: ; 3d490
  521.  ; 3d4ae
  522.  
  523.  Function3d4ae: ; 3d4ae
  524. -   ld a, [hConnectionStripLength]
  525. +   ld a, [hMapObjectIndexBuffer1]
  526.     ld c, a
  527.     cp $8
  528.     jr nz, .back
  529. @@ -3646,7 +3646,7 @@ Function3d714: ; 3d714
  530.     push af
  531.     ld a, [CurBattleMon]
  532.     ld [CurPartyMon], a
  533. -   callba Functione538
  534. +   callba CheckCurPartyMonFainted
  535.     pop bc
  536.     ld a, b
  537.     ld [CurPartyMon], a
  538. @@ -9458,7 +9458,7 @@ Function3fc30: ; 3fc30
  539.  Function3fc5b: ; 3fc5b
  540.     ld hl, Sprites
  541.     xor a
  542. -   ld [hConnectionStripLength], a
  543. +   ld [hMapObjectIndexBuffer1], a
  544.     ld b, $6
  545.     ld e, $a8
  546.  .asm_3fc65
  547. @@ -9469,10 +9469,10 @@ Function3fc5b: ; 3fc5b
  548.     inc hl
  549.     ld [hl], e
  550.     inc hl
  551. -   ld a, [hConnectionStripLength]
  552. +   ld a, [hMapObjectIndexBuffer1]
  553.     ld [hli], a
  554.     inc a
  555. -   ld [hConnectionStripLength], a
  556. +   ld [hMapObjectIndexBuffer1], a
  557.     ld a, $1
  558.     ld [hli], a
  559.     ld a, d
  560. @@ -9480,9 +9480,9 @@ Function3fc5b: ; 3fc5b
  561.     ld d, a
  562.     dec c
  563.     jr nz, .asm_3fc69
  564. -   ld a, [hConnectionStripLength]
  565. +   ld a, [hMapObjectIndexBuffer1]
  566.     add $3
  567. -   ld [hConnectionStripLength], a
  568. +   ld [hMapObjectIndexBuffer1], a
  569.     ld a, e
  570.     add $8
  571.     ld e, a
  572. diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm
  573. index 073fe40..8248955 100644
  574. --- a/battle/effect_command_pointers.asm
  575. +++ b/battle/effect_command_pointers.asm
  576. @@ -1,5 +1,5 @@
  577.  
  578.     dw $0000 ; padding
  579.  
  580.  BattleCommandPointers: ; 3fd28
  581.     dw BattleCommand01 ; 34084
  582. diff --git a/constants.asm b/constants.asm
  583. index 1c37913..e0a2961 100644
  584. --- a/constants.asm
  585. +++ b/constants.asm
  586. @@ -1,4 +1,3 @@
  587. -
  588.  INCLUDE "macros.asm"
  589.  
  590.  INCLUDE "gbhw.asm"
  591. diff --git a/constants/map_constants.asm b/constants/map_constants.asm
  592. index 1b553c7..7a40a6f 100644
  593. --- a/constants/map_constants.asm
  594. +++ b/constants/map_constants.asm
  595. @@ -517,8 +517,8 @@ const_value SET 1
  596.     const OBJECT_MAP_OBJECT_INDEX
  597.     const OBJECT_SPRITE_TILE
  598.     const OBJECT_03
  599. -   const OBJECT_04
  600. -   const OBJECT_FLAGS
  601. +   const OBJECT_FLAGS1
  602. +   const OBJECT_FLAGS2
  603.     const OBJECT_PALETTE
  604.     const OBJECT_DIRECTION_WALKING
  605.     const OBJECT_FACING
  606. diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
  607. index 833c843..d333a51 100644
  608. --- a/constants/misc_constants.asm
  609. +++ b/constants/misc_constants.asm
  610. @@ -1,5 +1,4 @@
  611.  NONE EQU 0
  612. -
  613.  PARTY_LENGTH EQU 6
  614.  
  615.  MAX_ITEMS     EQU 20
  616. diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
  617. index f0fb8d6..ecbe7ad 100644
  618. --- a/constants/sprite_constants.asm
  619. +++ b/constants/sprite_constants.asm
  620. @@ -217,3 +217,6 @@ const_value SET 1
  621.     const SPRITEMOVEFN_1F
  622.     const SPRITEMOVEFN_20
  623.     const SPRITEMOVEFN_21
  624. +   const SPRITEMOVEFN_22
  625. +   const SPRITEMOVEFN_23
  626. +   const SPRITEMOVEFN_24
  627. diff --git a/engine/events.asm b/engine/events.asm
  628. index 961a7f5..e60f08b 100644
  629. --- a/engine/events.asm
  630. +++ b/engine/events.asm
  631. @@ -606,7 +606,7 @@ TryObjectEvent: ; 969b5
  632.  
  633.  .IsObject
  634.     call PlayTalkObject
  635. -   ld a, [hConnectedMapWidth]
  636. +   ld a, [hMapObjectIndexBuffer2]
  637.     call GetObjectStruct
  638.     ld hl, OBJECT_MAP_OBJECT_INDEX
  639.     add hl, bc
  640. diff --git a/engine/events_2.asm b/engine/events_2.asm
  641. index 966fa7d..42bae51 100644
  642. --- a/engine/events_2.asm
  643. +++ b/engine/events_2.asm
  644. @@ -352,7 +352,7 @@ Function97e08:: ; 97e08
  645.     ld hl, wd6de
  646.     xor a
  647.  .asm_97e0c
  648. -   ld [hConnectionStripLength], a
  649. +   ld [hMapObjectIndexBuffer1], a
  650.     ld a, [hl]
  651.     and a
  652.     jr z, .asm_97e19
  653. @@ -365,7 +365,7 @@ Function97e08:: ; 97e08
  654.  .asm_97e19
  655.     ld de, $0006
  656.     add hl, de
  657. -   ld a, [hConnectionStripLength]
  658. +   ld a, [hMapObjectIndexBuffer1]
  659.     inc a
  660.     cp $4
  661.     jr nz, .asm_97e0c
  662. @@ -441,14 +441,14 @@ Function97e5c:: ; 97e5c
  663.  ; 97e72
  664.  
  665.  Function97e72: ; 97e72
  666.     ld hl, $0000
  667.     add hl, bc
  668.     ld [hl], 0
  669.     ret
  670.  ; 97e79
  671.  
  672.  Function97e79: ; 97e79
  673.     ld hl, $0000
  674.     add hl, bc
  675.     ld a, [hl]
  676.     cp 5
  677. @@ -620,7 +620,7 @@ Function97f42: ; 97f42
  678.  .asm_97f47
  679.     push af
  680.  
  681.     ld hl, $0000
  682.     add hl, de
  683.     ld a, [hl]
  684.     and a
  685. diff --git a/engine/map_objects.asm b/engine/map_objects.asm
  686. index d73ebd1..270ad71 100644
  687. --- a/engine/map_objects.asm
  688. +++ b/engine/map_objects.asm
  689. @@ -78,7 +78,7 @@ Function437b: ; 437b
  690.  ; 4386
  691.  
  692.  Function4386: ; 4386
  693. -   ld hl, OBJECT_FLAGS
  694. +   ld hl, OBJECT_FLAGS2
  695.     add hl, bc
  696.     res 6, [hl]
  697.     ld a, [XCoord]
  698. @@ -104,7 +104,7 @@ Function4386: ; 4386
  699.     jr .yes
  700.  
  701.  .ok
  702. -   ld hl, OBJECT_FLAGS
  703. +   ld hl, OBJECT_FLAGS2
  704.     add hl, bc
  705.     set 6, [hl]
  706.     ld a, [XCoord]
  707. @@ -133,7 +133,7 @@ Function4386: ; 4386
  708.     ret
  709.  
  710.  .ok2
  711. -   ld hl, OBJECT_04
  712. +   ld hl, OBJECT_FLAGS1
  713.     add hl, bc
  714.     bit 1, [hl]
  715.     jr nz, .yes2
  716. @@ -142,7 +142,7 @@ Function4386: ; 4386
  717.     ret
  718.  
  719.  .yes2
  720. -   ld hl, OBJECT_FLAGS
  721. +   ld hl, OBJECT_FLAGS2
  722.     add hl, bc
  723.     set 6, [hl]
  724.     and a
  725. @@ -155,7 +155,7 @@ Function43f3: ; 43f3
  726.     ld a, [hl]
  727.     and a
  728.     jr z, .zero
  729. -   ld hl, OBJECT_FLAGS
  730. +   ld hl, OBJECT_FLAGS2
  731.     add hl, bc
  732.     bit 5, [hl]
  733.     jr nz, .not_bit5
  734. @@ -165,7 +165,7 @@ Function43f3: ; 43f3
  735.  
  736.  .zero
  737.     call Function47bc
  738. -   ld hl, OBJECT_FLAGS
  739. +   ld hl, OBJECT_FLAGS2
  740.     add hl, bc
  741.     bit 5, [hl]
  742.     jr nz, .not_bit5
  743. @@ -190,12 +190,12 @@ Function43f3: ; 43f3
  744.  ; 4427
  745.  
  746.  Function4427: ; 4427
  747. -   ld hl, OBJECT_04
  748. +   ld hl, OBJECT_FLAGS1
  749.     add hl, bc
  750.     bit 0, [hl]
  751.     jr nz, Function44a3
  752.  
  753. -   ld hl, OBJECT_FLAGS
  754. +   ld hl, OBJECT_FLAGS2
  755.     add hl, bc
  756.     bit 6, [hl]
  757.     jr nz, Function44a3
  758. @@ -208,7 +208,7 @@ Function4427: ; 4427
  759.  ; 4440
  760.  
  761.  Function4440: ; 4440
  762. -   ld hl, OBJECT_04
  763. +   ld hl, OBJECT_FLAGS1
  764.     add hl, bc
  765.     bit 0, [hl]
  766.     jr nz, Function44a3
  767. @@ -300,7 +300,7 @@ Function44b5: ; 44b5
  768.  ; 44c1
  769.  
  770.  Function44c1: ; 44c1
  771. -   ld hl, OBJECT_04
  772. +   ld hl, OBJECT_FLAGS1
  773.     add hl, bc
  774.     bit 3, [hl]
  775.     jp nz, Function44aa
  776. @@ -324,7 +324,7 @@ Function44c1: ; 44c1
  777.  ; 44e4
  778.  
  779.  Function44e4: ; 44e4
  780. -   ld hl, OBJECT_04
  781. +   ld hl, OBJECT_FLAGS1
  782.     add hl, bc
  783.     bit 3, [hl]
  784.     jp nz, Function44aa
  785. @@ -348,7 +348,7 @@ Function44e4: ; 44e4
  786.  ; 4508
  787.  
  788.  Function4508: ; 4508
  789. -   ld hl, OBJECT_04
  790. +   ld hl, OBJECT_FLAGS1
  791.     add hl, bc
  792.     bit 3, [hl]
  793.     jp nz, Function44aa
  794. @@ -603,7 +603,7 @@ Function462a: ; 462a
  795.  ; 463f
  796.  
  797.  Function463f: ; 463f
  798. -   ld hl, OBJECT_FLAGS
  799. +   ld hl, OBJECT_FLAGS2
  800.     add hl, bc
  801.     bit 3, [hl]
  802.     jr z, .ok
  803. @@ -632,13 +632,13 @@ Function4661: ; 4661
  804.     jr c, .reset
  805.  
  806.  .set
  807. -   ld hl, OBJECT_FLAGS
  808. +   ld hl, OBJECT_FLAGS2
  809.     add hl, bc
  810.     set 3, [hl]
  811.     ret
  812.  
  813.  .reset
  814. -   ld hl, OBJECT_FLAGS
  815. +   ld hl, OBJECT_FLAGS2
  816.     add hl, bc
  817.     res 3, [hl]
  818.     ret
  819. @@ -670,7 +670,7 @@ Function4690: ; 4690
  820.     ld hl, OBJECT_DIRECTION_WALKING
  821.     add hl, bc
  822.     ld [hl], a
  823. -   ld hl, OBJECT_04
  824. +   ld hl, OBJECT_FLAGS1
  825.     add hl, bc
  826.     bit 2, [hl]
  827.     jr nz, .ok
  828. @@ -1098,7 +1098,7 @@ Function48b3: ; 48b3
  829.     ld a, [hl]
  830.     call CheckPitTile
  831.     jr z, .on_pit
  832. -   ld hl, OBJECT_FLAGS
  833. +   ld hl, OBJECT_FLAGS2
  834.     add hl, bc
  835.     bit 2, [hl]
  836.     res 2, [hl]
  837. @@ -1192,7 +1192,7 @@ Function48ff: ; 48ff
  838.     and %00001100
  839.     or d
  840.     pop bc
  841. -   jp Function5412
  842. +   jp NormalStep
  843.  
  844.  .standing
  845.     pop bc
  846. @@ -1499,7 +1499,7 @@ Function4af0: ; 4af0
  847.     add hl, bc
  848.     ld [hl], 2
  849.     ld hl, wd4cf
  850. -   ld a, [hConnectionStripLength]
  851. +   ld a, [hMapObjectIndexBuffer1]
  852.     cp [hl]
  853.     jr z, .ok
  854.     ld hl, OBJECT_09
  855. @@ -1604,7 +1604,7 @@ Function4b8d: ; 4b8d
  856.     ret nz
  857.     call Function4600
  858.     call Function46a6
  859. -   ld hl, OBJECT_FLAGS
  860. +   ld hl, OBJECT_FLAGS2
  861.     add hl, bc
  862.     res 3, [hl]
  863.     call IncrementObjectStructField28
  864. @@ -1648,7 +1648,7 @@ Function4bd2: ; 4bd2
  865.     dec [hl]
  866.     ret nz
  867.     call Function4600
  868. -   ld hl, OBJECT_FLAGS
  869. +   ld hl, OBJECT_FLAGS2
  870.     add hl, bc
  871.     res 3, [hl]
  872.     ld hl, wd150
  873. @@ -1723,7 +1723,7 @@ Function4c42: ; 4c42
  874.     ld hl, OBJECT_STEP_DURATION
  875.     add hl, bc
  876.     ld [hl], $10
  877. -   ld hl, OBJECT_FLAGS
  878. +   ld hl, OBJECT_FLAGS2
  879.     add hl, bc
  880.     res 3, [hl]
  881.     call IncrementObjectStructField28
  882. @@ -2198,7 +2198,7 @@ Function4ecd: ; 4ecd
  883.     ld b, a
  884.     callba CopyDECoordsToMapObject
  885.     pop bc
  886. -   ld hl, OBJECT_FLAGS
  887. +   ld hl, OBJECT_FLAGS2
  888.     add hl, bc
  889.     res 2, [hl]
  890.     call Function4600
  891. @@ -2508,7 +2508,7 @@ Function54b8: ; 54b8
  892.     ret z
  893.     ld a, [wd4cd]
  894.     ld d, a
  895. -   ld a, [hConnectionStripLength]
  896. +   ld a, [hMapObjectIndexBuffer1]
  897.     cp d
  898.     ret nz
  899.     ld a, e
  900. @@ -2651,7 +2651,7 @@ Function5565: ; 5565
  901.  
  902.  Function5579: ; 5579
  903.     push bc
  904. -   ld a, [hConnectionStripLength]
  905. +   ld a, [hMapObjectIndexBuffer1]
  906.     ld c, a
  907.     call Function5582
  908.     pop bc
  909. @@ -2663,7 +2663,7 @@ Function5582: ; 5582
  910.     ld a, NUM_OBJECT_STRUCTS
  911.  .loop
  912.     push af
  913. -   ld hl, OBJECT_04
  914. +   ld hl, OBJECT_FLAGS1
  915.     add hl, de
  916.     bit 7, [hl]
  917.     jr z, .next
  918. @@ -2712,7 +2712,7 @@ Function55b9: ; 55b9
  919.     ld [hli], a
  920.     ld a, [de]
  921.     ld [hli], a
  922. -   ld a, [hConnectionStripLength]
  923. +   ld a, [hMapObjectIndexBuffer1]
  924.     ld [hli], a
  925.     push hl
  926.     ld hl, OBJECT_MAP_X
  927. @@ -2737,7 +2737,7 @@ Function55e0:: ; 55e0
  928.     ld bc, ObjectStructs
  929.     xor a
  930.  .loop
  931. -   ld [hConnectionStripLength], a
  932. +   ld [hMapObjectIndexBuffer1], a
  933.     call GetObjectSprite
  934.     jr z, .ok
  935.     call Function565c
  936. @@ -2747,7 +2747,7 @@ Function55e0:: ; 55e0
  937.     add hl, bc
  938.     ld b, h
  939.     ld c, l
  940. -   ld a, [hConnectionStripLength]
  941. +   ld a, [hMapObjectIndexBuffer1]
  942.     inc a
  943.     cp NUM_OBJECT_STRUCTS
  944.     jr nz, .loop
  945. @@ -2801,13 +2801,13 @@ Function5645: ; 5645
  946.     xor a
  947.     ld bc, ObjectStructs
  948.  .loop
  949. -   ld [hConnectionStripLength], a
  950. +   ld [hMapObjectIndexBuffer1], a
  951.     call Function5680
  952.     ld hl, OBJECT_STRUCT_LENGTH
  953.     add hl, bc
  954.     ld b, h
  955.     ld c, l
  956. -   ld a, [hConnectionStripLength]
  957. +   ld a, [hMapObjectIndexBuffer1]
  958.     inc a
  959.     cp NUM_OBJECT_STRUCTS
  960.     jr nz, .loop
  961. @@ -3032,7 +3032,7 @@ Function5781: ; 5781
  962.     ld bc, ObjectStructs
  963.     xor a
  964.  .loop
  965. -   ld [hConnectionStripLength], a
  966. +   ld [hMapObjectIndexBuffer1], a
  967.     call GetObjectSprite
  968.     jr z, .next
  969.     call Function437b
  970. @@ -3042,7 +3042,7 @@ Function5781: ; 5781
  971.     add hl, bc
  972.     ld b, h
  973.     ld c, l
  974. -   ld a, [hConnectionStripLength]
  975. +   ld a, [hMapObjectIndexBuffer1]
  976.     inc a
  977.     cp NUM_OBJECT_STRUCTS
  978.     jr nz, .loop
  979. @@ -3102,7 +3102,7 @@ Function57e2: ; 57e2
  980.     ld a, d
  981.     and $80
  982.     ret z
  983.     ld bc, $0000 ; debug?
  984.     ld hl, OBJECT_FACING
  985.     add hl, bc
  986.     ld a, [hl]
  987. @@ -3137,7 +3137,7 @@ Function5803:: ; 5803
  988.  Function5815: ; 5815
  989.     call Function18de
  990.     ret c
  991. -   ld a, [hConnectedMapWidth]
  992. +   ld a, [hMapObjectIndexBuffer2]
  993.     ld [wd4cd], a
  994.     ret
  995.  ; 581f
  996. @@ -3166,7 +3166,7 @@ Function582c: ; 582c
  997.     ld hl, OBJECT_09
  998.     add hl, bc
  999.     ld [hl], 0
  1000. -   ld a, [hConnectedMapWidth]
  1001. +   ld a, [hMapObjectIndexBuffer2]
  1002.     ld [wd4ce], a
  1003.     ret
  1004.  ; 5847
  1005. @@ -3189,7 +3189,7 @@ SetFlagsForMovement_1:: ; 585c
  1006.     push bc
  1007.     call Function587a
  1008.     pop bc
  1009. -   ld hl, OBJECT_FLAGS
  1010. +   ld hl, OBJECT_FLAGS2
  1011.     add hl, bc
  1012.     res 5, [hl]
  1013.     xor a
  1014. @@ -3199,7 +3199,7 @@ SetFlagsForMovement_1:: ; 585c
  1015.  Function586e: ; 586e
  1016.     call Function18de
  1017.     ret c
  1018. -   ld hl, OBJECT_FLAGS
  1019. +   ld hl, OBJECT_FLAGS2
  1020.     add hl, bc
  1021.     set 5, [hl]
  1022.     xor a
  1023. @@ -3213,7 +3213,7 @@ Function587a: ; 587a
  1024.     push af
  1025.     call GetObjectSprite
  1026.     jr z, .next
  1027. -   ld hl, OBJECT_FLAGS
  1028. +   ld hl, OBJECT_FLAGS2
  1029.     add hl, bc
  1030.     set 5, [hl]
  1031.  
  1032. @@ -3245,7 +3245,7 @@ _SetFlagsForMovement_2:: ; 5897
  1033.     cp -1
  1034.     ret z
  1035.     call GetObjectStruct
  1036. -   ld hl, OBJECT_FLAGS
  1037. +   ld hl, OBJECT_FLAGS2
  1038.     add hl, bc
  1039.     res 5, [hl]
  1040.     ret
  1041. @@ -3259,7 +3259,7 @@ Function58b9:: ; 58b9
  1042.     push af
  1043.     call GetObjectSprite
  1044.     jr z, .next
  1045. -   ld hl, OBJECT_FLAGS
  1046. +   ld hl, OBJECT_FLAGS2
  1047.     add hl, bc
  1048.     res 5, [hl]
  1049.  
  1050. @@ -3279,7 +3279,7 @@ Function58b9:: ; 58b9
  1051.  Function58d8: ; 58d8
  1052.     call Function18de
  1053.     ret c
  1054. -   ld hl, OBJECT_FLAGS
  1055. +   ld hl, OBJECT_FLAGS2
  1056.     add hl, bc
  1057.     res 5, [hl]
  1058.     ret
  1059. @@ -3357,7 +3357,7 @@ Function593a: ; 593a
  1060.     ret nc
  1061.     ld l, a
  1062.     ld h, $c4
  1063. -   ld de, OBJECT_04
  1064. +   ld de, OBJECT_FLAGS1
  1065.     ld a, b
  1066.     ld c, $a0
  1067.  .loop
  1068. @@ -3447,7 +3447,7 @@ Function59a4: ; 59a4
  1069.  
  1070.  ; Define the sprite priority.
  1071.     ld e, $10
  1072. -   ld hl, OBJECT_FLAGS
  1073. +   ld hl, OBJECT_FLAGS2
  1074.     add hl, bc
  1075.     bit 0, [hl]
  1076.     jr nz, .add
  1077. @@ -3517,7 +3517,7 @@ Function5a0d: ; 5a0d
  1078.     or %00001000
  1079.  .skip1
  1080.  
  1081. -   ld hl, OBJECT_FLAGS
  1082. +   ld hl, OBJECT_FLAGS2
  1083.     add hl, bc
  1084.     ld e, [hl]
  1085.     bit 7, e
  1086. diff --git a/engine/movement.asm b/engine/movement.asm
  1087. index d3c570c..8a4f09c 100644
  1088. --- a/engine/movement.asm
  1089. +++ b/engine/movement.asm
  1090. @@ -1,120 +1,120 @@
  1091.  MovementPointers: ; 5075
  1092. -   dw Movement_turn_head_down
  1093. -   dw Movement_turn_head_up
  1094. -   dw Movement_turn_head_left
  1095. -   dw Movement_turn_head_right
  1096. -   dw Movement_half_step_down
  1097. -   dw Movement_half_step_up
  1098. -   dw Movement_half_step_left
  1099. -   dw Movement_half_step_right
  1100. -   dw Movement_slow_step_down
  1101. -   dw Movement_slow_step_up
  1102. -   dw Movement_slow_step_left
  1103. -   dw Movement_slow_step_right
  1104. -   dw Movement_step_down
  1105. -   dw Movement_step_up
  1106. -   dw Movement_step_left
  1107. -   dw Movement_step_right
  1108. -   dw Movement_big_step_down
  1109. -   dw Movement_big_step_up
  1110. -   dw Movement_big_step_left
  1111. -   dw Movement_big_step_right
  1112. -   dw Movement_slow_slide_step_down
  1113. -   dw Movement_slow_slide_step_up
  1114. -   dw Movement_slow_slide_step_left
  1115. -   dw Movement_slow_slide_step_right
  1116. -   dw Movement_slide_step_down
  1117. -   dw Movement_slide_step_up
  1118. -   dw Movement_slide_step_left
  1119. -   dw Movement_slide_step_right
  1120. -   dw Movement_fast_slide_step_down
  1121. -   dw Movement_fast_slide_step_up
  1122. -   dw Movement_fast_slide_step_left
  1123. -   dw Movement_fast_slide_step_right
  1124. -   dw Movement_turn_away_down
  1125. -   dw Movement_turn_away_up
  1126. -   dw Movement_turn_away_left
  1127. -   dw Movement_turn_away_right
  1128. -   dw Movement_turn_in_down
  1129. -   dw Movement_turn_in_up
  1130. -   dw Movement_turn_in_left
  1131. -   dw Movement_turn_in_right
  1132. -   dw Movement_turn_waterfall_down
  1133. -   dw Movement_turn_waterfall_up
  1134. -   dw Movement_turn_waterfall_left
  1135. -   dw Movement_turn_waterfall_right
  1136. -   dw Movement_slow_jump_step_down
  1137. -   dw Movement_slow_jump_step_up
  1138. -   dw Movement_slow_jump_step_left
  1139. -   dw Movement_slow_jump_step_right
  1140. -   dw Movement_jump_step_down
  1141. -   dw Movement_jump_step_up
  1142. -   dw Movement_jump_step_left
  1143. -   dw Movement_jump_step_right
  1144. -   dw Movement_fast_jump_step_down
  1145. -   dw Movement_fast_jump_step_up
  1146. -   dw Movement_fast_jump_step_left
  1147. -   dw Movement_fast_jump_step_right
  1148. -   dw Function5293
  1149. -   dw Function529c
  1150. -   dw Movement_remove_fixed_facing
  1151. -   dw Movement_fix_facing
  1152. -   dw Function52b7
  1153. -   dw Movement_hide_person
  1154. -   dw Movement_show_person
  1155. -   dw Function5226
  1156. -   dw Function522a
  1157. -   dw Function522e
  1158. -   dw Function5232
  1159. -   dw Function5236
  1160. -   dw Function523a
  1161. -   dw Movement_accelerate_last
  1162. -   dw Movement_step_sleep
  1163. -   dw Movement_step_end
  1164. -   dw Function51db
  1165. -   dw Movement_remove_person
  1166. -   dw Function51b8
  1167. -   dw Function5210
  1168. -   dw Movement_teleport_from
  1169. -   dw Movement_teleport_to
  1170. -   dw Movement_skyfall
  1171. -   dw Movement_step_wait5
  1172. -   dw Function525f
  1173. -   dw Function5189
  1174. -   dw Function51ab
  1175. -   dw Movement_hide_emote
  1176. -   dw Movement_show_emote
  1177. -   dw Movement_step_shake
  1178. -   dw Function5279
  1179. -   dw Function5196
  1180. -   dw Function516a
  1181. -   dw Function513e
  1182. +   dw Movement_turn_head_down        ; 00
  1183. +   dw Movement_turn_head_up          ; 01
  1184. +   dw Movement_turn_head_left        ; 02
  1185. +   dw Movement_turn_head_right       ; 03
  1186. +   dw Movement_half_step_down        ; 04
  1187. +   dw Movement_half_step_up          ; 05
  1188. +   dw Movement_half_step_left        ; 06
  1189. +   dw Movement_half_step_right       ; 07
  1190. +   dw Movement_slow_step_down        ; 08
  1191. +   dw Movement_slow_step_up          ; 09
  1192. +   dw Movement_slow_step_left        ; 0a
  1193. +   dw Movement_slow_step_right       ; 0b
  1194. +   dw Movement_step_down             ; 0c
  1195. +   dw Movement_step_up               ; 0d
  1196. +   dw Movement_step_left             ; 0e
  1197. +   dw Movement_step_right            ; 0f
  1198. +   dw Movement_big_step_down         ; 10
  1199. +   dw Movement_big_step_up           ; 11
  1200. +   dw Movement_big_step_left         ; 12
  1201. +   dw Movement_big_step_right        ; 13
  1202. +   dw Movement_slow_slide_step_down  ; 14
  1203. +   dw Movement_slow_slide_step_up    ; 15
  1204. +   dw Movement_slow_slide_step_left  ; 16
  1205. +   dw Movement_slow_slide_step_right ; 17
  1206. +   dw Movement_slide_step_down       ; 18
  1207. +   dw Movement_slide_step_up         ; 19
  1208. +   dw Movement_slide_step_left       ; 1a
  1209. +   dw Movement_slide_step_right      ; 1b
  1210. +   dw Movement_fast_slide_step_down  ; 1c
  1211. +   dw Movement_fast_slide_step_up    ; 1d
  1212. +   dw Movement_fast_slide_step_left  ; 1e
  1213. +   dw Movement_fast_slide_step_right ; 1f
  1214. +   dw Movement_turn_away_down        ; 20
  1215. +   dw Movement_turn_away_up          ; 21
  1216. +   dw Movement_turn_away_left        ; 22
  1217. +   dw Movement_turn_away_right       ; 23
  1218. +   dw Movement_turn_in_down          ; 24
  1219. +   dw Movement_turn_in_up            ; 25
  1220. +   dw Movement_turn_in_left          ; 26
  1221. +   dw Movement_turn_in_right         ; 27
  1222. +   dw Movement_turn_waterfall_down   ; 28
  1223. +   dw Movement_turn_waterfall_up     ; 29
  1224. +   dw Movement_turn_waterfall_left   ; 2a
  1225. +   dw Movement_turn_waterfall_right  ; 2b
  1226. +   dw Movement_slow_jump_step_down   ; 2c
  1227. +   dw Movement_slow_jump_step_up     ; 2d
  1228. +   dw Movement_slow_jump_step_left   ; 2e
  1229. +   dw Movement_slow_jump_step_right  ; 2f
  1230. +   dw Movement_jump_step_down        ; 30
  1231. +   dw Movement_jump_step_up          ; 31
  1232. +   dw Movement_jump_step_left        ; 32
  1233. +   dw Movement_jump_step_right       ; 33
  1234. +   dw Movement_fast_jump_step_down   ; 34
  1235. +   dw Movement_fast_jump_step_up     ; 35
  1236. +   dw Movement_fast_jump_step_left   ; 36
  1237. +   dw Movement_fast_jump_step_right  ; 37
  1238. +   dw Movement_38                    ; 38
  1239. +   dw Movement_39                    ; 39
  1240. +   dw Movement_remove_fixed_facing   ; 3a
  1241. +   dw Movement_fix_facing            ; 3b
  1242. +   dw Movement_3c                    ; 3c
  1243. +   dw Movement_hide_person           ; 3d
  1244. +   dw Movement_show_person           ; 3e
  1245. +   dw Movement_3f                    ; 3f
  1246. +   dw Movement_40                    ; 40
  1247. +   dw Movement_41                    ; 41
  1248. +   dw Movement_42                    ; 42
  1249. +   dw Movement_43                    ; 43
  1250. +   dw Movement_44                    ; 44
  1251. +   dw Movement_accelerate_last       ; 45
  1252. +   dw Movement_step_sleep            ; 46
  1253. +   dw Movement_step_end              ; 47
  1254. +   dw Movement_48                    ; 48
  1255. +   dw Movement_remove_person         ; 49
  1256. +   dw Movement_4a                    ; 4a
  1257. +   dw Movement_4b                    ; 4b
  1258. +   dw Movement_teleport_from         ; 4c
  1259. +   dw Movement_teleport_to           ; 4d
  1260. +   dw Movement_skyfall               ; 4e
  1261. +   dw Movement_step_wait5            ; 4f
  1262. +   dw Movement_50                    ; 50
  1263. +   dw Movement_51                    ; 51
  1264. +   dw Movement_52                    ; 52
  1265. +   dw Movement_hide_emote            ; 53
  1266. +   dw Movement_show_emote            ; 54
  1267. +   dw Movement_step_shake            ; 55
  1268. +   dw Movement_56                    ; 56
  1269. +   dw Movement_57                    ; 57
  1270. +   dw Movement_58                    ; 58
  1271. +   dw Movement_59                    ; 59
  1272.  ; 5129
  1273.  
  1274.  
  1275.  Movement_teleport_from: ; 5129
  1276. -   ld hl, $0009
  1277. +   ld hl, OBJECT_09
  1278.     add hl, bc
  1279.     ld [hl], $c
  1280.     ret
  1281.  ; 5130
  1282.  
  1283.  Movement_teleport_to: ; 5130
  1284. -   ld hl, $0009
  1285. +   ld hl, OBJECT_09
  1286.     add hl, bc
  1287.     ld [hl], $d
  1288.     ret
  1289.  ; 5137
  1290.  
  1291.  Movement_skyfall: ; 5137
  1292. -   ld hl, $0009
  1293. +   ld hl, OBJECT_09
  1294.     add hl, bc
  1295.     ld [hl], $e
  1296.     ret
  1297.  ; 513e
  1298.  
  1299. -Function513e: ; 513e
  1300. -   ld hl, $0009
  1301. +Movement_59: ; 513e
  1302. +   ld hl, OBJECT_09
  1303.     add hl, bc
  1304.     ld [hl], $19
  1305.     ret
  1306. @@ -124,81 +124,81 @@ Movement_step_wait5: ; 5145
  1307.     call GetSpriteDirection
  1308.     rlca
  1309.     rlca
  1310. -   ld hl, $000c
  1311. +   ld hl, OBJECT_12
  1312.     add hl, bc
  1313.     ld [hl], a
  1314. -   ld hl, $000b
  1315. +   ld hl, OBJECT_11
  1316.     add hl, bc
  1317.     ld [hl], $4
  1318.     call GetMovementByte
  1319. -   ld hl, $000a
  1320. +   ld hl, OBJECT_STEP_DURATION
  1321.     add hl, bc
  1322.     ld [hl], a
  1323. -   ld hl, $0009
  1324. +   ld hl, OBJECT_09
  1325.     add hl, bc
  1326.     ld [hl], $3
  1327. -   ld hl, $0007
  1328. +   ld hl, OBJECT_DIRECTION_WALKING
  1329.     add hl, bc
  1330.     ld [hl], $ff
  1331.     ret
  1332.  ; 516a
  1333.  
  1334. -Function516a: ; 516a
  1335. +Movement_58: ; 516a
  1336.     call GetSpriteDirection
  1337.     rlca
  1338.     rlca
  1339. -   ld hl, $000c
  1340. +   ld hl, OBJECT_12
  1341.     add hl, bc
  1342.     ld [hl], a
  1343.     call GetMovementByte
  1344. -   ld hl, $000a
  1345. +   ld hl, OBJECT_STEP_DURATION
  1346.     add hl, bc
  1347.     ld [hl], a
  1348. -   ld hl, $0007
  1349. +   ld hl, OBJECT_DIRECTION_WALKING
  1350.     add hl, bc
  1351.     ld [hl], $ff
  1352. -   ld hl, $0009
  1353. +   ld hl, OBJECT_09
  1354.     add hl, bc
  1355.     ld [hl], $12
  1356.     ret
  1357.  ; 5189
  1358.  
  1359. -Function5189: ; 5189
  1360. -   ld hl, $000b
  1361. +Movement_51: ; 5189
  1362. +   ld hl, OBJECT_11
  1363.     add hl, bc
  1364.     ld [hl], $6
  1365. -   ld hl, $0009
  1366. +   ld hl, OBJECT_09
  1367.     add hl, bc
  1368.     ld [hl], $10
  1369.     ret
  1370.  ; 5196
  1371.  
  1372. -Function5196: ; 5196
  1373. +Movement_57: ; 5196
  1374.     call GetMovementByte
  1375. -   ld hl, $000a
  1376. +   ld hl, OBJECT_STEP_DURATION
  1377.     add hl, bc
  1378.     ld [hl], a
  1379. -   ld hl, $000b
  1380. +   ld hl, OBJECT_11
  1381.     add hl, bc
  1382.     ld [hl], $1
  1383. -   ld hl, $0009
  1384. +   ld hl, OBJECT_09
  1385.     add hl, bc
  1386.     ld [hl], $11
  1387.     ret
  1388.  ; 51ab
  1389.  
  1390. -Function51ab: ; 51ab
  1391. -   ld hl, $000b
  1392. +Movement_52: ; 51ab
  1393. +   ld hl, OBJECT_11
  1394.     add hl, bc
  1395.     ld [hl], $6
  1396. -   ld hl, $0009
  1397. +   ld hl, OBJECT_09
  1398.     add hl, bc
  1399.     ld [hl], $1
  1400.     ret
  1401.  ; 51b8
  1402.  
  1403. -Function51b8: ; 51b8
  1404. -   ld hl, $001b
  1405. +Movement_4a: ; 51b8
  1406. +   ld hl, OBJECT_27
  1407.     add hl, bc
  1408.     ld [hl], $0
  1409.     jp Function5065
  1410. @@ -206,33 +206,33 @@ Function51b8: ; 51b8
  1411.  
  1412.  Movement_step_end: ; 51c1
  1413.     call Function4769
  1414. -   ld hl, $0003
  1415. +   ld hl, OBJECT_03
  1416.     add hl, bc
  1417.     ld [hl], a
  1418. -   ld hl, $001b
  1419. +   ld hl, OBJECT_27
  1420.     add hl, bc
  1421.     ld [hl], $0
  1422.     ld hl, VramState
  1423.     res 7, [hl]
  1424. -   ld hl, $0009
  1425. +   ld hl, OBJECT_09
  1426.     add hl, bc
  1427.     ld [hl], $1
  1428.     ret
  1429.  ; 51db
  1430.  
  1431. -Function51db: ; 51db
  1432. +Movement_48: ; 51db
  1433.     call Function4769
  1434. -   ld hl, $0003
  1435. +   ld hl, OBJECT_03
  1436.     add hl, bc
  1437.     ld [hl], a
  1438. -   ld hl, $001b
  1439. +   ld hl, OBJECT_27
  1440.     add hl, bc
  1441.     ld [hl], $0
  1442.     call GetMovementByte
  1443. -   ld hl, $000a
  1444. +   ld hl, OBJECT_STEP_DURATION
  1445.     add hl, bc
  1446.     ld [hl], a
  1447. -   ld hl, $0009
  1448. +   ld hl, OBJECT_09
  1449.     add hl, bc
  1450.     ld [hl], $3
  1451.     ld hl, VramState
  1452. @@ -243,7 +243,7 @@ Function51db: ; 51db
  1453.  Movement_remove_person: ; 51fd
  1454.     call Function4357
  1455.     ld hl, wd4cd
  1456. -   ld a, [hConnectionStripLength]
  1457. +   ld a, [hMapObjectIndexBuffer1]
  1458.     cp [hl]
  1459.     jr nz, .asm_520a
  1460.     ld [hl], $ff
  1461. @@ -254,11 +254,11 @@ Movement_remove_person: ; 51fd
  1462.     ret
  1463.  ; 5210
  1464.  
  1465. -Function5210: ; 5210
  1466. -   ld hl, $000b
  1467. +Movement_4b: ; 5210
  1468. +   ld hl, OBJECT_11
  1469.     add hl, bc
  1470.     ld [hl], $1
  1471. -   ld hl, $0009
  1472. +   ld hl, OBJECT_09
  1473.     add hl, bc
  1474.     ld [hl], $4
  1475.     ld hl, VramState
  1476. @@ -270,27 +270,27 @@ Movement_show_person: ; 5222
  1477.     ld a, $1
  1478.     jr Function5247
  1479.  
  1480. -Function5226: ; 5226
  1481. +Movement_3f: ; 5226
  1482.     ld a, $2
  1483.     jr Function5247
  1484.  
  1485. -Function522a: ; 522a
  1486. +Movement_40: ; 522a
  1487.     ld a, $3
  1488.     jr Function5247
  1489.  
  1490. -Function522e: ; 522e
  1491. +Movement_41: ; 522e
  1492.     ld a, $4
  1493.     jr Function5247
  1494.  
  1495. -Function5232: ; 5232
  1496. +Movement_42: ; 5232
  1497.     ld a, $5
  1498.     jr Function5247
  1499.  
  1500. -Function5236: ; 5236
  1501. +Movement_43: ; 5236
  1502.     ld a, $6
  1503.     jr Function5247
  1504.  
  1505. -Function523a: ; 523a
  1506. +Movement_44: ; 523a
  1507.     ld a, $7
  1508.     jr Function5247
  1509.  
  1510. @@ -306,92 +306,92 @@ Movement_step_sleep: ; 5242
  1511.     jr Function5247
  1512.  
  1513.  Function5247: ; 5247
  1514. -   ld hl, $000a
  1515. +   ld hl, OBJECT_STEP_DURATION
  1516.     add hl, bc
  1517.     ld [hl], a
  1518. -   ld hl, $0009
  1519. +   ld hl, OBJECT_09
  1520.     add hl, bc
  1521.     ld [hl], $3
  1522. -   ld hl, $000b
  1523. +   ld hl, OBJECT_11
  1524.     add hl, bc
  1525.     ld [hl], $1
  1526. -   ld hl, $0007
  1527. +   ld hl, OBJECT_DIRECTION_WALKING
  1528.     add hl, bc
  1529.     ld [hl], $ff
  1530.     ret
  1531.  ; 525f
  1532.  
  1533. -Function525f: ; 525f
  1534. +Movement_50: ; 525f
  1535.     ld a, $1
  1536. -   ld hl, $000a
  1537. +   ld hl, OBJECT_STEP_DURATION
  1538.     add hl, bc
  1539.     ld [hl], a
  1540. -   ld hl, $0009
  1541. +   ld hl, OBJECT_09
  1542.     add hl, bc
  1543.     ld [hl], $b
  1544. -   ld hl, $000b
  1545. +   ld hl, OBJECT_11
  1546.     add hl, bc
  1547.     ld [hl], $3
  1548. -   ld hl, $0007
  1549. +   ld hl, OBJECT_DIRECTION_WALKING
  1550.     add hl, bc
  1551.     ld [hl], $ff
  1552.     ret
  1553.  ; 5279
  1554.  
  1555. -Function5279: ; 5279
  1556. +Movement_56: ; 5279
  1557.     ld a, $18
  1558. -   ld hl, $000a
  1559. +   ld hl, OBJECT_STEP_DURATION
  1560.     add hl, bc
  1561.     ld [hl], a
  1562. -   ld hl, $0009
  1563. +   ld hl, OBJECT_09
  1564.     add hl, bc
  1565.     ld [hl], $3
  1566. -   ld hl, $000b
  1567. +   ld hl, OBJECT_11
  1568.     add hl, bc
  1569.     ld [hl], $b
  1570. -   ld hl, $0007
  1571. +   ld hl, OBJECT_DIRECTION_WALKING
  1572.     add hl, bc
  1573.     ld [hl], $ff
  1574.     ret
  1575.  ; 5293
  1576.  
  1577. -Function5293: ; 5293
  1578. -   ld hl, $0004
  1579. +Movement_38: ; 5293
  1580. +   ld hl, OBJECT_FLAGS1
  1581.     add hl, bc
  1582.     res 3, [hl]
  1583.     jp Function5065
  1584.  ; 529c
  1585.  
  1586. -Function529c: ; 529c
  1587. -   ld hl, $0004
  1588. +Movement_39: ; 529c
  1589. +   ld hl, OBJECT_FLAGS1
  1590.     add hl, bc
  1591.     set 3, [hl]
  1592.     jp Function5065
  1593.  ; 52a5
  1594.  
  1595.  Movement_remove_fixed_facing: ; 52a5
  1596. -   ld hl, $0004
  1597. +   ld hl, OBJECT_FLAGS1
  1598.     add hl, bc
  1599.     res 2, [hl]
  1600.     jp Function5065
  1601.  ; 52ae
  1602.  
  1603.  Movement_fix_facing: ; 52ae
  1604. -   ld hl, $0004
  1605. +   ld hl, OBJECT_FLAGS1
  1606.     add hl, bc
  1607.     set 2, [hl]
  1608.     jp Function5065
  1609.  ; 52b7
  1610.  
  1611. -Function52b7: ; 52b7
  1612. -   ld hl, $0004
  1613. +Movement_3c: ; 52b7
  1614. +   ld hl, OBJECT_FLAGS1
  1615.     add hl, bc
  1616.     res 0, [hl]
  1617.     jp Function5065
  1618.  ; 52c0
  1619.  
  1620.  Movement_hide_person: ; 52c0
  1621. -   ld hl, $0004
  1622. +   ld hl, OBJECT_FLAGS1
  1623.     add hl, bc
  1624.     set 0, [hl]
  1625.     jp Function5065
  1626. @@ -417,311 +417,311 @@ Movement_step_shake: ; 52d5
  1627.  ; 52de
  1628.  
  1629.  Movement_turn_head_down: ; 52de
  1630. -   ld a, $0
  1631. -   jr Function52ee
  1632. +   ld a, OW_DOWN
  1633. +   jr TurnHead
  1634.  
  1635.  Movement_turn_head_up: ; 52e2
  1636. -   ld a, $4
  1637. -   jr Function52ee
  1638. +   ld a, OW_UP
  1639. +   jr TurnHead
  1640.  
  1641.  Movement_turn_head_left: ; 52e6
  1642. -   ld a, $8
  1643. -   jr Function52ee
  1644. +   ld a, OW_LEFT
  1645. +   jr TurnHead
  1646.  
  1647.  Movement_turn_head_right: ; 52ea
  1648. -   ld a, $c
  1649. -   jr Function52ee
  1650. +   ld a, OW_RIGHT
  1651. +   jr TurnHead
  1652.  
  1653. -Function52ee: ; 52ee
  1654. -   ld hl, $0008
  1655. +TurnHead: ; 52ee
  1656. +   ld hl, OBJECT_FACING
  1657.     add hl, bc
  1658.     ld [hl], a
  1659. -   ld hl, $000b
  1660. +   ld hl, OBJECT_11
  1661.     add hl, bc
  1662.     ld [hl], $1
  1663. -   ld hl, $0007
  1664. +   ld hl, OBJECT_DIRECTION_WALKING
  1665.     add hl, bc
  1666.     ld [hl], $ff
  1667.     ret
  1668.  ; 5300
  1669.  
  1670.  Movement_slow_step_down: ; 5300
  1671. -   ld a, $0
  1672. -   jp Function5412
  1673. +   ld a, STEP_SLOW << 2 | DOWN
  1674. +   jp NormalStep
  1675.  ; 5305
  1676.  
  1677.  Movement_slow_step_up: ; 5305
  1678. -   ld a, $1
  1679. -   jp Function5412
  1680. +   ld a, STEP_SLOW << 2 | UP
  1681. +   jp NormalStep
  1682.  ; 530a
  1683.  
  1684.  Movement_slow_step_left: ; 530a
  1685. -   ld a, $2
  1686. -   jp Function5412
  1687. +   ld a, STEP_SLOW << 2 | LEFT
  1688. +   jp NormalStep
  1689.  ; 530f
  1690.  
  1691.  Movement_slow_step_right: ; 530f
  1692. -   ld a, $3
  1693. -   jp Function5412
  1694. +   ld a, STEP_SLOW << 2 | RIGHT
  1695. +   jp NormalStep
  1696.  ; 5314
  1697.  
  1698.  Movement_step_down: ; 5314
  1699. -   ld a, $4
  1700. -   jp Function5412
  1701. +   ld a, STEP_WALK << 2 | DOWN
  1702. +   jp NormalStep
  1703.  ; 5319
  1704.  
  1705.  Movement_step_up: ; 5319
  1706. -   ld a, $5
  1707. -   jp Function5412
  1708. +   ld a, STEP_WALK << 2 | UP
  1709. +   jp NormalStep
  1710.  ; 531e
  1711.  
  1712.  Movement_step_left: ; 531e
  1713. -   ld a, $6
  1714. -   jp Function5412
  1715. +   ld a, STEP_WALK << 2 | LEFT
  1716. +   jp NormalStep
  1717.  ; 5323
  1718.  
  1719.  Movement_step_right: ; 5323
  1720. -   ld a, $7
  1721. -   jp Function5412
  1722. +   ld a, STEP_WALK << 2 | RIGHT
  1723. +   jp NormalStep
  1724.  ; 5328
  1725.  
  1726.  Movement_big_step_down: ; 5328
  1727. -   ld a, $8
  1728. -   jp Function5412
  1729. +   ld a, STEP_BIKE << 2 | DOWN
  1730. +   jp NormalStep
  1731.  ; 532d
  1732.  
  1733.  Movement_big_step_up: ; 532d
  1734. -   ld a, $9
  1735. -   jp Function5412
  1736. +   ld a, STEP_BIKE << 2 | UP
  1737. +   jp NormalStep
  1738.  ; 5332
  1739.  
  1740.  Movement_big_step_left: ; 5332
  1741. -   ld a, $a
  1742. -   jp Function5412
  1743. +   ld a, STEP_BIKE << 2 | LEFT
  1744. +   jp NormalStep
  1745.  ; 5337
  1746.  
  1747.  Movement_big_step_right: ; 5337
  1748. -   ld a, $b
  1749. -   jp Function5412
  1750. +   ld a, STEP_BIKE << 2 | RIGHT
  1751. +   jp NormalStep
  1752.  ; 533c
  1753.  
  1754.  
  1755.  Movement_turn_away_down: ; 533c
  1756. -   ld a, $0
  1757. -   jp Function5446
  1758. +   ld a, STEP_SLOW << 2 | DOWN
  1759. +   jp TurningStep
  1760.  ; 5341
  1761.  
  1762.  Movement_turn_away_up: ; 5341
  1763. -   ld a, $1
  1764. -   jp Function5446
  1765. +   ld a, STEP_SLOW << 2 | UP
  1766. +   jp TurningStep
  1767.  ; 5346
  1768.  
  1769.  Movement_turn_away_left: ; 5346
  1770. -   ld a, $2
  1771. -   jp Function5446
  1772. +   ld a, STEP_SLOW << 2 | LEFT
  1773. +   jp TurningStep
  1774.  ; 534b
  1775.  
  1776.  Movement_turn_away_right: ; 534b
  1777. -   ld a, $3
  1778. -   jp Function5446
  1779. +   ld a, STEP_SLOW << 2 | RIGHT
  1780. +   jp TurningStep
  1781.  ; 5350
  1782.  
  1783.  Movement_turn_in_down: ; 5350
  1784. -   ld a, $4
  1785. -   jp Function5446
  1786. +   ld a, STEP_WALK << 2 | DOWN
  1787. +   jp TurningStep
  1788.  ; 5355
  1789.  
  1790.  Movement_turn_in_up: ; 5355
  1791. -   ld a, $5
  1792. -   jp Function5446
  1793. +   ld a, STEP_WALK << 2 | UP
  1794. +   jp TurningStep
  1795.  ; 535a
  1796.  
  1797.  Movement_turn_in_left: ; 535a
  1798. -   ld a, $6
  1799. -   jp Function5446
  1800. +   ld a, STEP_WALK << 2 | LEFT
  1801. +   jp TurningStep
  1802.  ; 535f
  1803.  
  1804.  Movement_turn_in_right: ; 535f
  1805. -   ld a, $7
  1806. -   jp Function5446
  1807. +   ld a, STEP_WALK << 2 | RIGHT
  1808. +   jp TurningStep
  1809.  ; 5364
  1810.  
  1811.  Movement_turn_waterfall_down: ; 5364
  1812. -   ld a, $8
  1813. -   jp Function5446
  1814. +   ld a, STEP_BIKE << 2 | DOWN
  1815. +   jp TurningStep
  1816.  ; 5369
  1817.  
  1818.  Movement_turn_waterfall_up: ; 5369
  1819. -   ld a, $9
  1820. -   jp Function5446
  1821. +   ld a, STEP_BIKE << 2 | UP
  1822. +   jp TurningStep
  1823.  ; 536e
  1824.  
  1825.  Movement_turn_waterfall_left: ; 536e
  1826. -   ld a, $a
  1827. -   jp Function5446
  1828. +   ld a, STEP_BIKE << 2 | LEFT
  1829. +   jp TurningStep
  1830.  ; 5373
  1831.  
  1832.  Movement_turn_waterfall_right: ; 5373
  1833. -   ld a, $b
  1834. -   jp Function5446
  1835. +   ld a, STEP_BIKE << 2 | RIGHT
  1836. +   jp TurningStep
  1837.  ; 5378
  1838.  
  1839.  
  1840.  Movement_slow_slide_step_down: ; 5378
  1841. -   ld a, $0
  1842. -   jp Function5468
  1843. +   ld a, STEP_SLOW << 2 | DOWN
  1844. +   jp SlideStep
  1845.  ; 537d
  1846.  
  1847.  Movement_slow_slide_step_up: ; 537d
  1848. -   ld a, $1
  1849. -   jp Function5468
  1850. +   ld a, STEP_SLOW << 2 | UP
  1851. +   jp SlideStep
  1852.  ; 5382
  1853.  
  1854.  Movement_slow_slide_step_left: ; 5382
  1855. -   ld a, $2
  1856. -   jp Function5468
  1857. +   ld a, STEP_SLOW << 2 | LEFT
  1858. +   jp SlideStep
  1859.  ; 5387
  1860.  
  1861.  Movement_slow_slide_step_right: ; 5387
  1862. -   ld a, $3
  1863. -   jp Function5468
  1864. +   ld a, STEP_SLOW << 2 | RIGHT
  1865. +   jp SlideStep
  1866.  ; 538c
  1867.  
  1868.  Movement_slide_step_down: ; 538c
  1869. -   ld a, $4
  1870. -   jp Function5468
  1871. +   ld a, STEP_WALK << 2 | DOWN
  1872. +   jp SlideStep
  1873.  ; 5391
  1874.  
  1875.  Movement_slide_step_up: ; 5391
  1876. -   ld a, $5
  1877. -   jp Function5468
  1878. +   ld a, STEP_WALK << 2 | UP
  1879. +   jp SlideStep
  1880.  ; 5396
  1881.  
  1882.  Movement_slide_step_left: ; 5396
  1883. -   ld a, $6
  1884. -   jp Function5468
  1885. +   ld a, STEP_WALK << 2 | LEFT
  1886. +   jp SlideStep
  1887.  ; 539b
  1888.  
  1889.  Movement_slide_step_right: ; 539b
  1890. -   ld a, $7
  1891. -   jp Function5468
  1892. +   ld a, STEP_WALK << 2 | RIGHT
  1893. +   jp SlideStep
  1894.  ; 53a0
  1895.  
  1896.  Movement_fast_slide_step_down: ; 53a0
  1897. -   ld a, $8
  1898. -   jp Function5468
  1899. +   ld a, STEP_BIKE << 2 | DOWN
  1900. +   jp SlideStep
  1901.  ; 53a5
  1902.  
  1903.  Movement_fast_slide_step_up: ; 53a5
  1904. -   ld a, $9
  1905. -   jp Function5468
  1906. +   ld a, STEP_BIKE << 2 | UP
  1907. +   jp SlideStep
  1908.  ; 53aa
  1909.  
  1910.  Movement_fast_slide_step_left: ; 53aa
  1911. -   ld a, $a
  1912. -   jp Function5468
  1913. +   ld a, STEP_BIKE << 2 | LEFT
  1914. +   jp SlideStep
  1915.  ; 53af
  1916.  
  1917.  Movement_fast_slide_step_right: ; 53af
  1918. -   ld a, $b
  1919. -   jp Function5468
  1920. +   ld a, STEP_BIKE << 2 | RIGHT
  1921. +   jp SlideStep
  1922.  ; 53b4
  1923.  
  1924.  
  1925.  Movement_slow_jump_step_down: ; 53b4
  1926. -   ld a, $0
  1927. -   jp Function548a
  1928. +   ld a, STEP_SLOW << 2 | DOWN
  1929. +   jp JumpStep
  1930.  ; 53b9
  1931.  
  1932.  Movement_slow_jump_step_up: ; 53b9
  1933. -   ld a, $1
  1934. -   jp Function548a
  1935. +   ld a, STEP_SLOW << 2 | UP
  1936. +   jp JumpStep
  1937.  ; 53be
  1938.  
  1939.  Movement_slow_jump_step_left: ; 53be
  1940. -   ld a, $2
  1941. -   jp Function548a
  1942. +   ld a, STEP_SLOW << 2 | LEFT
  1943. +   jp JumpStep
  1944.  ; 53c3
  1945.  
  1946.  Movement_slow_jump_step_right: ; 53c3
  1947. -   ld a, $3
  1948. -   jp Function548a
  1949. +   ld a, STEP_SLOW << 2 | RIGHT
  1950. +   jp JumpStep
  1951.  ; 53c8
  1952.  
  1953.  Movement_jump_step_down: ; 53c8
  1954. -   ld a, $4
  1955. -   jp Function548a
  1956. +   ld a, STEP_WALK << 2 | DOWN
  1957. +   jp JumpStep
  1958.  ; 53cd
  1959.  
  1960.  Movement_jump_step_up: ; 53cd
  1961. -   ld a, $5
  1962. -   jp Function548a
  1963. +   ld a, STEP_WALK << 2 | UP
  1964. +   jp JumpStep
  1965.  ; 53d2
  1966.  
  1967.  Movement_jump_step_left: ; 53d2
  1968. -   ld a, $6
  1969. -   jp Function548a
  1970. +   ld a, STEP_WALK << 2 | LEFT
  1971. +   jp JumpStep
  1972.  ; 53d7
  1973.  
  1974.  Movement_jump_step_right: ; 53d7
  1975. -   ld a, $7
  1976. -   jp Function548a
  1977. +   ld a, STEP_WALK << 2 | RIGHT
  1978. +   jp JumpStep
  1979.  ; 53dc
  1980.  
  1981.  Movement_fast_jump_step_down: ; 53dc
  1982. -   ld a, $8
  1983. -   jp Function548a
  1984. +   ld a, STEP_BIKE << 2 | DOWN
  1985. +   jp JumpStep
  1986.  ; 53e1
  1987.  
  1988.  Movement_fast_jump_step_up: ; 53e1
  1989. -   ld a, $9
  1990. -   jp Function548a
  1991. +   ld a, STEP_BIKE << 2 | UP
  1992. +   jp JumpStep
  1993.  ; 53e6
  1994.  
  1995.  Movement_fast_jump_step_left: ; 53e6
  1996. -   ld a, $a
  1997. -   jp Function548a
  1998. +   ld a, STEP_BIKE << 2 | LEFT
  1999. +   jp JumpStep
  2000.  ; 53eb
  2001.  
  2002.  Movement_fast_jump_step_right: ; 53eb
  2003. -   ld a, $b
  2004. -   jp Function548a
  2005. +   ld a, STEP_BIKE << 2 | RIGHT
  2006. +   jp JumpStep
  2007.  ; 53f0
  2008.  
  2009.  
  2010.  Movement_half_step_down: ; 53f0
  2011. -   ld a, $0
  2012. -   jr Function5400
  2013. +   ld a, OW_DOWN
  2014. +   jr HalfStep
  2015.  
  2016.  Movement_half_step_up: ; 53f4
  2017. -   ld a, $4
  2018. -   jr Function5400
  2019. +   ld a, OW_UP
  2020. +   jr HalfStep
  2021.  
  2022.  Movement_half_step_left: ; 53f8
  2023. -   ld a, $8
  2024. -   jr Function5400
  2025. +   ld a, OW_LEFT
  2026. +   jr HalfStep
  2027.  
  2028.  Movement_half_step_right: ; 53fc
  2029. -   ld a, $c
  2030. -   jr Function5400
  2031. +   ld a, OW_RIGHT
  2032. +   jr HalfStep
  2033.  
  2034. -Function5400: ; 5400
  2035. -   ld hl, $001d
  2036. +HalfStep: ; 5400
  2037. +   ld hl, OBJECT_29
  2038.     add hl, bc
  2039.     ld [hl], a
  2040. -   ld hl, $000b
  2041. +   ld hl, OBJECT_11
  2042.     add hl, bc
  2043.     ld [hl], $2
  2044. -   ld hl, $0009
  2045. +   ld hl, OBJECT_09
  2046.     add hl, bc
  2047.     ld [hl], $a
  2048.     ret
  2049.  ; 5412
  2050.  
  2051. -Function5412: ; 5412
  2052. +NormalStep: ; 5412
  2053.     call Function4690
  2054.     call Function463f
  2055. -   ld hl, $000b
  2056. +   ld hl, OBJECT_11
  2057.     add hl, bc
  2058.     ld [hl], $2
  2059.     ld hl, OBJECT_STANDING_TILE
  2060. @@ -738,91 +738,91 @@ Function5412: ; 5412
  2061.  
  2062.  .asm_5430
  2063.     ld hl, wd4cf
  2064. -   ld a, [hConnectionStripLength]
  2065. +   ld a, [hMapObjectIndexBuffer1]
  2066.     cp [hl]
  2067.     jr z, .asm_543f
  2068.  
  2069. -   ld hl, $0009
  2070. +   ld hl, OBJECT_09
  2071.     add hl, bc
  2072.     ld [hl], $2
  2073.     ret
  2074.  
  2075.  .asm_543f
  2076. -   ld hl, $0009
  2077. +   ld hl, OBJECT_09
  2078.     add hl, bc
  2079.     ld [hl], $6
  2080.     ret
  2081.  ; 5446
  2082.  
  2083. -Function5446: ; 5446
  2084. +TurningStep: ; 5446
  2085.     call Function4690
  2086.     call Function463f
  2087. -   ld hl, $000b
  2088. +   ld hl, OBJECT_11
  2089.     add hl, bc
  2090.     ld [hl], $4
  2091.     ld hl, wd4cf
  2092. -   ld a, [hConnectionStripLength]
  2093. +   ld a, [hMapObjectIndexBuffer1]
  2094.     cp [hl]
  2095.     jr z, .asm_5461
  2096. -   ld hl, $0009
  2097. +   ld hl, OBJECT_09
  2098.     add hl, bc
  2099.     ld [hl], $2
  2100.     ret
  2101.  
  2102.  .asm_5461
  2103. -   ld hl, $0009
  2104. +   ld hl, OBJECT_09
  2105.     add hl, bc
  2106.     ld [hl], $6
  2107.     ret
  2108.  ; 5468
  2109.  
  2110.  
  2111. -Function5468: ; 5468
  2112. +SlideStep: ; 5468
  2113.     call Function4690
  2114.     call Function463f
  2115. -   ld hl, $000b
  2116. +   ld hl, OBJECT_11
  2117.     add hl, bc
  2118.     ld [hl], $1
  2119.     ld hl, wd4cf
  2120. -   ld a, [hConnectionStripLength]
  2121. +   ld a, [hMapObjectIndexBuffer1]
  2122.     cp [hl]
  2123.     jr z, .asm_5483
  2124. -   ld hl, $0009
  2125. +   ld hl, OBJECT_09
  2126.     add hl, bc
  2127.     ld [hl], $2
  2128.     ret
  2129.  
  2130.  .asm_5483
  2131. -   ld hl, $0009
  2132. +   ld hl, OBJECT_09
  2133.     add hl, bc
  2134.     ld [hl], $6
  2135.     ret
  2136.  ; 548a
  2137.  
  2138.  
  2139. -Function548a: ; 548a
  2140. +JumpStep: ; 548a
  2141.     call Function4690
  2142. -   ld hl, $001f
  2143. +   ld hl, OBJECT_31
  2144.     add hl, bc
  2145.     ld [hl], $0
  2146. -   ld hl, $0005
  2147. +   ld hl, OBJECT_FLAGS2
  2148.     add hl, bc
  2149.     res 3, [hl]
  2150. -   ld hl, $000b
  2151. +   ld hl, OBJECT_11
  2152.     add hl, bc
  2153.     ld [hl], $2
  2154.     call Function5529
  2155.     ld hl, wd4cf
  2156. -   ld a, [hConnectionStripLength]
  2157. +   ld a, [hMapObjectIndexBuffer1]
  2158.     cp [hl]
  2159.     jr z, .asm_54b1
  2160. -   ld hl, $0009
  2161. +   ld hl, OBJECT_09
  2162.     add hl, bc
  2163.     ld [hl], $8
  2164.     ret
  2165.  
  2166.  .asm_54b1
  2167. -   ld hl, $0009
  2168. +   ld hl, OBJECT_09
  2169.     add hl, bc
  2170.     ld [hl], $9
  2171.     ret
  2172. diff --git a/engine/scripting.asm b/engine/scripting.asm
  2173. index 2dadafe..3aef651 100644
  2174. --- a/engine/scripting.asm
  2175. +++ b/engine/scripting.asm
  2176. @@ -1200,7 +1200,7 @@ ApplyPersonFacing: ; 0x9728b
  2177.     call Function1836
  2178.     pop bc
  2179.     jr c, .not_visible ; 0x9729c $1b
  2180. -   ld hl, OBJECT_04
  2181. +   ld hl, OBJECT_FLAGS1
  2182.     add hl, bc
  2183.     bit 2, [hl]
  2184.     jr nz, .not_visible ; 0x972a4 $13
  2185. @@ -1258,7 +1258,7 @@ Script_appear: ; 0x972dd
  2186.     call GetScriptByte
  2187.     call GetScriptPerson
  2188.     call _CopyObjectStruct
  2189. -   ld a, [hConnectionStripLength]
  2190. +   ld a, [hMapObjectIndexBuffer1]
  2191.     ld b, 0 ; clear
  2192.     call ApplyEventActionAppearDisappear
  2193.     ret
  2194. @@ -1276,7 +1276,7 @@ Script_disappear: ; 0x972ee
  2195.     ld a, [hLastTalked]
  2196.  .ok
  2197.     call DeleteObjectStruct
  2198. -   ld a, [hConnectionStripLength]
  2199. +   ld a, [hMapObjectIndexBuffer1]
  2200.     ld b, 1 ; set
  2201.     call ApplyEventActionAppearDisappear
  2202.     callba RefreshMapAppearDisappear
  2203. @@ -1390,7 +1390,7 @@ Script_loademote: ; 0x97384
  2204.     ld a, [ScriptVar]
  2205.  .not_var_emote
  2206.     ld c, a
  2207. -   callba Function1442f
  2208. +   callba LoadEmote
  2209.     ret
  2210.  ; 0x97396
  2211.  
  2212. @@ -1446,7 +1446,7 @@ Script_earthquake: ; 0x973c7
  2213.     call CopyBytes
  2214.     call GetScriptByte
  2215.     ld [wd003], a
  2216. -   and $3f
  2217. +   and (1 << 6) - 1
  2218.     ld [wd005], a
  2219.     ld b, BANK(.script)
  2220.     ld de, .script
  2221. @@ -2428,10 +2428,10 @@ Script_checkmoney: ; 0x97843
  2222.  
  2223.     call GetMoneyAccount
  2224.     call LoadMoneyAmountToMem
  2225. -   callba CheckMoney
  2226. +   callba CompareMoney
  2227.  ; 0x9784f
  2228.  
  2229. -CheckMoneyAction: ; 0x9784f
  2230. +CompareMoneyAction: ; 0x9784f
  2231.     jr c, .two
  2232.     jr z, .one
  2233.     ld a, 0
  2234. @@ -2497,12 +2497,12 @@ Script_checkcoins: ; 0x97895
  2235.  
  2236.     call LoadCoinAmountToMem
  2237.     callba CheckCoins
  2238. -   jr CheckMoneyAction
  2239. +   jr CompareMoneyAction
  2240.  ; 978a0
  2241.  
  2242.  LoadCoinAmountToMem: ; 978a0
  2243.     call GetScriptByte
  2244. -   ld [$ffc4], a
  2245. +   ld [hMoneyTemp + 1], a
  2246.     call GetScriptByte
  2247.     ld [hMoneyTemp], a
  2248.     ld bc, hMoneyTemp
  2249. diff --git a/event/battle_tower.asm b/event/battle_tower.asm
  2250. index 04f578f..6865830 100644
  2251. --- a/event/battle_tower.asm
  2252. +++ b/event/battle_tower.asm
  2253. @@ -117,7 +117,7 @@ JumpText_YouCantTakeAnEgg: ; 0x8b256
  2254.  ; 0x8b25b
  2255.  
  2256.  Function8b25b: ; 8b25b
  2257.     ld bc, $0000
  2258.  .asm_8b25e
  2259.     call Function8b26c
  2260.     call c, Function8b28e
  2261. diff --git a/event/mom.asm b/event/mom.asm
  2262. index c3e407b..e1feba8 100644
  2263. --- a/event/mom.asm
  2264. +++ b/event/mom.asm
  2265. @@ -162,7 +162,7 @@ endr
  2266.     jr z, .CancelDeposit
  2267.     ld de, Money
  2268.     ld bc, StringBuffer2
  2269. -   callba CheckMoney
  2270. +   callba CompareMoney
  2271.     jr c, .DontHaveThatMuchToDeposit
  2272.     ld hl, StringBuffer2
  2273.     ld de, StringBuffer2 + 3
  2274. @@ -234,7 +234,7 @@ endr
  2275.     call CopyBytes
  2276.     ld de, wd851
  2277.     ld bc, StringBuffer2
  2278. -   callba CheckMoney
  2279. +   callba CompareMoney
  2280.     jr c, .InsufficientFundsInBank
  2281.     ld bc, Money
  2282.     ld de, StringBuffer2
  2283. diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm
  2284. index 165cf64..f973c0a 100644
  2285. --- a/gfx/pics/animation.asm
  2286. +++ b/gfx/pics/animation.asm
  2287. @@ -445,7 +445,7 @@ PokeAnim_End: ; d02a8
  2288.  Functiond02ae: ; d02ae
  2289.     ld c, a
  2290.     ld b, $0
  2291.     ld hl, $0000
  2292.     ld a, [w2_d173]
  2293.     call AddNTimes
  2294.     ld a, h
  2295. diff --git a/home/joypad.asm b/home/joypad.asm
  2296. index d5bfc83..450fa28 100644
  2297. --- a/home/joypad.asm
  2298. +++ b/home/joypad.asm
  2299. @@ -356,14 +356,14 @@ JoyTextDelay:: ; a57
  2300.  ; a80
  2301.  
  2302.  Functiona80:: ; a80
  2303. -   ld a, [hConnectionStripLength]
  2304. +   ld a, [hMapObjectIndexBuffer1]
  2305.     push af
  2306. -   ld a, [hConnectedMapWidth]
  2307. +   ld a, [hMapObjectIndexBuffer2]
  2308.     push af
  2309.     xor a
  2310. -   ld [hConnectionStripLength], a
  2311. +   ld [hMapObjectIndexBuffer1], a
  2312.     ld a, 6
  2313. -   ld [hConnectedMapWidth], a
  2314. +   ld [hMapObjectIndexBuffer2], a
  2315.  
  2316.  .loop
  2317.     push hl
  2318. @@ -377,9 +377,9 @@ Functiona80:: ; a80
  2319.     jr z, .loop
  2320.  
  2321.     pop af
  2322. -   ld [hConnectedMapWidth], a
  2323. +   ld [hMapObjectIndexBuffer2], a
  2324.     pop af
  2325. -   ld [hConnectionStripLength], a
  2326. +   ld [hMapObjectIndexBuffer1], a
  2327.     ret
  2328.  ; aa5
  2329.  
  2330. @@ -459,37 +459,37 @@ Functionb06:: ; b06
  2331.     cp b
  2332.     pop bc
  2333.     jr nz, .asm_b27
  2334. -   ld a, [hConnectionStripLength]
  2335. +   ld a, [hMapObjectIndexBuffer1]
  2336.     dec a
  2337. -   ld [hConnectionStripLength], a
  2338. +   ld [hMapObjectIndexBuffer1], a
  2339.     ret nz
  2340. -   ld a, [hConnectedMapWidth]
  2341. +   ld a, [hMapObjectIndexBuffer2]
  2342.     dec a
  2343. -   ld [hConnectedMapWidth], a
  2344. +   ld [hMapObjectIndexBuffer2], a
  2345.     ret nz
  2346.     ld a, "─"
  2347.     ld [hl], a
  2348.     ld a, -1
  2349. -   ld [hConnectionStripLength], a
  2350. +   ld [hMapObjectIndexBuffer1], a
  2351.     ld a, 6
  2352. -   ld [hConnectedMapWidth], a
  2353. +   ld [hMapObjectIndexBuffer2], a
  2354.     ret
  2355.  
  2356.  .asm_b27
  2357. -   ld a, [hConnectionStripLength]
  2358. +   ld a, [hMapObjectIndexBuffer1]
  2359.     and a
  2360.     ret z
  2361.     dec a
  2362. -   ld [hConnectionStripLength], a
  2363. +   ld [hMapObjectIndexBuffer1], a
  2364.     ret nz
  2365.     dec a
  2366. -   ld [hConnectionStripLength], a
  2367. -   ld a, [hConnectedMapWidth]
  2368. +   ld [hMapObjectIndexBuffer1], a
  2369. +   ld a, [hMapObjectIndexBuffer2]
  2370.     dec a
  2371. -   ld [hConnectedMapWidth], a
  2372. +   ld [hMapObjectIndexBuffer2], a
  2373.     ret nz
  2374.     ld a, $6
  2375. -   ld [hConnectedMapWidth], a
  2376. +   ld [hMapObjectIndexBuffer2], a
  2377.     ld a, $ee
  2378.     ld [hl], a
  2379.     ret
  2380. diff --git a/home/map.asm b/home/map.asm
  2381. index 7f1c83b..9ddb2f8 100644
  2382. --- a/home/map.asm
  2383. +++ b/home/map.asm
  2384. @@ -729,9 +729,9 @@ ChangeMap:: ; 24e4
  2385.  
  2386.     ld hl, OverworldMap
  2387.     ld a, [MapWidth]
  2388. -   ld [hConnectedMapWidth], a
  2389. +   ld [hMapObjectIndexBuffer2], a
  2390.     add $6
  2391. -   ld [hConnectionStripLength], a
  2392. +   ld [hMapObjectIndexBuffer1], a
  2393.     ld c, a
  2394.     ld b, 0
  2395.  rept 3
  2396. @@ -750,7 +750,7 @@ endr
  2397.     ld b, a
  2398.  .asm_250c
  2399.     push hl
  2400. -   ld a, [hConnectedMapWidth]
  2401. +   ld a, [hMapObjectIndexBuffer2]
  2402.     ld c, a
  2403.  .asm_2510
  2404.     ld a, [de]
  2405. @@ -759,7 +759,7 @@ endr
  2406.     dec c
  2407.     jr nz, .asm_2510
  2408.     pop hl
  2409. -   ld a, [hConnectionStripLength]
  2410. +   ld a, [hMapObjectIndexBuffer1]
  2411.     add l
  2412.     ld l, a
  2413.     jr nc, .asm_251e
  2414. @@ -794,10 +794,10 @@ FillMapConnections:: ; 2524
  2415.     ld e, a
  2416.     ld a, [NorthConnectionStripLocation + 1]
  2417.     ld d, a
  2418. -   ld a, [NorthConnectionStripLength]
  2419. -   ld [hConnectionStripLength], a
  2420. -   ld a, [NorthConnectedMapWidth]
  2421. -   ld [hConnectedMapWidth], a
  2422. +   ld a, [NorthMapObjectIndexBuffer1]
  2423. +   ld [hMapObjectIndexBuffer1], a
  2424. +   ld a, [NorthMapObjectIndexBuffer2]
  2425. +   ld [hMapObjectIndexBuffer2], a
  2426.     call FillNorthConnectionStrip
  2427.  
  2428.  .South
  2429. @@ -817,10 +817,10 @@ FillMapConnections:: ; 2524
  2430.     ld e, a
  2431.     ld a, [SouthConnectionStripLocation + 1]
  2432.     ld d, a
  2433. -   ld a, [SouthConnectionStripLength]
  2434. -   ld [hConnectionStripLength], a
  2435. -   ld a, [SouthConnectedMapWidth]
  2436. -   ld [hConnectedMapWidth], a
  2437. +   ld a, [SouthMapObjectIndexBuffer1]
  2438. +   ld [hMapObjectIndexBuffer1], a
  2439. +   ld a, [SouthMapObjectIndexBuffer2]
  2440. +   ld [hMapObjectIndexBuffer2], a
  2441.     call FillSouthConnectionStrip
  2442.  
  2443.  .West
  2444. @@ -843,7 +843,7 @@ FillMapConnections:: ; 2524
  2445.     ld a, [WestConnectionStripLength]
  2446.     ld b, a
  2447.     ld a, [WestConnectedMapWidth]
  2448. -   ld [hConnectionStripLength], a
  2449. +   ld [hMapObjectIndexBuffer1], a
  2450.     call FillWestConnectionStrip
  2451.  
  2452.  .East
  2453. @@ -866,7 +866,7 @@ FillMapConnections:: ; 2524
  2454.     ld a, [EastConnectionStripLength]
  2455.     ld b, a
  2456.     ld a, [EastConnectedMapWidth]
  2457. -   ld [hConnectionStripLength], a
  2458. +   ld [hMapObjectIndexBuffer1], a
  2459.     call FillEastConnectionStrip
  2460.  
  2461.  .Done
  2462. @@ -882,7 +882,7 @@ FillSouthConnectionStrip:: ; 25d3
  2463.     push de
  2464.  
  2465.     push hl
  2466. -   ld a, [hConnectionStripLength]
  2467. +   ld a, [hMapObjectIndexBuffer1]
  2468.     ld b, a
  2469.  .x
  2470.     ld a, [hli]
  2471. @@ -892,7 +892,7 @@ FillSouthConnectionStrip:: ; 25d3
  2472.     jr nz, .x
  2473.     pop hl
  2474.  
  2475. -   ld a, [hConnectedMapWidth]
  2476. +   ld a, [hMapObjectIndexBuffer2]
  2477.     ld e, a
  2478.     ld d, 0
  2479.     add hl, de
  2480. @@ -917,7 +917,7 @@ FillEastConnectionStrip:: ; 25f6
  2481.  .asm_25f6
  2482.     ld a, [MapWidth]
  2483.     add 6
  2484. -   ld [hConnectedMapWidth], a
  2485. +   ld [hMapObjectIndexBuffer2], a
  2486.  
  2487.     push de
  2488.  
  2489. @@ -933,13 +933,13 @@ FillEastConnectionStrip:: ; 25f6
  2490.     inc de
  2491.     pop hl
  2492.  
  2493. -   ld a, [hConnectionStripLength]
  2494. +   ld a, [hMapObjectIndexBuffer1]
  2495.     ld e, a
  2496.     ld d, 0
  2497.     add hl, de
  2498.     pop de
  2499.  
  2500. -   ld a, [hConnectedMapWidth]
  2501. +   ld a, [hMapObjectIndexBuffer2]
  2502.     add e
  2503.     ld e, a
  2504.     jr nc, .asm_2617
  2505. @@ -1171,7 +1171,7 @@ CoordinatesEventText:: ; 2702
  2506.  
  2507.  
  2508.  Function2707:: ; 2707
  2509. -   ld a, [hConnectionStripLength]
  2510. +   ld a, [hMapObjectIndexBuffer1]
  2511.     ld e, a
  2512.     ld d, $0
  2513.     ld hl, wd81e
  2514. @@ -1181,7 +1181,7 @@ Function2707:: ; 2707
  2515.  ; 2712
  2516.  
  2517.  Function2712:: ; 2712
  2518. -   ld a, [hConnectionStripLength]
  2519. +   ld a, [hMapObjectIndexBuffer1]
  2520.     ld e, a
  2521.     ld d, $0
  2522.     ld hl, wd81e
  2523. @@ -1191,7 +1191,7 @@ Function2712:: ; 2712
  2524.  ; 271e
  2525.  
  2526.  Function271e:: ; 271e
  2527. -   ld a, [hConnectionStripLength]
  2528. +   ld a, [hMapObjectIndexBuffer1]
  2529.     ld e, a
  2530.     ld d, $0
  2531.     ld hl, wd81e
  2532. @@ -1463,7 +1463,7 @@ SaveScreen:: ; 289d
  2533.     ld de, XCoord + 1
  2534.     ld a, [MapWidth]
  2535.     add $6
  2536. -   ld [hConnectionStripLength], a
  2537. +   ld [hMapObjectIndexBuffer1], a
  2538.     ld a, [wd151]
  2539.     and a
  2540.     jr z, .asm_28cb
  2541. @@ -1477,7 +1477,7 @@ SaveScreen:: ; 289d
  2542.  
  2543.  .asm_28c0
  2544.     ld de, wdcbf
  2545. -   ld a, [hConnectionStripLength]
  2546. +   ld a, [hMapObjectIndexBuffer1]
  2547.     ld c, a
  2548.     ld b, $0
  2549.     add hl, bc
  2550. @@ -1512,7 +1512,7 @@ LoadNeighboringBlockData:: ; 28e3
  2551.     ld l, a
  2552.     ld a, [MapWidth]
  2553.     add $6
  2554. -   ld [hConnectionStripLength], a
  2555. +   ld [hMapObjectIndexBuffer1], a
  2556.     ld de, XCoord + 1
  2557.     ld b, $6
  2558.     ld c, $5
  2559. @@ -1537,7 +1537,7 @@ Function28f7:: ; 28f7
  2560.  
  2561.  .asm_2908
  2562.     pop hl
  2563. -   ld a, [hConnectionStripLength]
  2564. +   ld a, [hMapObjectIndexBuffer1]
  2565.     ld c, a
  2566.     ld b, $0
  2567.     add hl, bc
  2568. @@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29
  2569.  GetAnyMapBank:: ; 2c31
  2570.     push hl
  2571.     push de
  2572.     ld de, $0000
  2573.     call GetAnyMapHeaderMember
  2574.     ld a, c
  2575.     pop de
  2576. diff --git a/home/map_objects.asm b/home/map_objects.asm
  2577. index ac363b3..74273f3 100644
  2578. --- a/home/map_objects.asm
  2579. +++ b/home/map_objects.asm
  2580. @@ -21,7 +21,7 @@ Function180e:: ; 180e
  2581.     ld hl, UsedSprites + 2
  2582.     ld c, SPRITE_GFX_LIST_CAPACITY - 1
  2583.     ld b, a
  2584. -   ld a, [hConnectionStripLength]
  2585. +   ld a, [hMapObjectIndexBuffer1]
  2586.     cp 0
  2587.     jr z, .nope
  2588.     ld a, b
  2589. @@ -234,14 +234,14 @@ GetMapObject:: ; 18d2
  2590.  
  2591.  Function18de:: ; 18de
  2592.  ; Sets carry if the object is not visible on the screen.
  2593. -   ld [hConnectionStripLength], a
  2594. +   ld [hMapObjectIndexBuffer1], a
  2595.     call GetMapObject
  2596.     ld hl, MAPOBJECT_OBJECT_STRUCT_ID
  2597.     add hl, bc
  2598.     ld a, [hl]
  2599.     cp -1
  2600.     jr z, .not_visible
  2601. -   ld [hConnectedMapWidth], a
  2602. +   ld [hMapObjectIndexBuffer2], a
  2603.     call GetObjectStruct
  2604.     and a
  2605.     ret
  2606. @@ -326,7 +326,7 @@ Function18f5:: ; 18f5
  2607.  ; 194d
  2608.  
  2609.  Function194d:: ; 194d
  2610. -   ld [hConnectionStripLength], a
  2611. +   ld [hMapObjectIndexBuffer1], a
  2612.     call GetMapObject
  2613.     call CopyObjectStruct
  2614.     ret
  2615. @@ -335,16 +335,16 @@ Function194d:: ; 194d
  2616.  
  2617.  
  2618.  _CopyObjectStruct:: ; 1956
  2619. -   ld [hConnectionStripLength], a
  2620. +   ld [hMapObjectIndexBuffer1], a
  2621.     call Function271e
  2622. -   ld a, [hConnectionStripLength]
  2623. +   ld a, [hMapObjectIndexBuffer1]
  2624.     call GetMapObject
  2625.     callba CopyObjectStruct
  2626.     ret
  2627.  ; 1967
  2628.  
  2629.  Function1967:: ; 1967
  2630. -   ld [hConnectionStripLength], a
  2631. +   ld [hMapObjectIndexBuffer1], a
  2632.     call GetMapObject
  2633.     ld hl, MAPOBJECT_OBJECT_STRUCT_ID
  2634.     add hl, bc
  2635. @@ -569,12 +569,12 @@ endr
  2636.     ld [hl], a
  2637.     ld a, [bc]
  2638.     inc bc
  2639. -   ld hl, OBJECT_04
  2640. +   ld hl, OBJECT_FLAGS1
  2641.     add hl, de
  2642.     ld [hl], a
  2643.     ld a, [bc]
  2644.     inc bc
  2645. -   ld hl, OBJECT_FLAGS
  2646. +   ld hl, OBJECT_FLAGS2
  2647.     add hl, de
  2648.     ld [hl], a
  2649.     ld a, [bc]
  2650. diff --git a/home/menu.asm b/home/menu.asm
  2651. index c4f0ed0..a63f74c 100644
  2652. --- a/home/menu.asm
  2653. +++ b/home/menu.asm
  2654. @@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75
  2655.     db $40 ; tile backup
  2656.     db 0, 0 ; start coords
  2657.     db 17, 19 ; end coords
  2658.     dw $0000
  2659.     db 1 ; default option
  2660.  ; 1d7d
  2661.  
  2662. diff --git a/hram.asm b/hram.asm
  2663. index 52ff0bf..54e7a90 100644
  2664. --- a/hram.asm
  2665. +++ b/hram.asm
  2666. @@ -32,8 +32,8 @@ hJoyDown           EQU $ffa8
  2667.  hJoyLast           EQU $ffa9
  2668.  hInMenu            EQU $ffaa
  2669.  
  2670. -hConnectionStripLength EQU $ffaf
  2671. -hConnectedMapWidth EQU $ffb0
  2672. +hMapObjectIndexBuffer1 EQU $ffaf
  2673. +hMapObjectIndexBuffer2 EQU $ffb0
  2674.  
  2675.  hPastLeadingZeroes EQU $ffb3
  2676.  
  2677. diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm
  2678. index 8d763da..d70434b 100644
  2679. --- a/lib/mobile/main.asm
  2680. +++ b/lib/mobile/main.asm
  2681. @@ -1,7 +1,7 @@
  2682.  ; A library included as part of the Mobile Adapter GB SDK.
  2683.  
  2684.  INCLUDE "gbhw.asm"
  2685. -
  2686.  
  2687.  SECTION "Main", ROMX
  2688.  
  2689. @@ -258,7 +258,7 @@ Function110115: ; 110115
  2690.     cp $0
  2691.     jr z, .asm_11015d
  2692.  .asm_110158
  2693.     ld hl, $0000
  2694.  .asm_11015b
  2695.     ld a, e
  2696.     ret
  2697. @@ -684,14 +684,14 @@ rept 2
  2698.     inc de
  2699.  endr
  2700.     pop hl
  2701.     ld bc, $0000
  2702.     call Function110007
  2703.     ld a, c
  2704.     ld [$cb7a], a
  2705.     ld [$c86b], a
  2706.     push de
  2707.     inc de
  2708.     ld bc, $0000
  2709.     ld a, $20
  2710.     call Function11000f
  2711.     ld l, e
  2712. @@ -1021,7 +1021,7 @@ Function110615: ; 110615
  2713.     push de
  2714.     inc de
  2715.     ld a, b
  2716.     ld bc, $0000
  2717.     call Function11000f
  2718.     ld a, c
  2719.     pop hl
  2720. @@ -4810,7 +4810,7 @@ Function111f07: ; 111f07 (44:5f07)
  2721.  
  2722.  Function111f63: ; 111f63
  2723.     push de
  2724.     ld hl, $0000
  2725.     ld c, b
  2726.     xor a
  2727.     cp b
  2728. @@ -5233,7 +5233,7 @@ Function112271: ; 112271
  2729.     cp $41
  2730.     jr nz, .asm_1122f5
  2731.     ld b, $be
  2732.     ld de, $0000
  2733.  .asm_1122b3
  2734.     ld a, [hli]
  2735.     add e
  2736. @@ -6506,8 +6506,8 @@ Function112aac: ; 112aac
  2737.     push af
  2738.     ld a, [$c874]
  2739.     push af
  2740.     ld bc, $0000
  2741.     ld de, $0000
  2742.  .asm_112abe
  2743.     ld a, [hli]
  2744.     cp $d
  2745. @@ -6584,7 +6584,7 @@ Function112b11: ; 112b11
  2746.  .asm_112b36
  2747.     push hl
  2748.     ld hl, $c872
  2749.     ld de, $0000
  2750.     ld a, b
  2751.     or a
  2752.     jr z, .asm_112b49
  2753. @@ -8226,7 +8226,7 @@ Function113519: ; 113519
  2754.     cp $41
  2755.     jr nz, .asm_113586
  2756.     ld b, $be
  2757.     ld de, $0000
  2758.  .asm_113551
  2759.     ld a, [hli]
  2760.     add e
  2761. diff --git a/main.asm b/main.asm
  2762. index 592bdf6..3d3f35f 100644
  2763. --- a/main.asm
  2764. +++ b/main.asm
  2765. @@ -71,7 +71,7 @@ Function5ae8: ; 5ae8
  2766.     jp Function6219
  2767.  ; 5b04
  2768.  
  2769. -Function5b04: ; 5b04
  2770. +; unreferenced
  2771.     ret
  2772.  ; 5b05
  2773.  
  2774. @@ -883,7 +883,7 @@ NamePlayer: ; 0x6074
  2775.     db "KRIS@@@@@@@"
  2776.  ; 60e9
  2777.  
  2778. -Function60e9: ; 60e9
  2779. +Function60e9: ; Unreferenced
  2780.     call LoadMenuDataHeader
  2781.     call InterpretMenu2
  2782.     ld a, [wcfa9]
  2783. @@ -1180,7 +1180,7 @@ endr
  2784.     dw TitleScreenEnd
  2785.  ; 62b7
  2786.  
  2787. -Function62b7: ; 62b7
  2788. +Function62b7: ; Unreferenced
  2789.     ld hl, wJumptableIndex
  2790.     inc [hl]
  2791.     ret
  2792. @@ -1384,7 +1384,7 @@ ResetClock: ; 6392
  2793.     jp Init
  2794.  ; 639b
  2795.  
  2796. -Function639b: ; 639b
  2797. +Function639b: ; unreferenced
  2798.     ; If bit 0 or 1 of [wcf65] is set, we don't need to be here.
  2799.     ld a, [wcf65]
  2800.     and $3
  2801. @@ -1420,12 +1420,12 @@ endr
  2802.  ; 63ca
  2803.  
  2804.  Data63ca: ; 63ca
  2805.     dw $505c, $0000
  2806.     dw $685c, $585c
  2807.     dw $685c, $785c
  2808.     dw $885c, $785c
  2809.     dw $0000, $785c
  2810.     dw $0000, $585c
  2811.  ; 63e2
  2812.  
  2813.  Copyright: ; 63e2
  2814. @@ -2117,7 +2117,7 @@ Function6ec1: ; 6ec1
  2815.     add hl, bc
  2816.     bit 5, [hl]
  2817.     jr z, .asm_6ed9
  2818. -   ld hl, OBJECT_04
  2819. +   ld hl, OBJECT_FLAGS1
  2820.     add hl, bc
  2821.     bit 4, [hl]
  2822.     push hl
  2823. @@ -2129,7 +2129,7 @@ Function6ec1: ; 6ec1
  2824.     jr .asm_6ee9
  2825.  
  2826.  .asm_6ed9
  2827. -   ld hl, OBJECT_04
  2828. +   ld hl, OBJECT_FLAGS1
  2829.     add hl, bc
  2830.     bit 4, [hl]
  2831.     jr nz, .asm_6ee9
  2832. @@ -2361,7 +2361,7 @@ CheckFacingObject:: ; 6fd9
  2833.  .asm_6ff1
  2834.     ld bc, ObjectStructs ; redundant
  2835.     ld a, 0
  2836. -   ld [hConnectionStripLength], a
  2837. +   ld [hMapObjectIndexBuffer1], a
  2838.     call Function7041
  2839.     ret nc
  2840.     ld hl, OBJECT_DIRECTION_WALKING
  2841. @@ -2388,8 +2388,8 @@ Function7009: ; 7009
  2842.     jr Function7041
  2843.  ; 7015
  2844.  
  2845. -Function7015: ; 7015
  2846. -   ld a, [hConnectionStripLength]
  2847. +Function7015: ; unreferenced
  2848. +   ld a, [hMapObjectIndexBuffer1]
  2849.     call GetObjectStruct
  2850.     call Function7021
  2851.     call Function7041
  2852. @@ -2429,10 +2429,10 @@ Function7041: ; 7041
  2853.     ld bc, ObjectStructs
  2854.     xor a
  2855.  .loop
  2856. -   ld [hConnectedMapWidth], a
  2857. +   ld [hMapObjectIndexBuffer2], a
  2858.     call GetObjectSprite
  2859.     jr z, .nope
  2860. -   ld hl, OBJECT_04
  2861. +   ld hl, OBJECT_FLAGS1
  2862.     add hl, bc
  2863.     bit 7, [hl]
  2864.     jr nz, .nope
  2865. @@ -2457,9 +2457,9 @@ Function7041: ; 7041
  2866.     jr nz, .ok
  2867.  
  2868.  .ok2
  2869. -   ld a, [hConnectionStripLength]
  2870. +   ld a, [hMapObjectIndexBuffer1]
  2871.     ld l, a
  2872. -   ld a, [hConnectedMapWidth]
  2873. +   ld a, [hMapObjectIndexBuffer2]
  2874.     cp l
  2875.     jr nz, .setcarry
  2876.  
  2877. @@ -2474,9 +2474,9 @@ Function7041: ; 7041
  2878.     ld a, [hl]
  2879.     cp e
  2880.     jr nz, .nope
  2881. -   ld a, [hConnectionStripLength]
  2882. +   ld a, [hMapObjectIndexBuffer1]
  2883.     ld l, a
  2884. -   ld a, [hConnectedMapWidth]
  2885. +   ld a, [hMapObjectIndexBuffer2]
  2886.     cp l
  2887.     jr nz, .setcarry
  2888.  
  2889. @@ -2485,7 +2485,7 @@ Function7041: ; 7041
  2890.     add hl, bc
  2891.     ld b, h
  2892.     ld c, l
  2893. -   ld a, [hConnectedMapWidth]
  2894. +   ld a, [hMapObjectIndexBuffer2]
  2895.     inc a
  2896.     cp NUM_OBJECT_STRUCTS
  2897.     jr nz, .loop
  2898. @@ -2588,7 +2588,7 @@ Function70ed: ; 70ed
  2899.     ret
  2900.  ; 7113
  2901.  
  2902. -Function7113: ; 7113
  2903. +Function7113: ; unreferenced
  2904.     ld a, [MapX]
  2905.     ld d, a
  2906.     ld a, [MapY]
  2907. @@ -2596,7 +2596,7 @@ Function7113: ; 7113
  2908.     ld bc, ObjectStructs
  2909.     xor a
  2910.  .loop
  2911. -   ld [hConnectedMapWidth], a
  2912. +   ld [hMapObjectIndexBuffer2], a
  2913.     call GetObjectSprite
  2914.     jr z, .asm_7160
  2915.     ld hl, OBJECT_03
  2916. @@ -2619,7 +2619,7 @@ Function7113: ; 7113
  2917.     ld a, [hl]
  2918.     cp d
  2919.     jr nz, .asm_714e
  2920. -   ld a, [hConnectedMapWidth]
  2921. +   ld a, [hMapObjectIndexBuffer2]
  2922.     cp $0
  2923.     jr z, .asm_7160
  2924.     jr .asm_716f
  2925. @@ -2642,7 +2642,7 @@ Function7113: ; 7113
  2926.     add hl, bc
  2927.     ld b, h
  2928.     ld c, l
  2929. -   ld a, [hConnectedMapWidth]
  2930. +   ld a, [hMapObjectIndexBuffer2]
  2931.     inc a
  2932.     cp NUM_OBJECT_STRUCTS
  2933.     jr nz, .loop
  2934. @@ -3003,7 +3003,7 @@ SpecialShuckleNick:
  2935.  
  2936.  SpecialReturnShuckle: ; 737e
  2937.     callba SelectMonFromParty
  2938. -   jr c, .asm_73e6
  2939. +   jr c, .refused
  2940.  
  2941.     ld a, [CurPartySpecies]
  2942.     cp SHUCKLE
  2943. @@ -3015,11 +3015,12 @@ SpecialReturnShuckle: ; 737e
  2944.     call AddNTimes
  2945.  
  2946.  ; OT ID
  2947. +; 00518
  2948.     ld a, [hli]
  2949. -   cp $2
  2950. +   cp 00518 / $100
  2951.     jr nz, .DontReturn
  2952.     ld a, [hl]
  2953. -   cp $6
  2954. +   cp 00518 % $100
  2955.     jr nz, .DontReturn
  2956.  
  2957.  ; OT
  2958. @@ -3032,14 +3033,14 @@ SpecialReturnShuckle: ; 737e
  2959.     cp [hl]
  2960.     jr nz, .DontReturn
  2961.     cp "@"
  2962. -   jr z, .asm_73bb
  2963. +   jr z, .done
  2964.     inc de
  2965.     inc hl
  2966.     jr .CheckOT
  2967.  
  2968. -.asm_73bb
  2969. -   callba Functione538
  2970. -   jr c, .asm_73f1
  2971. +.done
  2972. +   callba CheckCurPartyMonFainted
  2973. +   jr c, .fainted
  2974.     ld a, [CurPartyMon]
  2975.     ld hl, PartyMon1Happiness
  2976.     ld bc, PartyMon2 - PartyMon1
  2977. @@ -3047,17 +3048,17 @@ SpecialReturnShuckle: ; 737e
  2978.     ld a, [hl]
  2979.     cp 150
  2980.     ld a, $3
  2981. -   jr nc, .asm_73e2
  2982. +   jr nc, .HappyToStayWithYou
  2983.     xor a
  2984.     ld [wd10b], a
  2985.     callab Functione039
  2986.     ld a, $2
  2987.  
  2988. -.asm_73e2
  2989. +.HappyToStayWithYou
  2990.     ld [ScriptVar], a
  2991.     ret
  2992.  
  2993. -.asm_73e6
  2994. +.refused
  2995.     ld a, $1
  2996.     ld [ScriptVar], a
  2997.     ret
  2998. @@ -3067,7 +3068,7 @@ SpecialReturnShuckle: ; 737e
  2999.     ld [ScriptVar], a
  3000.     ret
  3001.  
  3002. -.asm_73f1
  3003. +.fainted
  3004.     ld a, $4
  3005.     ld [ScriptVar], a
  3006.     ret
  3007. @@ -3219,10 +3220,10 @@ GetSpawnCoord: ; 8029
  3008.  .ok
  3009.     ld [hl], e
  3010.     ld a, $0
  3011. -   ld [hConnectionStripLength], a
  3012. +   ld [hMapObjectIndexBuffer1], a
  3013.     ld bc, MapObjects
  3014.     ld a, $0
  3015. -   ld [hConnectedMapWidth], a
  3016. +   ld [hMapObjectIndexBuffer2], a
  3017.     ld de, ObjectStructs
  3018.     call Function8116
  3019.     ld a, $0
  3020. @@ -3234,7 +3235,7 @@ PlayerObjectTemplate: ; 8071
  3021.  ; A dummy map object used to initialize the player object.
  3022.  ; Shorter than the actual amount copied by two bytes.
  3023.  ; Said bytes seem to be unused.
  3024.     person_event SPRITE_CHRIS, -4, -4, $0b, 15, 15, -1, -1, 0, 0, 0, $0000, -1
  3025.  ; 807e
  3026.  
  3027.  CopyDECoordsToMapObject:: ; 807e
  3028. @@ -3275,7 +3276,7 @@ Function80a1:: ; 80a1
  3029.     ld hl, OBJECT_MAP_Y
  3030.     add hl, bc
  3031.     ld e, [hl]
  3032. -   ld a, [hConnectionStripLength]
  3033. +   ld a, [hMapObjectIndexBuffer1]
  3034.     ld b, a
  3035.     call CopyDECoordsToMapObject
  3036.     and a
  3037. @@ -3320,12 +3321,12 @@ CopyObjectStruct:: ; 80e7
  3038.     ld a, 1
  3039.     ld de, OBJECT_STRUCT_LENGTH
  3040.  .loop
  3041. -   ld [hConnectedMapWidth], a
  3042. +   ld [hMapObjectIndexBuffer2], a
  3043.     ld a, [hl]
  3044.     and a
  3045.     jr z, .done
  3046.     add hl, de
  3047. -   ld a, [hConnectedMapWidth]
  3048. +   ld a, [hMapObjectIndexBuffer2]
  3049.     inc a
  3050.     cp NUM_OBJECT_STRUCTS
  3051.     jr nz, .loop
  3052. @@ -3339,7 +3340,7 @@ CopyObjectStruct:: ; 80e7
  3053.     ld hl, VramState
  3054.     bit 7, [hl]
  3055.     ret z
  3056. -   ld hl, OBJECT_FLAGS
  3057. +   ld hl, OBJECT_FLAGS2
  3058.     add hl, de
  3059.     set 5, [hl]
  3060.     ret
  3061. @@ -3352,11 +3353,11 @@ Function8116: ; 8116
  3062.  ; 811d
  3063.  
  3064.  Function811d: ; 811d
  3065. -   ld a, [hConnectedMapWidth]
  3066. +   ld a, [hMapObjectIndexBuffer2]
  3067.     ld hl, MAPOBJECT_OBJECT_STRUCT_ID
  3068.     add hl, bc
  3069.     ld [hl], a
  3070. -   ld a, [hConnectionStripLength]
  3071. +   ld a, [hMapObjectIndexBuffer1]
  3072.     ld [wc2f0], a
  3073.     ld hl, MAPOBJECT_SPRITE
  3074.     add hl, bc
  3075. @@ -3404,7 +3405,7 @@ Function8177: ; 8177
  3076.     ld bc, MapObjects + OBJECT_LENGTH
  3077.     ld a, 1
  3078.  .loop
  3079. -   ld [hConnectionStripLength], a
  3080. +   ld [hMapObjectIndexBuffer1], a
  3081.     ld hl, MAPOBJECT_SPRITE
  3082.     add hl, bc
  3083.     ld a, [hl]
  3084. @@ -3445,7 +3446,7 @@ Function8177: ; 8177
  3085.     add hl, bc
  3086.     ld b, h
  3087.     ld c, l
  3088. -   ld a, [hConnectionStripLength]
  3089. +   ld a, [hMapObjectIndexBuffer1]
  3090.     inc a
  3091.     cp NUM_OBJECTS
  3092.     jr nz, .loop
  3093. @@ -3489,7 +3490,7 @@ Function81ea: ; 81ea
  3094.     ld bc, MapObjects + OBJECT_LENGTH
  3095.     ld a, 1
  3096.  .loop
  3097. -   ld [hConnectionStripLength], a
  3098. +   ld [hMapObjectIndexBuffer1], a
  3099.     ld hl, MAPOBJECT_SPRITE
  3100.     add hl, bc
  3101.     ld a, [hl]
  3102. @@ -3524,7 +3525,7 @@ Function81ea: ; 81ea
  3103.     add hl, bc
  3104.     ld b, h
  3105.     ld c, l
  3106. -   ld a, [hConnectionStripLength]
  3107. +   ld a, [hMapObjectIndexBuffer1]
  3108.     inc a
  3109.     cp NUM_OBJECTS
  3110.     jr nz, .loop
  3111. @@ -3547,7 +3548,7 @@ Function823e: ; 823e
  3112.     ld bc, MapObjects + OBJECT_LENGTH
  3113.     ld a, 1
  3114.  .loop
  3115. -   ld [hConnectionStripLength], a
  3116. +   ld [hMapObjectIndexBuffer1], a
  3117.     ld hl, MAPOBJECT_SPRITE
  3118.     add hl, bc
  3119.     ld a, [hl]
  3120. @@ -3582,7 +3583,7 @@ Function823e: ; 823e
  3121.     add hl, bc
  3122.     ld b, h
  3123.     ld c, l
  3124. -   ld a, [hConnectionStripLength]
  3125. +   ld a, [hMapObjectIndexBuffer1]
  3126.     inc a
  3127.     cp NUM_OBJECTS
  3128.     jr nz, .loop
  3129. @@ -3839,7 +3840,7 @@ Function839e:: ; 839e
  3130.     ld hl, OBJECT_SPRITE_Y
  3131.     add hl, de
  3132.     ld [hl], a
  3133. -   ld a, [hConnectedMapWidth]
  3134. +   ld a, [hMapObjectIndexBuffer2]
  3135.     ld hl, OBJECT_32
  3136.     add hl, de
  3137.     ld [hl], a
  3138. @@ -4920,9 +4921,6 @@ Script_UseFlash: ; 0xc8e6
  3139.  UnknownText_0xc8f3: ; 0xc8f3
  3140.     text_jump UnknownText_0x1c0609
  3141.     start_asm
  3142. -; 0xc8f8
  3143. -
  3144. -Functionc8f8: ; c8f8
  3145.     call WaitSFX
  3146.     ld de, SFX_FLASH
  3147.     call PlaySFX
  3148. @@ -5646,7 +5644,7 @@ StrengthFunction: ; cce5
  3149.     jr StartToUseStrength
  3150.  ; ccf8
  3151.  
  3152. -AlreadyUsingStrength: ; ccf8
  3153. +AlreadyUsingStrength: ; unreferenced
  3154.     ld hl, UnknownText_0xcd01
  3155.     call MenuTextBoxBackup
  3156.     ld a, $80
  3157. @@ -5696,7 +5694,7 @@ Script_UsedStrength: ; 0xcd2d
  3158.     callasm Functioncd12
  3159.     writetext UnknownText_0xcd41
  3160.     copybytetovar wd1ef
  3161.     cry $0000
  3162.     pause 3
  3163.     writetext UnknownText_0xcd46
  3164.     loadmovesprites
  3165. @@ -6068,7 +6066,7 @@ GetFacingObject: ; cf0d
  3166.     callba CheckFacingObject
  3167.     jr nc, .fail
  3168.  
  3169. -   ld a, [hConnectedMapWidth]
  3170. +   ld a, [hMapObjectIndexBuffer2]
  3171.     call GetObjectStruct
  3172.     ld hl, OBJECT_MAP_OBJECT_INDEX
  3173.     add hl, bc
  3174. @@ -6376,7 +6374,7 @@ UnknownText_0xd0a9: ; 0xd0a9
  3175.     db "@"
  3176.  ; 0xd0ae
  3177.  
  3178. -UnknownText_0xd0ae: ; 0xd0ae
  3179. +UnknownText_0xd0ae: ; unused
  3180.     ; Looks like there's nothing here.
  3181.     text_jump UnknownText_0x1c0979
  3182.     db "@"
  3183. @@ -7873,7 +7871,7 @@ Functiond839: ; d839
  3184.     ld a, [Buffer1]
  3185.     ld c, a
  3186.     ld b, $0
  3187.     ld hl, $0000
  3188.     ld a, [wd1f1]
  3189.     cp $30
  3190.     jr nc, .asm_d885
  3191. @@ -9851,7 +9849,7 @@ Functione4fe: ; e4fe (3:64fe)
  3192.     ret
  3193.  ; e512 (3:6512)
  3194.  
  3195. -Functione512: ; e512
  3196. +Functione512: ; unused
  3197.     ld a, [PartyCount]
  3198.     and a
  3199.     jr z, .asm_e51e
  3200. @@ -9886,32 +9884,32 @@ UnknownText_0xe533: ; 0xe533
  3201.  ; 0xe538
  3202.  
  3203.  
  3204. -Functione538: ; e538
  3205. +CheckCurPartyMonFainted: ; e538
  3206.     ld hl, PartyMon1HP
  3207.     ld de, PartyMon2 - PartyMon1
  3208.     ld b, $0
  3209. -.asm_e540
  3210. +.loop
  3211.     ld a, [CurPartyMon]
  3212.     cp b
  3213. -   jr z, .asm_e54b
  3214. +   jr z, .skip
  3215.     ld a, [hli]
  3216.     or [hl]
  3217. -   jr nz, .asm_e557
  3218. +   jr nz, .notfainted
  3219.     dec hl
  3220.  
  3221. -.asm_e54b
  3222. +.skip
  3223.     inc b
  3224.     ld a, [PartyCount]
  3225.     cp b
  3226. -   jr z, .asm_e555
  3227. +   jr z, .done
  3228.     add hl, de
  3229. -   jr .asm_e540
  3230. +   jr .loop
  3231.  
  3232. -.asm_e555
  3233. +.done
  3234.     scf
  3235.     ret
  3236.  
  3237. -.asm_e557
  3238. +.notfainted
  3239.     and a
  3240.     ret
  3241.  ; e559
  3242. @@ -9927,7 +9925,7 @@ Functione559: ; e559 (3:6559)
  3243.     ret
  3244.  ; e56d (3:656d)
  3245.  
  3246. -Functione56d: ; e56d
  3247. +Functione56d: ; unused
  3248.     ld a, [PartyCount]
  3249.     cp PARTY_LENGTH
  3250.     jr nc, .asm_e576
  3251. @@ -9987,7 +9985,7 @@ Functione5bb: ; e5bb
  3252.     ret
  3253.  ; e5d9
  3254.  
  3255. -Functione5d9: ; e5d9
  3256. +Functione5d9: ; unreferenced
  3257.     ld a, [wCurBox]
  3258.     cp b
  3259.     jr z, .asm_e5f1
  3260. @@ -10022,7 +10020,7 @@ Functione5d9: ; e5d9
  3261.     push hl
  3262.     push bc
  3263.     ld a, c
  3264.     ld bc, $0000
  3265.     add hl, bc
  3266.     ld bc, $0020
  3267.     call AddNTimes
  3268. @@ -11159,7 +11157,7 @@ Function11b39: ; 11b39
  3269.     jr Function11b23
  3270.  ; 11b56
  3271.  
  3272. -Dakutens: ; 11b56
  3273. +Dakutens: ; Dummied out
  3274.     db "かが", "きぎ", "くぐ", "けげ", "こご"
  3275.     db "さざ", "しじ", "すず", "せぜ", "そぞ"
  3276.     db "ただ", "ちぢ", "つづ", "てで", "とど"
  3277. @@ -11170,7 +11168,7 @@ Dakutens: ; 11b56
  3278.     db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
  3279.     db $ff
  3280.  
  3281. -Handakutens: ; 11ba7
  3282. +Handakutens: ; Dummied out
  3283.     db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
  3284.     db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
  3285.     db $ff
  3286. @@ -11348,7 +11346,7 @@ NameInputLower:
  3287.     db "a b c d e f g h i"
  3288.     db "j k l m n o p q r"
  3289.     db "s t u v w x y z  "
  3290. -   db "× ( ) : ; [ ] ", $e1, " ", $e2
  3291. +   db "× ( ) : ; [ ] <PK> <MN>"
  3292.     db "UPPER  DEL   END "
  3293.  BoxNameInputLower:
  3294.     db "a b c d e f g h i"
  3295. @@ -11357,7 +11355,7 @@ BoxNameInputLower:
  3296.     db "é 'd 'l 'm 'r 's 't 'v 0"
  3297.     db "1 2 3 4 5 6 7 8 9"
  3298.     db "UPPER  DEL   END "
  3299. -NameInputUpper:
  3300. +NameInputUpper: ; Unreferenced?
  3301.     db "A B C D E F G H I"
  3302.     db "J K L M N O P Q R"
  3303.     db "S T U V W X Y Z  "
  3304. @@ -11367,12 +11365,12 @@ BoxNameInputUpper:
  3305.     db "A B C D E F G H I"
  3306.     db "J K L M N O P Q R"
  3307.     db "S T U V W X Y Z  "
  3308. -   db "× ( ) : ; [ ] ", $e1, " ", $e2
  3309. +   db "× ( ) : ; [ ] <PK> <MN>"
  3310.     db "- ? ! ♂ ♀ / . , &"
  3311.     db "lower  DEL   END "
  3312.  ; 11e5d
  3313.  
  3314. -GFX_11e5d: ; 11e5d
  3315. +GFX_11e5d: ; ????
  3316.  INCBIN "gfx/unknown/011e5d.2bpp"
  3317.  ; 11e6d
  3318.  
  3319. @@ -11460,7 +11458,7 @@ Function11f74: ; 11f74 (4:5f74)
  3320.     ret
  3321.  ; 11f7a (4:5f7a)
  3322.  
  3323. -String_11f7a: ; 11f7a
  3324. +String_11f7a: ; dummied out
  3325.     db "メールを かいてね@"
  3326.  ; 11f84
  3327.  
  3328. @@ -11824,7 +11822,7 @@ Function121ac: ; 121ac (4:61ac)
  3329.     jp Function11b17
  3330.  ; 121b2 (4:61b2)
  3331.  
  3332. -Function121b2: ; 121b2
  3333. +Function121b2: ; unreferenced
  3334.     ld a, [wc6d2]
  3335.     and a
  3336.     ret z
  3337. @@ -15056,8 +15054,6 @@ _BugContestJudging: ; 1369d
  3338.  BugContest_FirstPlaceText: ; 0x136eb
  3339.     text_jump ContestJudging_FirstPlaceText
  3340.     start_asm
  3341. -; 0x136f0
  3342. -
  3343.  BugContest_FirstPlace: ; 136f0
  3344.     ld de, SFX_1ST_PLACE
  3345.     call PlaySFX
  3346. @@ -15076,8 +15072,6 @@ BugContest_SecondPlaceText: ; 0x13702
  3347.     ; Placing second was @ , who caught a @ !@ @
  3348.     text_jump ContestJudging_SecondPlaceText
  3349.     start_asm
  3350. -; 0x13707
  3351. -
  3352.  BugContest_SecondPlace: ; 13707
  3353.     ld de, SFX_2ND_PLACE
  3354.     call PlaySFX
  3355. @@ -15672,7 +15666,7 @@ ContestReturnMons: ; 13a31
  3356.     ret
  3357.  ; 13a47
  3358.  
  3359. -Function13a47: ; 13a47
  3360. +Function13a47: ; unreferenced
  3361.     ld hl, PartyCount
  3362.     ld a, [hl]
  3363.     and a
  3364. @@ -15940,7 +15934,7 @@ root    set root+1
  3365.  SECTION "bank5", ROMX, BANK[$5]
  3366.  
  3367.  
  3368. -StopRTC: ; 14000
  3369. +StopRTC: ; Unreferenced???
  3370.     ld a, SRAM_ENABLE
  3371.     ld [MBC3SRamEnable], a
  3372.     call LatchClock
  3373. @@ -16002,7 +15996,7 @@ TimesOfDay: ; 14044
  3374.     db -1, MORN
  3375.  ; 1404e
  3376.  
  3377. -Unknown_1404e: ; 1404e
  3378. +Unknown_1404e: ; Unreferenced
  3379.     db 20, 2
  3380.     db 40, 0
  3381.     db 60, 1
  3382. @@ -16153,7 +16147,7 @@ Function140ed:: ; 140ed
  3383.     ret
  3384.  ; 1412a
  3385.  
  3386. -Function1412a: ; 1412a
  3387. +GetEmote2bpp: ; 1412a
  3388.     ld a, $1
  3389.     ld [rVBK], a
  3390.     call Get2bpp
  3391. @@ -16336,7 +16330,7 @@ Function14215: ; 14215
  3392.     bit 6, a
  3393.     ret nz
  3394.     ld c, $8
  3395. -   callba Function1442f
  3396. +   callba LoadEmote
  3397.     call GetMapPermission
  3398.     call CheckOutdoorMap
  3399.     ld c, $b
  3400. @@ -16344,7 +16338,7 @@ Function14215: ; 14215
  3401.     ld c, $a
  3402.  
  3403.  .asm_1422f
  3404. -   callba Function1442f
  3405. +   callba LoadEmote
  3406.     ret
  3407.  ; 14236
  3408.  
  3409. @@ -16838,27 +16832,33 @@ Function14418: ; 14418
  3410.     ret
  3411.  ; 1442f
  3412.  
  3413. -Function1442f:: ; 1442f
  3414. +LoadEmote:: ; 1442f
  3415. +; Get the address of the pointer to emote c.
  3416.     ld a, c
  3417.     ld bc, 6
  3418.     ld hl, EmotesPointers
  3419.     call AddNTimes
  3420. +; Load the emote address into de
  3421.     ld e, [hl]
  3422.     inc hl
  3423.     ld d, [hl]
  3424. +; load the length of the emote (in tiles) into c
  3425.     inc hl
  3426.     ld c, [hl]
  3427.     swap c
  3428. +; load the emote pointer bank into b
  3429.     inc hl
  3430.     ld b, [hl]
  3431. +; load the VRAM destination into hl
  3432.     inc hl
  3433.     ld a, [hli]
  3434.     ld h, [hl]
  3435.     ld l, a
  3436. +; if the emote has a length of 0, do not proceed (error handling)
  3437.     ld a, c
  3438.     and a
  3439.     ret z
  3440. -   call Function1412a
  3441. +   call GetEmote2bpp
  3442.     ret
  3443.  ; 1444d
  3444.  
  3445. @@ -18962,7 +18962,7 @@ Function15cef: ; 15cef
  3446.     ld de, Money
  3447.     ld bc, hMoneyTemp
  3448.     ld a, $3
  3449. -   call CheckMoney
  3450. +   call CompareMoney
  3451.     jr c, .asm_15d79
  3452.     ld hl, NumItems
  3453.     call ReceiveItem
  3454. @@ -19289,7 +19289,7 @@ Function15ece: ; 15ece
  3455.     ret
  3456.  ; 15ed3
  3457.  
  3458. -Function15ed3: ; 15ed3
  3459. +Function15ed3: ; unreferenced
  3460.     ld hl, UnknownText_0x15edb
  3461.     call MenuTextBoxBackup
  3462.     and a
  3463. @@ -19465,10 +19465,10 @@ Function15fcd: ; 15fcd
  3464.  
  3465.  GiveMoney:: ; 15fd7
  3466.     ld a, $3
  3467. -   call Function16053
  3468. +   call AddMoney
  3469.     ld bc, MaxMoney
  3470.     ld a, $3
  3471. -   call CheckMoney
  3472. +   call CompareMoney
  3473.     jr z, .asm_15ff5
  3474.     jr c, .asm_15ff5
  3475.     ld hl, MaxMoney
  3476. @@ -19495,7 +19495,7 @@ MaxMoney: ; 15ff7
  3477.  
  3478.  TakeMoney:: ; 15ffa
  3479.     ld a, 3
  3480. -   call CheckMoney2
  3481. +   call SubtractMoney
  3482.     jr nc, .asm_16009
  3483.     xor a
  3484.     ld [de], a
  3485. @@ -19511,9 +19511,9 @@ TakeMoney:: ; 15ffa
  3486.     ret
  3487.  ; 1600b
  3488.  
  3489. -CheckMoney:: ; 1600b
  3490. +CompareMoney:: ; 1600b
  3491.     ld a, $3
  3492. -CheckFunds: ; 1600d
  3493. +CompareFunds: ; 1600d
  3494.     push hl
  3495.     push de
  3496.     push bc
  3497. @@ -19521,46 +19521,46 @@ CheckFunds: ; 1600d
  3498.     ld l, c
  3499.     ld c, $0
  3500.     ld b, a
  3501. -.asm_16015
  3502. +.loop1
  3503.     dec a
  3504. -   jr z, .asm_1601c
  3505. +   jr z, .done
  3506.     inc de
  3507.     inc hl
  3508. -   jr .asm_16015
  3509. +   jr .loop1
  3510.  
  3511. -.asm_1601c
  3512. +.done
  3513.     and a
  3514. -.asm_1601d
  3515. +.loop2
  3516.     ld a, [de]
  3517.     sbc [hl]
  3518. -   jr z, .asm_16022
  3519. +   jr z, .okay
  3520.     inc c
  3521.  
  3522. -.asm_16022
  3523. +.okay
  3524.     dec de
  3525.     dec hl
  3526.     dec b
  3527. -   jr nz, .asm_1601d
  3528. -   jr c, .asm_1602d
  3529. +   jr nz, .loop2
  3530. +   jr c, .set_carry
  3531.     ld a, c
  3532.     and a
  3533. -   jr .asm_16031
  3534. +   jr .skip_carry
  3535.  
  3536. -.asm_1602d
  3537. +.set_carry
  3538.     ld a, $1
  3539.     and a
  3540.     scf
  3541.  
  3542. -.asm_16031
  3543. +.skip_carry
  3544.     pop bc
  3545.     pop de
  3546.     pop hl
  3547.     ret
  3548.  ; 16035
  3549.  
  3550. -CheckMoney2: ; 16035
  3551. +SubtractMoney: ; 16035
  3552.     ld a, 3
  3553. -CheckFunds2: ; 16037
  3554. +SubtractFunds: ; 16037
  3555.     push hl
  3556.     push de
  3557.     push bc
  3558. @@ -19591,32 +19591,32 @@ CheckFunds2: ; 16037
  3559.     ret
  3560.  ; 16053
  3561.  
  3562. -Function16053: ; 16053
  3563. +AddMoney: ; 16053
  3564.     ld a, $3
  3565. -Function16055: ; 16055
  3566. +AddFunds: ; 16055
  3567.     push hl
  3568.     push de
  3569.     push bc
  3570.     ld h, b
  3571.     ld l, c
  3572.     ld b, a
  3573. -.asm_1605b
  3574. +.loop1
  3575.     dec a
  3576. -   jr z, .asm_16062
  3577. +   jr z, .done
  3578.     inc de
  3579.     inc hl
  3580. -   jr .asm_1605b
  3581. +   jr .loop1
  3582.  
  3583. -.asm_16062
  3584. +.done
  3585.     and a
  3586. -.asm_16063
  3587. +.loop2
  3588.     ld a, [de]
  3589.     adc [hl]
  3590.     ld [de], a
  3591.     dec de
  3592.     dec hl
  3593.     dec b
  3594. -   jr nz, .asm_16063
  3595. +   jr nz, .loop2
  3596.     pop bc
  3597.     pop de
  3598.     pop hl
  3599. @@ -19626,11 +19626,11 @@ Function16055: ; 16055
  3600.  GiveCoins:: ; 1606f
  3601.     ld a, 2
  3602.     ld de, Coins
  3603. -   call Function16055
  3604. +   call AddFunds
  3605.     ld a, 2
  3606.     ld bc, .maxcoins
  3607. -   call CheckFunds
  3608. -   jr c, .asm_1608b
  3609. +   call CompareFunds
  3610. +   jr c, .not_maxed
  3611.     ld hl, .maxcoins
  3612.     ld a, [hli]
  3613.     ld [de], a
  3614. @@ -19640,7 +19640,7 @@ GiveCoins:: ; 1606f
  3615.     scf
  3616.     ret
  3617.  
  3618. -.asm_1608b
  3619. +.not_maxed
  3620.     and a
  3621.     ret
  3622.  ; 1608d
  3623. @@ -19653,7 +19653,7 @@ GiveCoins:: ; 1606f
  3624.  TakeCoins:: ; 1608f
  3625.     ld a, 2
  3626.     ld de, Coins
  3627. -   call CheckFunds2
  3628. +   call SubtractFunds
  3629.     jr nc, .asm_1609f
  3630.     xor a
  3631.     ld [de], a
  3632. @@ -19670,7 +19670,7 @@ TakeCoins:: ; 1608f
  3633.  CheckCoins:: ; 160a1
  3634.     ld a, $2
  3635.     ld de, Coins
  3636. -   jp CheckFunds
  3637. +   jp CompareFunds
  3638.  ; 160a9
  3639.  
  3640.  
  3641. @@ -19788,7 +19788,7 @@ Function16798: ; 16798
  3642.     ld a, [CurPartySpecies]
  3643.     cp EGG
  3644.     jr z, .asm_167e1
  3645. -   callba Functione538
  3646. +   callba CheckCurPartyMonFainted
  3647.     jr c, .asm_167e9
  3648.     ld hl, PartyMon1Item
  3649.     ld bc, PartyMon2 - PartyMon1
  3650. @@ -19868,7 +19868,7 @@ Function16807: ; 16807
  3651.  .asm_1682d
  3652.     ld de, Money
  3653.     ld bc, StringBuffer2 + 2
  3654. -   callba CheckMoney
  3655. +   callba CompareMoney
  3656.     jr c, .asm_16848
  3657.     ld a, [PartyCount]
  3658.     cp $6
  3659. @@ -19913,7 +19913,7 @@ Function1686d: ; 1686d
  3660.     ld de, StringBuffer1
  3661.     ld bc, $000b
  3662.     call CopyBytes
  3663.     ld hl, $0000
  3664.     ld bc, $0064
  3665.     ld a, [StringBuffer2 + 1]
  3666.     call AddNTimes
  3667. @@ -24143,7 +24143,7 @@ MenuDataHeader_0x24d3f: ; 24d3f
  3668.     db $40 ; tile backup
  3669.     db 00, 06 ; start coords
  3670.     db 17, 19 ; end coords
  3671.     dw $0000
  3672.     db 1 ; default option
  3673.  ; 24d47
  3674.  
  3675. @@ -24475,7 +24475,7 @@ MenuData_0x24f34: ; 0x24f34
  3676.     dn 2, 2 ; rows, columns
  3677.     db 6 ; spacing
  3678.     dba Strings24f3d
  3679.     dbw $09, $0000
  3680.  ; 0x24f3d
  3681.  
  3682.  Strings24f3d: ; 0x24f3d
  3683. @@ -27816,7 +27816,7 @@ endr
  3684.     jr nz, .asm_28457
  3685.     ld hl, wc818
  3686.     ld de, wc608 + 10
  3687.     ld bc, $0000
  3688.  .asm_28464
  3689.     inc c
  3690.     ld a, c
  3691. @@ -32498,7 +32498,7 @@ Function2b995: ; 2b995
  3692.  ; 2b9a6
  3693.  
  3694.  Function2b9a6: ; 2b9a6
  3695.     ld de, $0000
  3696.     ld c, $3
  3697.  .asm_2b9ab
  3698.     ld a, [hli]
  3699. @@ -36346,7 +36346,7 @@ Function44654:: ; 44654
  3700.     jr nz, .asm_44691
  3701.  
  3702.  .asm_446ab
  3703. -   callba Functione538
  3704. +   callba CheckCurPartyMonFainted
  3705.     ld a, $4
  3706.     jr c, .asm_446c1
  3707.     xor a
  3708. @@ -41789,15 +41789,15 @@ Function4aad3: ; 4aad3
  3709.  
  3710.     ld c, a
  3711.     xor a
  3712. -   ld [hConnectedMapWidth], a
  3713. +   ld [hMapObjectIndexBuffer2], a
  3714.  .loop
  3715.     push bc
  3716.     push hl
  3717.     ld e, 0
  3718.     callba Function8e83f
  3719. -   ld a, [hConnectedMapWidth]
  3720. +   ld a, [hMapObjectIndexBuffer2]
  3721.     inc a
  3722. -   ld [hConnectedMapWidth], a
  3723. +   ld [hMapObjectIndexBuffer2], a
  3724.     pop hl
  3725.     pop bc
  3726.     dec c
  3727. @@ -43080,7 +43080,7 @@ ClockResetPassword: ; 4d41e
  3728.  .CalculatePassword: ; 4d50f
  3729.     ld a, BANK(sPlayerData)
  3730.     call GetSRAMBank
  3731.     ld de, $0000
  3732.     ld hl, sPlayerData + (PlayerID - wPlayerData)
  3733.     ld c, $2
  3734.     call .ComponentFromNumber
  3735. @@ -46574,7 +46574,7 @@ Function503e0: ; 503e0
  3736.     ret z
  3737.     ld c, a
  3738.     xor a
  3739. -   ld [hConnectedMapWidth], a
  3740. +   ld [hMapObjectIndexBuffer2], a
  3741.  .asm_503ea
  3742.     push bc
  3743.     push hl
  3744. @@ -46582,9 +46582,9 @@ Function503e0: ; 503e0
  3745.     ld a, BANK(Function8e83f)
  3746.     ld e, $0
  3747.     rst FarCall
  3748. -   ld a, [hConnectedMapWidth]
  3749. +   ld a, [hMapObjectIndexBuffer2]
  3750.     inc a
  3751. -   ld [hConnectedMapWidth], a
  3752. +   ld [hMapObjectIndexBuffer2], a
  3753.     pop hl
  3754.     pop bc
  3755.     dec c
  3756. @@ -49737,7 +49737,7 @@ GetMovementAction: ; 802ec
  3757.  IsNPCInFront: ; 80341
  3758.  
  3759.     ld a, 0
  3760. -   ld [hConnectionStripLength], a
  3761. +   ld [hMapObjectIndexBuffer1], a
  3762.     ld a, [MapX]
  3763.     ld d, a
  3764.     ld a, [WalkingX]
  3765. @@ -55278,7 +55278,7 @@ rept 3
  3766.  endr
  3767.     ld e, l
  3768.     ld d, h
  3769.     ld hl, $0000
  3770.     add hl, bc
  3771.     ld a, [wc3b4]
  3772.     ld [hli], a
  3773. @@ -55323,7 +55323,7 @@ endr
  3774.  ; 8d036
  3775.  
  3776.  Function8d036: ; 8d036
  3777.     ld hl, $0000
  3778.     add hl, bc
  3779.     ld [hl], $0
  3780.     ret
  3781. @@ -55831,7 +55831,7 @@ endr
  3782.  
  3783.  .four_zero: ; 8d30a
  3784.     call Function8d6d8
  3785.     ld hl, $0000
  3786.     add hl, bc
  3787.     ld a, [hl]
  3788.     ld hl, $000d
  3789. @@ -58143,7 +58143,7 @@ Function8e862: ; 8e862 (23:6862)
  3790.  
  3791.  Function8e86c: ; 8e86c (23:686c)
  3792.     push bc
  3793. -   ld a, [hConnectedMapWidth]
  3794. +   ld a, [hMapObjectIndexBuffer2]
  3795.     ld hl, PartyMon1Item
  3796.     ld bc, PartyMon2 - PartyMon1
  3797.     call AddNTimes
  3798. @@ -58215,7 +58215,7 @@ Function8e8d5: ; 8e8d5 (23:68d5)
  3799.  
  3800.  Function8e8df: ; 8e8df (23:68df)
  3801.     push bc
  3802. -   ld a, [hConnectedMapWidth]
  3803. +   ld a, [hMapObjectIndexBuffer2]
  3804.     ld hl, PartyMon1Item
  3805.     ld bc, $30
  3806.     call AddNTimes
  3807. @@ -58243,7 +58243,7 @@ Function8e8df: ; 8e8df (23:68df)
  3808.  Function8e908: ; 8e908 (23:6908)
  3809.     ld a, [wc3b7]
  3810.     push af
  3811. -   ld a, [hConnectedMapWidth]
  3812. +   ld a, [hMapObjectIndexBuffer2]
  3813.     ld hl, PartySpecies
  3814.     ld e, a
  3815.     ld d, $0
  3816. @@ -58252,7 +58252,7 @@ Function8e908: ; 8e908 (23:6908)
  3817.     call ReadMonMenuIcon
  3818.     ld [CurIcon], a
  3819.     call Function8e9db
  3820. -   ld a, [hConnectedMapWidth]
  3821. +   ld a, [hMapObjectIndexBuffer2]
  3822.  rept 4
  3823.     add a
  3824.  endr
  3825. @@ -58269,7 +58269,7 @@ endr
  3826.  
  3827.  Function8e936: ; 8e936 (23:6936)
  3828.     push bc
  3829. -   ld a, [hConnectedMapWidth]
  3830. +   ld a, [hMapObjectIndexBuffer2]
  3831.     ld b, a
  3832.     call Function8e94c
  3833.     ld a, b
  3834. @@ -59977,7 +59977,7 @@ Function9102f: ; 9102f (24:502f)
  3835.  
  3836.  Function9106a: ; 9106a
  3837.     push af
  3838.     ld de, $0000
  3839.     ld b, $a
  3840.     ld a, [PlayerGender]
  3841.     bit 0, a
  3842. @@ -60006,7 +60006,7 @@ Function9106a: ; 9106a
  3843.  
  3844.  Function91098: ; 91098
  3845.     push af
  3846.     ld de, $0000
  3847.     ld a, $d
  3848.     call Function3b2a
  3849.     ld hl, $0003
  3850. @@ -61834,7 +61834,7 @@ TownMapMon: ; 91f7b
  3851.     callba GetSpeciesIcon
  3852.  
  3853.  ; Animation/palette
  3854.     ld de, $0000
  3855.     ld a, $0
  3856.     call Function3b2a
  3857.  
  3858. @@ -61869,7 +61869,7 @@ TownMapPlayerIcon: ; 91fa6
  3859.     call Request2bpp
  3860.  
  3861.  ; Animation/palette
  3862.     ld de, $0000
  3863.     ld b, $0a ; Male
  3864.     ld a, [PlayerGender]
  3865.     bit 0, a
  3866. @@ -62918,7 +62918,7 @@ Function92c3a: ; 92c3a
  3867.     ld hl, $0005
  3868.     add hl, bc
  3869.     ld [hl], $0
  3870.     ld hl, $0000
  3871.     add hl, bc
  3872.     ld [hl], $1
  3873.     ld hl, $000f
  3874. @@ -62935,7 +62935,7 @@ Function92c4c: ; 92c4c
  3875.     ret
  3876.  
  3877.  .asm_92c56
  3878.     ld hl, $0000
  3879.     add hl, bc
  3880.     ld a, $0
  3881.     ld [hl], a
  3882. @@ -63043,7 +63043,7 @@ Function92cd2: ; 92cd2
  3883.  .asm_92ce1
  3884.     ld a, SFX_STOP_SLOT
  3885.     call Function9331e
  3886.     ld hl, $0000
  3887.     add hl, bc
  3888.     inc [hl]
  3889.     ld hl, $000a
  3890. @@ -63067,7 +63067,7 @@ Function92cf8: ; 92cf8
  3891.  .asm_92d02
  3892.     ld a, SFX_THROW_BALL
  3893.     call Function9331e
  3894.     ld hl, $0000
  3895.     add hl, bc
  3896.     inc [hl]
  3897.     ld hl, $0005
  3898. @@ -63092,7 +63092,7 @@ Function92d20: ; 92d20
  3899.     ld a, SFX_STOP_SLOT
  3900.     call Function9331e
  3901.     call Function93316
  3902.     ld hl, $0000
  3903.     add hl, bc
  3904.     inc [hl]
  3905.     ld hl, $0005
  3906. @@ -63126,7 +63126,7 @@ Function92d4f: ; 92d4f
  3907.     ret
  3908.  
  3909.  .asm_92d62
  3910.     ld hl, $0000
  3911.     add hl, bc
  3912.     inc [hl]
  3913.     ld hl, $0005
  3914. @@ -63138,7 +63138,7 @@ Function92d4f: ; 92d4f
  3915.  Function92d6e: ; 92d6e
  3916.     xor a
  3917.     ld [wcf64], a
  3918.     ld hl, $0000
  3919.     add hl, bc
  3920.     dec [hl]
  3921.     ld hl, $0005
  3922. @@ -63153,7 +63153,7 @@ Function92d7e: ; 92d7e
  3923.     ld a, SFX_STOP_SLOT
  3924.     call Function9331e
  3925.     call Function93316
  3926.     ld hl, $0000
  3927.     add hl, bc
  3928.     inc [hl]
  3929.     ld hl, $0005
  3930. @@ -63173,7 +63173,7 @@ Function92da4: ; 92da4
  3931.     ld a, [wcf64]
  3932.     and a
  3933.     ret z
  3934.     ld hl, $0000
  3935.     add hl, bc
  3936.     inc [hl]
  3937.     ld a, $2
  3938. @@ -63183,7 +63183,7 @@ Function92db3: ; 92db3
  3939.     ld a, [wcf64]
  3940.     cp $4
  3941.     ret c
  3942.     ld hl, $0000
  3943.     add hl, bc
  3944.     inc [hl]
  3945.     ld hl, $0005
  3946. @@ -63216,7 +63216,7 @@ Function92dca: ; 92dca
  3947.     ld hl, $0005
  3948.     add hl, bc
  3949.     ld [hl], $0
  3950.     ld hl, $0000
  3951.     add hl, bc
  3952.  rept 2
  3953.     dec [hl]
  3954. @@ -63232,7 +63232,7 @@ Function92df7: ; 92df7
  3955.     ld a, SFX_STOP_SLOT
  3956.     call Function9331e
  3957.     call Function93316
  3958.     ld hl, $0000
  3959.     add hl, bc
  3960.     inc [hl]
  3961.     call Function92fc0
  3962. @@ -63252,7 +63252,7 @@ Function92e10: ; 92e10
  3963.  
  3964.  .asm_92e1f
  3965.     dec [hl]
  3966.     ld hl, $0000
  3967.     add hl, bc
  3968.     inc [hl]
  3969.     ld hl, $000b
  3970. @@ -63272,7 +63272,7 @@ Function92e31: ; 92e31
  3971.     ret
  3972.  
  3973.  .asm_92e3b
  3974.     ld hl, $0000
  3975.     add hl, bc
  3976.     dec [hl]
  3977.     ld hl, $0005
  3978. @@ -63290,7 +63290,7 @@ Function92e47: ; 92e47
  3979.     ld hl, $0005
  3980.     add hl, bc
  3981.     ld [hl], $1
  3982.     ld hl, $0000
  3983.     add hl, bc
  3984.     inc [hl]
  3985.     ld hl, $000a
  3986. @@ -66424,7 +66424,7 @@ Functione0000: ; e0000
  3987.     xor a
  3988.     call GetSRAMBank
  3989.     ld hl, sScratch
  3990.     ld bc, $0000
  3991.  .asm_e000b
  3992.     push bc
  3993.     push hl
  3994. @@ -66914,7 +66914,7 @@ Functione0366: ; e0366
  3995.  ; e0398
  3996.  
  3997.  Functione0398: ; e0398
  3998.     ld hl, $0000
  3999.     ld bc, $0006
  4000.     ld a, [wcf64]
  4001.     call AddNTimes
  4002. @@ -71405,7 +71405,7 @@ Functione2f18: ; e2f18 (38:6f18)
  4003.     ld hl, wcb2a
  4004.     add [hl]
  4005.     ld [CurPartyMon], a
  4006. -   callba Functione538
  4007. +   callba CheckCurPartyMonFainted
  4008.     jr c, .AllOthersFainted
  4009.     ld a, [wcb32]
  4010.     and a
  4011. @@ -77198,12 +77198,12 @@ CheckBalance_MomItem2: ; fd044
  4012.     ld a, [hli]
  4013.     ld [hMoneyTemp], a
  4014.     ld a, [hli]
  4015. -   ld [$ffc4], a
  4016. +   ld [hMoneyTemp + 1], a
  4017.     ld a, [hli]
  4018. -   ld [$ffc5], a
  4019. +   ld [hMoneyTemp + 2], a
  4020.     ld de, wd851
  4021.     ld bc, hMoneyTemp
  4022. -   callba CheckMoney
  4023. +   callba CompareMoney
  4024.     jr nc, .have_enough_money
  4025.  
  4026.  .nope
  4027. @@ -77223,7 +77223,7 @@ CheckBalance_MomItem2: ; fd044
  4028.  .loop
  4029.     ld de, wdc19
  4030.     ld bc, wd851
  4031. -   callba CheckMoney
  4032. +   callba CompareMoney
  4033.     jr z, .exact
  4034.     jr nc, .less_than
  4035.     call Functionfd099
  4036. @@ -77246,7 +77246,7 @@ CheckBalance_MomItem2: ; fd044
  4037.  Functionfd099: ; fd099
  4038.     ld de, wdc19
  4039.     ld bc, hMoneyTemp
  4040. -   callba Function16053
  4041. +   callba AddMoney
  4042.     ret
  4043.  ; fd0a6
  4044.  
  4045. @@ -77827,11 +77827,11 @@ Function104263: ; 104263 (41:4263)
  4046.     ld c, $0
  4047.  
  4048.  Function104265: ; 104265 (41:4265)
  4049. -; back up the value of c to hConnectionStripLength
  4050. -   ld a, [hConnectionStripLength]
  4051. +; back up the value of c to hMapObjectIndexBuffer1
  4052. +   ld a, [hMapObjectIndexBuffer1]
  4053.     push af
  4054.     ld a, c
  4055. -   ld [hConnectionStripLength], a
  4056. +   ld [hMapObjectIndexBuffer1], a
  4057.  
  4058.  ; for each row on the screen
  4059.     ld c, SCREEN_HEIGHT
  4060. @@ -77847,7 +77847,7 @@ Function104265: ; 104265 (41:4265)
  4061.     jr nz, .loop2
  4062.  
  4063.  ; load the original value of c into hl 12 times
  4064. -   ld a, [hConnectionStripLength]
  4065. +   ld a, [hMapObjectIndexBuffer1]
  4066.     ld b, 12
  4067.  .loop3
  4068.     ld [hli], a
  4069. @@ -77857,9 +77857,9 @@ Function104265: ; 104265 (41:4265)
  4070.     dec c
  4071.     jr nz, .loop1
  4072.  
  4073. -; restore the original value of hConnectionStripLength
  4074. +; restore the original value of hMapObjectIndexBuffer1
  4075.     pop af
  4076. -   ld [hConnectionStripLength], a
  4077. +   ld [hMapObjectIndexBuffer1], a
  4078.     ret
  4079.  
  4080.  
  4081. @@ -80965,7 +80965,7 @@ Function10616e: ; 10616e
  4082.     ld hl, $a001
  4083.     ld bc, $0080
  4084.     xor a
  4085.     ld de, $0000
  4086.  .asm_106179
  4087.     ld a, e
  4088.     add [hl]
  4089. diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
  4090. index bd764e9..54ba5cc 100644
  4091. --- a/maps/AzaleaGym.asm
  4092. +++ b/maps/AzaleaGym.asm
  4093. @@ -5,21 +5,21 @@ AzaleaGym_MapScriptHeader:
  4094.  .MapCallbacks:
  4095.     db 0
  4096.  
  4097. -BugsyScript_0x18ec1e:
  4098. +BugsyScript:
  4099.     faceplayer
  4100.     loadfont
  4101.     checkevent EVENT_BEAT_BUGSY
  4102.     iftrue .FightDone
  4103. -   writetext UnknownText_0x18ed0b
  4104. +   writetext BugsyText_INeverLose
  4105.     closetext
  4106.     loadmovesprites
  4107.     winlosstext UnknownText_0x18edae, $0000
  4108.     loadtrainer BUGSY, 1
  4109.     startbattle
  4110.     returnafterbattle
  4111.     setevent EVENT_BEAT_BUGSY
  4112.     loadfont
  4113. -   writetext UnknownText_0x18ee14
  4114. +   writetext Text_ReceivedHiveBadge
  4115.     playsound SFX_GET_BADGE
  4116.     waitbutton
  4117.     setflag ENGINE_HIVEBADGE
  4118. @@ -32,18 +32,18 @@ BugsyScript_0x18ec1e:
  4119.     setevent EVENT_BEAT_BUG_CATCHER_BENNY
  4120.     setevent EVENT_BEAT_BUG_CATCHER_AL
  4121.     setevent EVENT_BEAT_BUG_CATCHER_JOSH
  4122. -   writetext UnknownText_0x18ee2b
  4123. +   writetext BugsyText_HiveBadgeSpeech
  4124.     keeptextopen
  4125.     verbosegiveitem TM_FURY_CUTTER, 1
  4126.     iffalse .NoRoomForFuryCutter
  4127.     setevent EVENT_GOT_TM49_FURY_CUTTER
  4128. -   writetext UnknownText_0x18eefa
  4129. +   writetext BugsyText_FuryCutterSpeech
  4130.     closetext
  4131.     loadmovesprites
  4132.     end
  4133.  
  4134.  .GotFuryCutter:
  4135. -   writetext UnknownText_0x18ef98
  4136. +   writetext BugsyText_BugMonsAreDeep
  4137.     closetext
  4138.  .NoRoomForFuryCutter:
  4139.     loadmovesprites
  4140. @@ -61,56 +61,56 @@ AzaleaGymTriggerRockets:
  4141.     jumpstd radiotowerrockets
  4142.  
  4143.  TrainerTwinsAmyandmay1:
  4144.     trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, .AfterScript
  4145.  
  4146.  .AfterScript:
  4147.     talkaftercancel
  4148.     loadfont
  4149. -   writetext UnknownText_0x18f1fc
  4150. +   writetext TwinsAmyandmay1AfterBattleText
  4151.     closetext
  4152.     loadmovesprites
  4153.     end
  4154.  
  4155.  TrainerTwinsAmyandmay2:
  4156.     trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, .AfterScript
  4157.  
  4158.  .AfterScript:
  4159.     talkaftercancel
  4160.     loadfont
  4161. -   writetext UnknownText_0x18f269
  4162. +   writetext TwinsAmyandmay2AfterBattleText
  4163.     closetext
  4164.     loadmovesprites
  4165.     end
  4166.  
  4167. -TrainerBug_catcherBug_catcher_benny:
  4168.     trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, .AfterScript
  4169. +TrainerBug_catcherbenny:
  4170.  
  4171.  .AfterScript:
  4172.     talkaftercancel
  4173.     loadfont
  4174. -   writetext UnknownText_0x18f053
  4175. +   writetext Bug_catcherbennyAfterBattleText
  4176.     closetext
  4177.     loadmovesprites
  4178.     end
  4179.  
  4180.  TrainerBug_catcherAl:
  4181.     trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, .AfterScript
  4182.  
  4183.  .AfterScript:
  4184.     talkaftercancel
  4185.     loadfont
  4186. -   writetext UnknownText_0x18f0d3
  4187. +   writetext Bug_catcherAlAfterBattleText
  4188.     closetext
  4189.     loadmovesprites
  4190.     end
  4191.  
  4192.  TrainerBug_catcherJosh:
  4193.     trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, .AfterScript
  4194.  
  4195.  .AfterScript:
  4196.     talkaftercancel
  4197.     loadfont
  4198. -   writetext UnknownText_0x18f17e
  4199. +   writetext Bug_catcherJoshAfterBattleText
  4200.     closetext
  4201.     loadmovesprites
  4202.     end
  4203. @@ -140,7 +140,7 @@ AzaleaGymStatue:
  4204.     trainertotext BUGSY, 1, $1
  4205.     jumpstd gymstatue2
  4206.  
  4207. -UnknownText_0x18ed0b:
  4208. +BugsyText_INeverLose:
  4209.     text "I'm BUGSY!"
  4210.     line "I never lose when"
  4211.  
  4212. @@ -158,7 +158,7 @@ UnknownText_0x18ed0b:
  4213.     cont "from my studies."
  4214.     done
  4215.  
  4216. -UnknownText_0x18edae:
  4217. +BugsyText_ResearchIncomplete:
  4218.     text "Whoa, amazing!"
  4219.     line "You're an expert"
  4220.     cont "on #MON!"
  4221. @@ -170,12 +170,12 @@ UnknownText_0x18edae:
  4222.     line "this BADGE."
  4223.     done
  4224.  
  4225. -UnknownText_0x18ee14:
  4226. +Text_ReceivedHiveBadge:
  4227.     text "<PLAYER> received"
  4228.     line "HIVEBADGE."
  4229.     done
  4230.  
  4231. -UnknownText_0x18ee2b:
  4232. +BugsyText_HiveBadgeSpeech:
  4233.     text "Do you know the"
  4234.     line "benefits of HIVE-"
  4235.     cont "BADGE?"
  4236. @@ -196,7 +196,7 @@ UnknownText_0x18ee2b:
  4237.     line "you to have this."
  4238.     done
  4239.  
  4240. -UnknownText_0x18eefa:
  4241. +BugsyText_FuryCutterSpeech:
  4242.     text "TM49 contains"
  4243.     line "FURY CUTTER."
  4244.  
  4245. @@ -212,7 +212,7 @@ UnknownText_0x18eefa:
  4246.     line "I discovered it!"
  4247.     done
  4248.  
  4249. -UnknownText_0x18ef98:
  4250. +BugsyText_BugMonsAreDeep:
  4251.     text "Bug #MON are"
  4252.     line "deep. There are"
  4253.  
  4254. @@ -223,7 +223,7 @@ UnknownText_0x18ef98:
  4255.     line "ites thoroughly."
  4256.     done
  4257.  
  4258. -Bug_catcherBug_catcher_bennySeenText:
  4259. +Bug_catcherbennySeenText:
  4260.     text "Bug #MON evolve"
  4261.     line "young. So they get"
  4262.  
  4263. @@ -231,12 +231,12 @@ Bug_catcherBug_catcher_bennySeenText:
  4264.     line "faster."
  4265.     done
  4266.  
  4267. -Bug_catcherBug_catcher_bennyBeatenText:
  4268. +Bug_catcherbennyBeatenText:
  4269.     text "Just evolving"
  4270.     line "isn't enough!"
  4271.     done
  4272.  
  4273. -UnknownText_0x18f053:
  4274. +Bug_catcherbennyAfterBattleText:
  4275.     text "#MON become"
  4276.     line "stronger if they"
  4277.     cont "evolve. Really!"
  4278. @@ -255,7 +255,7 @@ Bug_catcherAlBeatenText:
  4279.     line "tough you are…"
  4280.     done
  4281.  
  4282. -UnknownText_0x18f0d3:
  4283. +Bug_catcherAlAfterBattleText:
  4284.     text "They're so cool,"
  4285.     line "but most girls"
  4286.  
  4287. @@ -279,7 +279,7 @@ Bug_catcherJoshBeatenText:
  4288.     text "Urrgggh!"
  4289.     done
  4290.  
  4291. -UnknownText_0x18f17e:
  4292. +Bug_catcherJoshAfterBattleText:
  4293.     text "I guess I should"
  4294.     line "teach them better"
  4295.     cont "moves…"
  4296. @@ -296,7 +296,7 @@ TwinsAmyandmay1BeatenText:
  4297.     line "double goodness!"
  4298.     done
  4299.  
  4300. -UnknownText_0x18f1fc:
  4301. +TwinsAmyandmay1AfterBattleText:
  4302.     text "AMY: You're"
  4303.     line "really strong!"
  4304.     done
  4305. @@ -312,7 +312,7 @@ TwinsAmyandmay2BeatenText:
  4306.     line "double goodness!"
  4307.     done
  4308.  
  4309. -UnknownText_0x18f269:
  4310. +TwinsAmyandmay2AfterBattleText:
  4311.     text "MAY: Our bug #-"
  4312.     line "MON lost! Oh, what"
  4313.     cont "a shame."
  4314. @@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
  4315.  
  4316.  .PersonEvents:
  4317.     db 7
  4318. -   person_event SPRITE_BUGSY, 7, 5, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript_0x18ec1e, -1
  4319. -   person_event SPRITE_BUG_CATCHER, 3, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherBug_catcher_benny, -1
  4320. -   person_event SPRITE_BUG_CATCHER, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
  4321. -   person_event SPRITE_BUG_CATCHER, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
  4322. -   person_event SPRITE_TWIN, 10, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
  4323. -   person_event SPRITE_TWIN, 10, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
  4324. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1
  4325. +   person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript, -1
  4326. +   person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherbenny, -1
  4327. +   person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
  4328. +   person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
  4329. +   person_event SPRITE_TWIN, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
  4330. +   person_event SPRITE_TWIN, 10, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
  4331. +   person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1
  4332. diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
  4333. index b40acd8..b43f896 100644
  4334. --- a/maps/AzaleaMart.asm
  4335. +++ b/maps/AzaleaMart.asm
  4336. @@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
  4337.  
  4338.  .PersonEvents:
  4339.     db 3
  4340. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
  4341. -   person_event SPRITE_COOLTRAINER_M, 5, 2, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
  4342. -   person_event SPRITE_BUG_CATCHER, 2, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1
  4343. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
  4344. +   person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
  4345. +   person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1
  4346. diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm
  4347. index f64d8ea..4d1a016 100644
  4348. --- a/maps/AzaleaPokeCenter1F.asm
  4349. +++ b/maps/AzaleaPokeCenter1F.asm
  4350. @@ -3,7 +3,7 @@ AzaleaPokeCenter1F_MapScriptHeader:
  4351.     db 1
  4352.  
  4353.     ; triggers
  4354.     dw UnknownScript_0x18db27, $0000
  4355.  
  4356.  .MapCallbacks:
  4357.     db 0
  4358. @@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
  4359.  
  4360.  .PersonEvents:
  4361.     db 4
  4362. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
  4363. -   person_event SPRITE_GENTLEMAN, 6, 9, $4, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
  4364. -   person_event SPRITE_FISHING_GURU, 1, 6, $6, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
  4365. -   person_event SPRITE_POKEFAN_F, 4, 1, $2, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1
  4366. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
  4367. +   person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
  4368. +   person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
  4369. +   person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1
  4370. diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
  4371. index a2016e4..0839586 100644
  4372. --- a/maps/AzaleaTown.asm
  4373. +++ b/maps/AzaleaTown.asm
  4374. @@ -3,9 +3,9 @@ AzaleaTown_MapScriptHeader:
  4375.     db 3
  4376.  
  4377.     ; triggers
  4378.     dw .Trigger1, $0000
  4379.     dw .Trigger2, $0000
  4380.     dw .Trigger3, $0000
  4381.  
  4382.  .MapCallbacks:
  4383.     db 1
  4384. @@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
  4385.  
  4386.  .PersonEvents:
  4387.     db 12
  4388. -   person_event SPRITE_AZALEA_ROCKET, 9, 31, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
  4389. -   person_event SPRITE_GRAMPS, 9, 21, $2, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
  4390. -   person_event SPRITE_TEACHER, 13, 15, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
  4391. -   person_event SPRITE_YOUNGSTER, 9, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
  4392. -   person_event SPRITE_SLOWPOKE, 17, 8, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4393. -   person_event SPRITE_SLOWPOKE, 9, 18, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4394. -   person_event SPRITE_SLOWPOKE, 9, 29, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4395. -   person_event SPRITE_SLOWPOKE, 15, 15, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4396. -   person_event SPRITE_FRUIT_TREE, 2, 8, $1, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
  4397. -   person_event SPRITE_AZALEA_ROCKET, 10, 11, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
  4398. -   person_event SPRITE_AZALEA_ROCKET, 16, 10, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
  4399. -   person_event SPRITE_KURT_OUTSIDE, 5, 6, $8, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
  4400. +   person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
  4401. +   person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
  4402. +   person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
  4403. +   person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
  4404. +   person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4405. +   person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4406. +   person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4407. +   person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
  4408. +   person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
  4409. +   person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
  4410. +   person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
  4411. +   person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
  4412. diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
  4413. index 53b6b87..44b2264 100644
  4414. --- a/maps/BattleTower1F.asm
  4415. +++ b/maps/BattleTower1F.asm
  4416. @@ -3,8 +3,8 @@ BattleTower1F_MapScriptHeader:
  4417.     db 2
  4418.  
  4419.     ; triggers
  4420.     dw UnknownScript_0x9e39d, $0000
  4421.     dw UnknownScript_0x9e3d3, $0000
  4422.  
  4423.  .MapCallbacks:
  4424.     db 0
  4425. @@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
  4426.  
  4427.  .PersonEvents:
  4428.     db 5
  4429. -   person_event SPRITE_RECEPTIONIST, 6, 7, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
  4430. -   person_event SPRITE_YOUNGSTER, 9, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
  4431. -   person_event SPRITE_COOLTRAINER_F, 9, 4, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
  4432. -   person_event SPRITE_BUG_CATCHER, 3, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
  4433. -   person_event SPRITE_GRANNY, 3, 14, $4, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1
  4434. +   person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
  4435. +   person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
  4436. +   person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
  4437. +   person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
  4438. +   person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1
  4439. diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
  4440. index 9bc80b1..7f704e8 100644
  4441. --- a/maps/BattleTowerBattleRoom.asm
  4442. +++ b/maps/BattleTowerBattleRoom.asm
  4443. @@ -3,8 +3,8 @@ BattleTowerBattleRoom_MapScriptHeader:
  4444.     db 2
  4445.  
  4446.     ; triggers
  4447.     dw Script_EnterBattleRoom, $0000
  4448.     dw UnknownScript_0x9f420, $0000
  4449.  
  4450.  .MapCallbacks:
  4451.     db 0
  4452. @@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
  4453.  
  4454.  .PersonEvents:
  4455.     db 2
  4456. -   person_event SPRITE_YOUNGSTER, 0, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
  4457. -   person_event SPRITE_RECEPTIONIST, 6, 1, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
  4458. +   person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
  4459. +   person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
  4460. diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
  4461. index abfd137..5ef5899 100644
  4462. --- a/maps/BattleTowerElevator.asm
  4463. +++ b/maps/BattleTowerElevator.asm
  4464. @@ -3,8 +3,8 @@ BattleTowerElevator_MapScriptHeader:
  4465.     db 2
  4466.  
  4467.     ; triggers
  4468.     dw UnknownScript_0x9f562, $0000
  4469.     dw UnknownScript_0x9f567, $0000
  4470.  
  4471.  .MapCallbacks:
  4472.     db 0
  4473. @@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
  4474.  
  4475.  .PersonEvents:
  4476.     db 1
  4477. -   person_event SPRITE_RECEPTIONIST, 2, 1, $9, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1
  4478. +   person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1
  4479. diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
  4480. index 179ec15..9533a4b 100644
  4481. --- a/maps/BattleTowerHallway.asm
  4482. +++ b/maps/BattleTowerHallway.asm
  4483. @@ -3,8 +3,8 @@ BattleTowerHallway_MapScriptHeader:
  4484.     db 2
  4485.  
  4486.     ; triggers
  4487.     dw UnknownScript_0x9f5bb, $0000
  4488.     dw UnknownScript_0x9f5c0, $0000
  4489.  
  4490.  .MapCallbacks:
  4491.     db 0
  4492. @@ -98,4 +98,4 @@ BattleTowerHallway_MapEventHeader:
  4493.  
  4494.  .PersonEvents:
  4495.     db 1
  4496. -   person_event SPRITE_RECEPTIONIST, 2, 11, $6, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1
  4497. +   person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1
  4498. diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
  4499. index 43ee41e..72030b5 100644
  4500. --- a/maps/BattleTowerOutside.asm
  4501. +++ b/maps/BattleTowerOutside.asm
  4502. @@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
  4503.  
  4504.  .PersonEvents:
  4505.     db 4
  4506. -   person_event SPRITE_STANDING_YOUNGSTER, 12, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
  4507. -   person_event SPRITE_BUENA, 11, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
  4508. -   person_event SPRITE_SAILOR, 18, 12, $5, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
  4509. -   person_event SPRITE_LASS, 24, 12, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
  4510. +   person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
  4511. +   person_event SPRITE_BUENA, 11, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
  4512. +   person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
  4513. +   person_event SPRITE_LASS, 24, 12, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
  4514. diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
  4515. index 3372d84..cdf3d67 100644
  4516. --- a/maps/BillsHouse.asm
  4517. +++ b/maps/BillsHouse.asm
  4518. @@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
  4519.  
  4520.  .PersonEvents:
  4521.     db 1
  4522. -   person_event SPRITE_GRAMPS, 3, 2, $7, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1
  4523. +   person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_07, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1
  4524. diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
  4525. index 9e2b246..4f328d3 100644
  4526. --- a/maps/BlackthornCity.asm
  4527. +++ b/maps/BlackthornCity.asm
  4528. @@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
  4529.  
  4530.  .PersonEvents:
  4531.     db 9
  4532. -   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
  4533. -   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
  4534. -   person_event SPRITE_GRAMPS, 2, 20, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
  4535. -   person_event SPRITE_GRAMPS, 2, 21, $8, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
  4536. -   person_event SPRITE_BLACK_BELT, 31, 24, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
  4537. -   person_event SPRITE_COOLTRAINER_F, 25, 9, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
  4538. -   person_event SPRITE_YOUNGSTER, 15, 13, $5, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
  4539. -   person_event SPRITE_YOUNGSTER, 20, 22, $6, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
  4540. -   person_event SPRITE_COOLTRAINER_F, 19, 35, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1
  4541. +   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
  4542. +   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
  4543. +   person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
  4544. +   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
  4545. +   person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
  4546. +   person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
  4547. +   person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
  4548. +   person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
  4549. +   person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1
  4550. diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm
  4551. index 2e0749c..3fcb64a 100644
  4552. --- a/maps/BlackthornDodrioTradeHouse.asm
  4553. +++ b/maps/BlackthornDodrioTradeHouse.asm
  4554. @@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader:
  4555.  
  4556.  .PersonEvents:
  4557.     db 1
  4558. -   person_event SPRITE_LASS, 3, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1
  4559. +   person_event SPRITE_LASS, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1
  4560. diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
  4561. index 3a50fd9..c42170a 100644
  4562. --- a/maps/BlackthornDragonSpeechHouse.asm
  4563. +++ b/maps/BlackthornDragonSpeechHouse.asm
  4564. @@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
  4565.  
  4566.  .PersonEvents:
  4567.     db 2
  4568. -   person_event SPRITE_GRANNY, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
  4569. -   person_event SPRITE_EKANS, 5, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1
  4570. +   person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
  4571. +   person_event SPRITE_EKANS, 5, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1
  4572. diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
  4573. index 1ca6831..673d3c0 100644
  4574. --- a/maps/BlackthornGym1F.asm
  4575. +++ b/maps/BlackthornGym1F.asm
  4576. @@ -33,7 +33,7 @@ ClairScript_0x194e24:
  4577.     writetext UnknownText_0x194efa
  4578.     closetext
  4579.     loadmovesprites
  4580.     winlosstext UnknownText_0x194fd6, $0000
  4581.     loadtrainer CLAIR, 1
  4582.     startbattle
  4583.     returnafterbattle
  4584. @@ -87,7 +87,7 @@ UnknownScript_0x194e94:
  4585.     end
  4586.  
  4587.  TrainerCooltrainermPaul:
  4588.     trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, $0000, CooltrainermPaulScript
  4589.  
  4590.  CooltrainermPaulScript:
  4591.     talkaftercancel
  4592. @@ -98,7 +98,7 @@ CooltrainermPaulScript:
  4593.     end
  4594.  
  4595.  TrainerCooltrainermMike:
  4596.     trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, $0000, CooltrainermMikeScript
  4597.  
  4598.  CooltrainermMikeScript:
  4599.     talkaftercancel
  4600. @@ -109,7 +109,7 @@ CooltrainermMikeScript:
  4601.     end
  4602.  
  4603.  TrainerCooltrainerfLola:
  4604.     trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, $0000, CooltrainerfLolaScript
  4605.  
  4606.  CooltrainerfLolaScript:
  4607.     talkaftercancel
  4608. @@ -404,8 +404,8 @@ BlackthornGym1F_MapEventHeader:
  4609.  
  4610.  .PersonEvents:
  4611.     db 5
  4612. -   person_event SPRITE_CLAIR, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
  4613. -   person_event SPRITE_COOLTRAINER_M, 6, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
  4614. -   person_event SPRITE_COOLTRAINER_M, 14, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
  4615. -   person_event SPRITE_COOLTRAINER_F, 2, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
  4616. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1
  4617. +   person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
  4618. +   person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
  4619. +   person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
  4620. +   person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
  4621. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1
  4622. diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
  4623. index 50a86d5..880aae7 100644
  4624. --- a/maps/BlackthornGym2F.asm
  4625. +++ b/maps/BlackthornGym2F.asm
  4626. @@ -59,7 +59,7 @@ BlackthornGymBoulder:
  4627.     jumpstd strengthboulder
  4628.  
  4629.  TrainerCooltrainermCody:
  4630.     trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, $0000, CooltrainermCodyScript
  4631.  
  4632.  CooltrainermCodyScript:
  4633.     talkaftercancel
  4634. @@ -70,7 +70,7 @@ CooltrainermCodyScript:
  4635.     end
  4636.  
  4637.  TrainerCooltrainerfFran:
  4638.     trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, $0000, CooltrainerfFranScript
  4639.  
  4640.  CooltrainerfFranScript:
  4641.     talkaftercancel
  4642. @@ -145,11 +145,11 @@ BlackthornGym2F_MapEventHeader:
  4643.  
  4644.  .PersonEvents:
  4645.     db 8
  4646. -   person_event SPRITE_COOLTRAINER_M, 1, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1
  4647. -   person_event SPRITE_COOLTRAINER_F, 11, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1
  4648. -   person_event SPRITE_BOULDER, 2, 8, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
  4649. -   person_event SPRITE_BOULDER, 3, 2, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
  4650. -   person_event SPRITE_BOULDER, 16, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
  4651. -   person_event SPRITE_BOULDER, 3, 3, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  4652. -   person_event SPRITE_BOULDER, 1, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  4653. -   person_event SPRITE_BOULDER, 14, 8, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  4654. +   person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1
  4655. +   person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1
  4656. +   person_event SPRITE_BOULDER, 2, 8, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
  4657. +   person_event SPRITE_BOULDER, 3, 2, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
  4658. +   person_event SPRITE_BOULDER, 16, 6, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
  4659. +   person_event SPRITE_BOULDER, 3, 3, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  4660. +   person_event SPRITE_BOULDER, 1, 6, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  4661. +   person_event SPRITE_BOULDER, 14, 8, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
  4662. diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
  4663. index f39b1f4..35ba57a 100644
  4664. --- a/maps/BlackthornMart.asm
  4665. +++ b/maps/BlackthornMart.asm
  4666. @@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader:
  4667.  
  4668.  .PersonEvents:
  4669.     db 3
  4670. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1
  4671. -   person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1
  4672. -   person_event SPRITE_BLACK_BELT, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1
  4673. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1
  4674. +   person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1
  4675. +   person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1
  4676. diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm
  4677. index 0c441b4..68078bd 100644
  4678. --- a/maps/BlackthornPokeCenter1F.asm
  4679. +++ b/maps/BlackthornPokeCenter1F.asm
  4680. @@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader:
  4681.  
  4682.  .PersonEvents:
  4683.     db 4
  4684. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1
  4685. -   person_event SPRITE_GENTLEMAN, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1
  4686. -   person_event SPRITE_TWIN, 4, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1
  4687. -   person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1
  4688. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1
  4689. +   person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1
  4690. +   person_event SPRITE_TWIN, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1
  4691. +   person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1
  4692. diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
  4693. index 40ff945..79b7a8e 100644
  4694. --- a/maps/BluesHouse.asm
  4695. +++ b/maps/BluesHouse.asm
  4696. @@ -158,4 +158,4 @@ BluesHouse_MapEventHeader:
  4697.  
  4698.  .PersonEvents:
  4699.     db 1
  4700. -   person_event SPRITE_DAISY, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1
  4701. +   person_event SPRITE_DAISY, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1
  4702. diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
  4703. index d01c549..37f0a63 100644
  4704. --- a/maps/BrunosRoom.asm
  4705. +++ b/maps/BrunosRoom.asm
  4706. @@ -3,8 +3,8 @@ BrunosRoom_MapScriptHeader:
  4707.     db 2
  4708.  
  4709.     ; triggers
  4710.     dw UnknownScript_0x180993, $0000
  4711.     dw UnknownScript_0x180997, $0000
  4712.  
  4713.  .MapCallbacks:
  4714.     db 1
  4715. @@ -52,7 +52,7 @@ BrunoScript_0x1809c5:
  4716.     writetext UnknownText_0x1809fe
  4717.     closetext
  4718.     loadmovesprites
  4719.     winlosstext UnknownText_0x180b23, $0000
  4720.     loadtrainer BRUNO, 1
  4721.     startbattle
  4722.     returnafterbattle
  4723. @@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader:
  4724.  
  4725.  .PersonEvents:
  4726.     db 1
  4727. -   person_event SPRITE_BRUNO, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1
  4728. +   person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1
  4729. diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
  4730. index 7bb2a3e..a7941e0 100644
  4731. --- a/maps/BurnedTower1F.asm
  4732. +++ b/maps/BurnedTower1F.asm
  4733. @@ -3,9 +3,9 @@ BurnedTower1F_MapScriptHeader:
  4734.     db 3
  4735.  
  4736.     ; triggers
  4737.     dw UnknownScript_0x185bf2, $0000
  4738.     dw UnknownScript_0x185bf6, $0000
  4739.     dw UnknownScript_0x185bf7, $0000
  4740.  
  4741.  .MapCallbacks:
  4742.     db 1
  4743. @@ -309,8 +309,8 @@ BurnedTower1F_MapEventHeader:
  4744.  
  4745.  .PersonEvents:
  4746.     db 5
  4747. -   person_event SPRITE_ROCK, 4, 15, $18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1
  4748. -   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
  4749. -   person_event SPRITE_SILVER, 9, 8, $8, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
  4750. -   person_event SPRITE_MORTY, 14, 14, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
  4751. -   person_event SPRITE_POKE_BALL, 2, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP
  4752. +   person_event SPRITE_ROCK, 4, 15, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1
  4753. +   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
  4754. +   person_event SPRITE_SILVER, 9, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
  4755. +   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
  4756. +   person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP
  4757. diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
  4758. index fe4adc5..7241091 100644
  4759. --- a/maps/BurnedTowerB1F.asm
  4760. +++ b/maps/BurnedTowerB1F.asm
  4761. @@ -3,8 +3,8 @@ BurnedTowerB1F_MapScriptHeader:
  4762.     db 2
  4763.  
  4764.     ; triggers
  4765.     dw UnknownScript_0x18615e, $0000
  4766.     dw UnknownScript_0x18615f, $0000
  4767.  
  4768.  .MapCallbacks:
  4769.     db 1
  4770. @@ -251,12 +251,12 @@ BurnedTowerB1F_MapEventHeader:
  4771.  
  4772.  .PersonEvents:
  4773.     db 9
  4774. -   person_event SPRITE_BOULDER, 8, 17, $19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1
  4775. -   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
  4776. -   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
  4777. -   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
  4778. -   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
  4779. -   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
  4780. -   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
  4781. -   person_event SPRITE_POKE_BALL, 4, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
  4782. -   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
  4783. +   person_event SPRITE_BOULDER, 8, 17, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1
  4784. +   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
  4785. +   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
  4786. +   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
  4787. +   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
  4788. +   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
  4789. +   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
  4790. +   person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
  4791. +   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
  4792. diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
  4793. index 22ca25f..39afc30 100644
  4794. --- a/maps/CeladonCafe.asm
  4795. +++ b/maps/CeladonCafe.asm
  4796. @@ -219,8 +219,8 @@ CeladonCafe_MapEventHeader:
  4797.  
  4798.  .PersonEvents:
  4799.     db 5
  4800. -   person_event SPRITE_SUPER_NERD, 3, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1
  4801. -   person_event SPRITE_FISHER, 6, 4, $8, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1
  4802. -   person_event SPRITE_FISHER, 7, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1
  4803. -   person_event SPRITE_FISHER, 2, 1, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1
  4804. -   person_event SPRITE_TEACHER, 3, 4, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1
  4805. +   person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1
  4806. +   person_event SPRITE_FISHER, 6, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1
  4807. +   person_event SPRITE_FISHER, 7, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1
  4808. +   person_event SPRITE_FISHER, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1
  4809. +   person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1
  4810. diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
  4811. index 1298c58..daaa7f0 100644
  4812. --- a/maps/CeladonCity.asm
  4813. +++ b/maps/CeladonCity.asm
  4814. @@ -257,12 +257,12 @@ CeladonCity_MapEventHeader:
  4815.  
  4816.  .PersonEvents:
  4817.     db 9
  4818. -   person_event SPRITE_FISHER, 11, 26, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1
  4819. -   person_event SPRITE_POLIWAG, 11, 27, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1
  4820. -   person_event SPRITE_TEACHER, 24, 20, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1
  4821. -   person_event SPRITE_GRAMPS, 16, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1
  4822. -   person_event SPRITE_GRAMPS, 31, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1
  4823. -   person_event SPRITE_YOUNGSTER, 13, 18, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1
  4824. -   person_event SPRITE_YOUNGSTER, 33, 24, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1
  4825. -   person_event SPRITE_TEACHER, 14, 6, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1
  4826. -   person_event SPRITE_LASS, 22, 7, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1
  4827. +   person_event SPRITE_FISHER, 11, 26, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1
  4828. +   person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1
  4829. +   person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1
  4830. +   person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1
  4831. +   person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1
  4832. +   person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1
  4833. +   person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1
  4834. +   person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1
  4835. +   person_event SPRITE_LASS, 22, 7, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1
  4836. diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
  4837. index 3f8250c..f875e29 100644
  4838. --- a/maps/CeladonDeptStore1F.asm
  4839. +++ b/maps/CeladonDeptStore1F.asm
  4840. @@ -89,6 +89,6 @@ CeladonDeptStore1F_MapEventHeader:
  4841.  
  4842.  .PersonEvents:
  4843.     db 3
  4844. -   person_event SPRITE_RECEPTIONIST, 1, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1
  4845. -   person_event SPRITE_GENTLEMAN, 4, 11, $2, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1
  4846. -   person_event SPRITE_TEACHER, 3, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1
  4847. +   person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1
  4848. +   person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1
  4849. +   person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1
  4850. diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
  4851. index 5124f6f..6524a6c 100644
  4852. --- a/maps/CeladonDeptStore2F.asm
  4853. +++ b/maps/CeladonDeptStore2F.asm
  4854. @@ -82,7 +82,7 @@ CeladonDeptStore2F_MapEventHeader:
  4855.  
  4856.  .PersonEvents:
  4857.     db 4
  4858. -   person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1
  4859. -   person_event SPRITE_CLERK, 5, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1
  4860. -   person_event SPRITE_POKEFAN_M, 2, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1
  4861. -   person_event SPRITE_YOUNGSTER, 2, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1
  4862. +   person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1
  4863. +   person_event SPRITE_CLERK, 5, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1
  4864. +   person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1
  4865. +   person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1
  4866. diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
  4867. index c36b713..b4ec72c 100644
  4868. --- a/maps/CeladonDeptStore3F.asm
  4869. +++ b/maps/CeladonDeptStore3F.asm
  4870. @@ -107,8 +107,8 @@ CeladonDeptStore3F_MapEventHeader:
  4871.  
  4872.  .PersonEvents:
  4873.     db 5
  4874. -   person_event SPRITE_CLERK, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1
  4875. -   person_event SPRITE_YOUNGSTER, 4, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1
  4876. -   person_event SPRITE_GAMEBOY_KID, 1, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1
  4877. -   person_event SPRITE_GAMEBOY_KID, 1, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1
  4878. -   person_event SPRITE_SUPER_NERD, 4, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1
  4879. +   person_event SPRITE_CLERK, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1
  4880. +   person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1
  4881. +   person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1
  4882. +   person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1
  4883. +   person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1
  4884. diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
  4885. index 99741b4..6e9c213 100644
  4886. --- a/maps/CeladonDeptStore4F.asm
  4887. +++ b/maps/CeladonDeptStore4F.asm
  4888. @@ -65,6 +65,6 @@ CeladonDeptStore4F_MapEventHeader:
  4889.  
  4890.  .PersonEvents:
  4891.     db 3
  4892. -   person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1
  4893. -   person_event SPRITE_SUPER_NERD, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1
  4894. -   person_event SPRITE_YOUNGSTER, 2, 8, $7, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1
  4895. +   person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1
  4896. +   person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1
  4897. +   person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1
  4898. diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
  4899. index 94af06d..9eb5040 100644
  4900. --- a/maps/CeladonDeptStore5F.asm
  4901. +++ b/maps/CeladonDeptStore5F.asm
  4902. @@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEventHeader:
  4903.  
  4904.  .PersonEvents:
  4905.     db 5
  4906. -   person_event SPRITE_CLERK, 5, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1
  4907. -   person_event SPRITE_CLERK, 5, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1
  4908. -   person_event SPRITE_GENTLEMAN, 5, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1
  4909. -   person_event SPRITE_SAILOR, 4, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1
  4910. -   person_event SPRITE_TEACHER, 7, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1
  4911. +   person_event SPRITE_CLERK, 5, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1
  4912. +   person_event SPRITE_CLERK, 5, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1
  4913. +   person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1
  4914. +   person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1
  4915. +   person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1
  4916. diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
  4917. index 2eff882..cf623ee 100644
  4918. --- a/maps/CeladonDeptStore6F.asm
  4919. +++ b/maps/CeladonDeptStore6F.asm
  4920. @@ -168,5 +168,5 @@ CeladonDeptStore6F_MapEventHeader:
  4921.  
  4922.  .PersonEvents:
  4923.     db 2
  4924. -   person_event SPRITE_SUPER_NERD, 2, 9, $7, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1
  4925. -   person_event SPRITE_YOUNGSTER, 5, 12, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1
  4926. +   person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1
  4927. +   person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEFN_02, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1
  4928. diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
  4929. index 4f4746f..c10ee71 100644
  4930. --- a/maps/CeladonGameCorner.asm
  4931. +++ b/maps/CeladonGameCorner.asm
  4932. @@ -325,12 +325,12 @@ CeladonGameCorner_MapEventHeader:
  4933.  
  4934.  .PersonEvents:
  4935.     db 9
  4936. -   person_event SPRITE_CLERK, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1
  4937. -   person_event SPRITE_RECEPTIONIST, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1
  4938. -   person_event SPRITE_POKEFAN_M, 10, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1
  4939. -   person_event SPRITE_TEACHER, 7, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1
  4940. -   person_event SPRITE_FISHING_GURU, 7, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1
  4941. -   person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
  4942. -   person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
  4943. -   person_event SPRITE_GYM_GUY, 3, 11, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1
  4944. -   person_event SPRITE_GRAMPS, 8, 2, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1
  4945. +   person_event SPRITE_CLERK, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1
  4946. +   person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1
  4947. +   person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1
  4948. +   person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1
  4949. +   person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1
  4950. +   person_event SPRITE_FISHER, 10, 8, SPRITEMOVEFN_08, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
  4951. +   person_event SPRITE_FISHER, 10, 8, SPRITEMOVEFN_08, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
  4952. +   person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1
  4953. +   person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1
  4954. diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
  4955. index 83f92f2..2a50e27 100644
  4956. --- a/maps/CeladonGameCornerPrizeRoom.asm
  4957. +++ b/maps/CeladonGameCornerPrizeRoom.asm
  4958. @@ -284,5 +284,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
  4959.  
  4960.  .PersonEvents:
  4961.     db 2
  4962. -   person_event SPRITE_GENTLEMAN, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1
  4963. -   person_event SPRITE_PHARMACIST, 4, 4, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1
  4964. +   person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1
  4965. +   person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1
  4966. diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
  4967. index d9128f8..511a4e3 100644
  4968. --- a/maps/CeladonGym.asm
  4969. +++ b/maps/CeladonGym.asm
  4970. @@ -13,7 +13,7 @@ ErikaScript_0x72a6a:
  4971.     writetext UnknownText_0x72b28
  4972.     closetext
  4973.     loadmovesprites
  4974.     winlosstext UnknownText_0x72c3e, $0000
  4975.     loadtrainer ERIKA, 1
  4976.     startbattle
  4977.     returnafterbattle
  4978. @@ -42,7 +42,7 @@ UnknownScript_0x72aae:
  4979.     end
  4980.  
  4981.  TrainerLassMichelle:
  4982.     trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, $0000, LassMichelleScript
  4983.  
  4984.  LassMichelleScript:
  4985.     talkaftercancel
  4986. @@ -53,7 +53,7 @@ LassMichelleScript:
  4987.     end
  4988.  
  4989.  TrainerPicnickerTanya:
  4990.     trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, $0000, PicnickerTanyaScript
  4991.  
  4992.  PicnickerTanyaScript:
  4993.     talkaftercancel
  4994. @@ -64,7 +64,7 @@ PicnickerTanyaScript:
  4995.     end
  4996.  
  4997.  TrainerBeautyJulia:
  4998.     trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, $0000, BeautyJuliaScript
  4999.  
  5000.  BeautyJuliaScript:
  5001.     talkaftercancel
  5002. @@ -75,7 +75,7 @@ BeautyJuliaScript:
  5003.     end
  5004.  
  5005.  TrainerTwinsJoandzoe1:
  5006.     trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, $0000, TwinsJoandzoe1Script
  5007.  
  5008.  TwinsJoandzoe1Script:
  5009.     talkaftercancel
  5010. @@ -86,7 +86,7 @@ TwinsJoandzoe1Script:
  5011.     end
  5012.  
  5013.  TrainerTwinsJoandzoe2:
  5014.     trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, $0000, TwinsJoandzoe2Script
  5015.  
  5016.  TwinsJoandzoe2Script:
  5017.     talkaftercancel
  5018. @@ -278,9 +278,9 @@ CeladonGym_MapEventHeader:
  5019.  
  5020.  .PersonEvents:
  5021.     db 6
  5022. -   person_event SPRITE_ERIKA, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1
  5023. -   person_event SPRITE_LASS, 8, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1
  5024. -   person_event SPRITE_LASS, 8, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1
  5025. -   person_event SPRITE_BUENA, 5, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1
  5026. -   person_event SPRITE_TWIN, 10, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1
  5027. -   person_event SPRITE_TWIN, 10, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1
  5028. +   person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1
  5029. +   person_event SPRITE_LASS, 8, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1
  5030. +   person_event SPRITE_LASS, 8, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1
  5031. +   person_event SPRITE_BUENA, 5, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1
  5032. +   person_event SPRITE_TWIN, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1
  5033. +   person_event SPRITE_TWIN, 10, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1
  5034. diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
  5035. index 26a9a43..897b918 100644
  5036. --- a/maps/CeladonMansion1F.asm
  5037. +++ b/maps/CeladonMansion1F.asm
  5038. @@ -91,7 +91,7 @@ CeladonMansion1F_MapEventHeader:
  5039.  
  5040.  .PersonEvents:
  5041.     db 4
  5042. -   person_event SPRITE_GRANNY, 5, 1, $3, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1
  5043. -   person_event SPRITE_GROWLITHE, 6, 2, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1
  5044. -   person_event SPRITE_CLEFAIRY, 4, 3, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1
  5045. -   person_event SPRITE_GROWLITHE, 4, 4, $16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1
  5046. +   person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1
  5047. +   person_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1
  5048. +   person_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1
  5049. +   person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEFN_16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1
  5050. diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
  5051. index 5e12a63..77adaf9 100644
  5052. --- a/maps/CeladonMansion3F.asm
  5053. +++ b/maps/CeladonMansion3F.asm
  5054. @@ -206,7 +206,7 @@ CeladonMansion3F_MapEventHeader:
  5055.  
  5056.  .PersonEvents:
  5057.     db 4
  5058. -   person_event SPRITE_COOLTRAINER_M, 6, 3, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1
  5059. -   person_event SPRITE_GYM_GUY, 4, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1
  5060. -   person_event SPRITE_SUPER_NERD, 7, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1
  5061. -   person_event SPRITE_FISHER, 4, 0, $7, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1
  5062. +   person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1
  5063. +   person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1
  5064. +   person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1
  5065. +   person_event SPRITE_FISHER, 4, 0, SPRITEMOVEFN_07, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1
  5066. diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
  5067. index b2b4f2b..4e2493f 100644
  5068. --- a/maps/CeladonMansionRoof.asm
  5069. +++ b/maps/CeladonMansionRoof.asm
  5070. @@ -49,4 +49,4 @@ CeladonMansionRoof_MapEventHeader:
  5071.  
  5072.  .PersonEvents:
  5073.     db 1
  5074. -   person_event SPRITE_FISHER, 5, 7, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1
  5075. +   person_event SPRITE_FISHER, 5, 7, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1
  5076. diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
  5077. index cc89ba5..140e837 100644
  5078. --- a/maps/CeladonMansionRoofHouse.asm
  5079. +++ b/maps/CeladonMansionRoofHouse.asm
  5080. @@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader:
  5081.  
  5082.  .PersonEvents:
  5083.     db 1
  5084. -   person_event SPRITE_PHARMACIST, 2, 3, $6, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1
  5085. +   person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEFN_06, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1
  5086. diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm
  5087. index 8142d0d..52cb90e 100644
  5088. --- a/maps/CeladonPokeCenter1F.asm
  5089. +++ b/maps/CeladonPokeCenter1F.asm
  5090. @@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader:
  5091.  
  5092.  .PersonEvents:
  5093.     db 5
  5094. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1
  5095. -   person_event SPRITE_GENTLEMAN, 5, 1, $5, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1
  5096. -   person_event SPRITE_PHARMACIST, 3, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1
  5097. -   person_event SPRITE_COOLTRAINER_F, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1
  5098. -   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
  5099. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1
  5100. +   person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1
  5101. +   person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1
  5102. +   person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1
  5103. +   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
  5104. diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
  5105. index ce2c1eb..60596a2 100644
  5106. --- a/maps/CeruleanCity.asm
  5107. +++ b/maps/CeruleanCity.asm
  5108. @@ -299,9 +299,9 @@ CeruleanCity_MapEventHeader:
  5109.  
  5110.  .PersonEvents:
  5111.     db 6
  5112. -   person_event SPRITE_COOLTRAINER_M, 23, 15, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1
  5113. -   person_event SPRITE_SUPER_NERD, 15, 23, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1
  5114. -   person_event SPRITE_SLOWPOKE, 24, 20, $1, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1
  5115. -   person_event SPRITE_COOLTRAINER_F, 24, 21, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1
  5116. -   person_event SPRITE_FISHER, 26, 30, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1
  5117. -   person_event SPRITE_YOUNGSTER, 12, 6, $3, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1
  5118. +   person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1
  5119. +   person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1
  5120. +   person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1
  5121. +   person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1
  5122. +   person_event SPRITE_FISHER, 26, 30, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1
  5123. +   person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEFN_03, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1
  5124. diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
  5125. index 6907f58..c64410c 100644
  5126. --- a/maps/CeruleanGym.asm
  5127. +++ b/maps/CeruleanGym.asm
  5128. @@ -3,8 +3,8 @@ CeruleanGym_MapScriptHeader:
  5129.     db 2
  5130.  
  5131.     ; triggers
  5132.     dw UnknownScript_0x1883d9, $0000
  5133.     dw UnknownScript_0x1883da, $0000
  5134.  
  5135.  .MapCallbacks:
  5136.     db 0
  5137. @@ -60,7 +60,7 @@ MistyScript_0x188432:
  5138.     writetext UnknownText_0x188674
  5139.     closetext
  5140.     loadmovesprites
  5141.     winlosstext UnknownText_0x18870c, $0000
  5142.     loadtrainer MISTY, 1
  5143.     startbattle
  5144.     returnafterbattle
  5145. @@ -80,7 +80,7 @@ MistyScript_0x188432:
  5146.     end
  5147.  
  5148.  TrainerSwimmerfDiana:
  5149.     trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, $0000, SwimmerfDianaScript
  5150.  
  5151.  SwimmerfDianaScript:
  5152.     talkaftercancel
  5153. @@ -91,7 +91,7 @@ SwimmerfDianaScript:
  5154.     end
  5155.  
  5156.  TrainerSwimmerfBriana:
  5157.     trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, $0000, SwimmerfBrianaScript
  5158.  
  5159.  SwimmerfBrianaScript:
  5160.     talkaftercancel
  5161. @@ -102,7 +102,7 @@ SwimmerfBrianaScript:
  5162.     end
  5163.  
  5164.  TrainerSwimmermParker:
  5165.     trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, $0000, SwimmermParkerScript
  5166.  
  5167.  SwimmermParkerScript:
  5168.     talkaftercancel
  5169. @@ -377,9 +377,9 @@ CeruleanGym_MapEventHeader:
  5170.  
  5171.  .PersonEvents:
  5172.     db 6
  5173. -   person_event SPRITE_ROCKET, 10, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
  5174. -   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
  5175. -   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
  5176. -   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
  5177. -   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
  5178. -   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
  5179. +   person_event SPRITE_ROCKET, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
  5180. +   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
  5181. +   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
  5182. +   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
  5183. +   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
  5184. +   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
  5185. diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
  5186. index 6697c42..1df647a 100644
  5187. --- a/maps/CeruleanGymBadgeSpeechHouse.asm
  5188. +++ b/maps/CeruleanGymBadgeSpeechHouse.asm
  5189. @@ -30,4 +30,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
  5190.  
  5191.  .PersonEvents:
  5192.     db 1
  5193. -   person_event SPRITE_POKEFAN_M, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x188002, -1
  5194. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x188002, -1
  5195. diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
  5196. index e1824e5..05b6e3d 100644
  5197. --- a/maps/CeruleanMart.asm
  5198. +++ b/maps/CeruleanMart.asm
  5199. @@ -57,6 +57,6 @@ CeruleanMart_MapEventHeader:
  5200.  
  5201.  .PersonEvents:
  5202.     db 3
  5203. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x188ac0, -1
  5204. -   person_event SPRITE_COOLTRAINER_M, 6, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x188ac7, -1
  5205. -   person_event SPRITE_COOLTRAINER_F, 2, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x188aca, -1
  5206. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x188ac0, -1
  5207. +   person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x188ac7, -1
  5208. +   person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x188aca, -1
  5209. diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm
  5210. index ea636a3..bace05a 100644
  5211. --- a/maps/CeruleanPokeCenter1F.asm
  5212. +++ b/maps/CeruleanPokeCenter1F.asm
  5213. @@ -75,6 +75,6 @@ CeruleanPokeCenter1F_MapEventHeader:
  5214.  
  5215.  .PersonEvents:
  5216.     db 3
  5217. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18820f, -1
  5218. -   person_event SPRITE_SUPER_NERD, 4, 8, $5, 0, 1, -1, -1, 0, 0, 0, SuperNerdScript_0x188212, -1
  5219. -   person_event SPRITE_GYM_GUY, 5, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x18821e, -1
  5220. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18820f, -1
  5221. +   person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SuperNerdScript_0x188212, -1
  5222. +   person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x18821e, -1
  5223. diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
  5224. index a79a679..fff8867 100644
  5225. --- a/maps/CeruleanPoliceStation.asm
  5226. +++ b/maps/CeruleanPoliceStation.asm
  5227. @@ -55,6 +55,6 @@ CeruleanPoliceStation_MapEventHeader:
  5228.  
  5229.  .PersonEvents:
  5230.     db 3
  5231. -   person_event SPRITE_FISHING_GURU, 1, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x18804a, -1
  5232. -   person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x18804d, -1
  5233. -   person_event SPRITE_DIGLETT, 5, 3, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, DiglettScript_0x188050, -1
  5234. +   person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x18804a, -1
  5235. +   person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x18804d, -1
  5236. +   person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, DiglettScript_0x188050, -1
  5237. diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
  5238. index aa063b1..f938f95 100644
  5239. --- a/maps/CeruleanTradeSpeechHouse.asm
  5240. +++ b/maps/CeruleanTradeSpeechHouse.asm
  5241. @@ -64,7 +64,7 @@ CeruleanTradeSpeechHouse_MapEventHeader:
  5242.  
  5243.  .PersonEvents:
  5244.     db 4
  5245. -   person_event SPRITE_GRANNY, 4, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x188133, -1
  5246. -   person_event SPRITE_GRAMPS, 2, 1, $2, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x188136, -1
  5247. -   person_event SPRITE_RHYDON, 2, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, RhydonScript_0x188139, -1
  5248. -   person_event SPRITE_ZUBAT, 6, 5, $16, 0, 0, -1, -1, 0, 0, 0, ZubatScript_0x188143, -1
  5249. +   person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x188133, -1
  5250. +   person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEFN_02, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x188136, -1
  5251. +   person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, RhydonScript_0x188139, -1
  5252. +   person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ZubatScript_0x188143, -1
  5253. diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
  5254. index 7cd0bbc..f2c58a9 100644
  5255. --- a/maps/CharcoalKiln.asm
  5256. +++ b/maps/CharcoalKiln.asm
  5257. @@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader:
  5258.  
  5259.  .PersonEvents:
  5260.     db 3
  5261. -   person_event SPRITE_BLACK_BELT, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
  5262. -   person_event SPRITE_YOUNGSTER, 3, 5, $2, 1, 1, -1, -1, 0, 0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
  5263. -   person_event SPRITE_MOLTRES, 6, 5, $16, 2, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
  5264. +   person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
  5265. +   person_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
  5266. +   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
  5267. diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
  5268. index f90c6f4..9840e40 100644
  5269. --- a/maps/CherrygroveCity.asm
  5270. +++ b/maps/CherrygroveCity.asm
  5271. @@ -3,8 +3,8 @@ CherrygroveCity_MapScriptHeader:
  5272.     db 2
  5273.  
  5274.     ; triggers
  5275.     dw .Trigger1, $0000
  5276.     dw .Trigger2, $0000
  5277.  
  5278.  .MapCallbacks:
  5279.     db 1
  5280. @@ -570,8 +570,8 @@ CherrygroveCity_MapEventHeader:
  5281.  
  5282.  .PersonEvents:
  5283.     db 5
  5284. -   person_event SPRITE_GRAMPS, 6, 32, $6, 0, 0, -1, -1, 0, 0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
  5285. -   person_event SPRITE_SILVER, 6, 39, $3, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
  5286. -   person_event SPRITE_TEACHER, 12, 27, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x19c146, -1
  5287. -   person_event SPRITE_YOUNGSTER, 7, 23, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19c15a, -1
  5288. -   person_event SPRITE_FISHER, 12, 7, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MysticWaterGuy, -1
  5289. +   person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
  5290. +   person_event SPRITE_SILVER, 6, 39, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
  5291. +   person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x19c146, -1
  5292. +   person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19c15a, -1
  5293. +   person_event SPRITE_FISHER, 12, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MysticWaterGuy, -1
  5294. diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
  5295. index 028842e..9559057 100644
  5296. --- a/maps/CherrygroveEvolutionSpeechHouse.asm
  5297. +++ b/maps/CherrygroveEvolutionSpeechHouse.asm
  5298. @@ -56,5 +56,5 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader:
  5299.  
  5300.  .PersonEvents:
  5301.     db 2
  5302. -   person_event SPRITE_LASS, 5, 3, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x196cb9, -1
  5303. -   person_event SPRITE_YOUNGSTER, 5, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196cb2, -1
  5304. +   person_event SPRITE_LASS, 5, 3, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x196cb9, -1
  5305. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196cb2, -1
  5306. diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
  5307. index 852d2c3..73906b1 100644
  5308. --- a/maps/CherrygroveGymSpeechHouse.asm
  5309. +++ b/maps/CherrygroveGymSpeechHouse.asm
  5310. @@ -59,5 +59,5 @@ CherrygroveGymSpeechHouse_MapEventHeader:
  5311.  
  5312.  .PersonEvents:
  5313.     db 2
  5314. -   person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x196ae1, -1
  5315. -   person_event SPRITE_BUG_CATCHER, 5, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x196ae4, -1
  5316. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x196ae1, -1
  5317. +   person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x196ae4, -1
  5318. diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
  5319. index 7c35c3b..2690feb 100644
  5320. --- a/maps/CherrygroveMart.asm
  5321. +++ b/maps/CherrygroveMart.asm
  5322. @@ -9,7 +9,7 @@ ClerkScript_0x19680a:
  5323.     loadfont
  5324.     checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
  5325.     iftrue UnknownScript_0x196817
  5326.     pokemart $0, $0000
  5327.     loadmovesprites
  5328.     end
  5329.  
  5330. @@ -83,6 +83,6 @@ CherrygroveMart_MapEventHeader:
  5331.  
  5332.  .PersonEvents:
  5333.     db 3
  5334. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x19680a, -1
  5335. -   person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x19681d, -1
  5336. -   person_event SPRITE_YOUNGSTER, 5, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196831, -1
  5337. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x19680a, -1
  5338. +   person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x19681d, -1
  5339. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196831, -1
  5340. diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm
  5341. index 4b250f2..fb1a5f4 100644
  5342. --- a/maps/CherrygrovePokeCenter1F.asm
  5343. +++ b/maps/CherrygrovePokeCenter1F.asm
  5344. @@ -80,7 +80,7 @@ CherrygrovePokeCenter1F_MapEventHeader:
  5345.  
  5346.  .PersonEvents:
  5347.     db 4
  5348. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19696d, -1
  5349. -   person_event SPRITE_FISHER, 3, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x196970, -1
  5350. -   person_event SPRITE_GENTLEMAN, 6, 8, $7, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196973, -1
  5351. -   person_event SPRITE_TEACHER, 6, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x196976, -1
  5352. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19696d, -1
  5353. +   person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x196970, -1
  5354. +   person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196973, -1
  5355. +   person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x196976, -1
  5356. diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
  5357. index 1efd4ff..bd8c682 100644
  5358. --- a/maps/CianwoodCity.asm
  5359. +++ b/maps/CianwoodCity.asm
  5360. @@ -3,8 +3,8 @@ CianwoodCity_MapScriptHeader:
  5361.     db 2
  5362.  
  5363.     ; triggers
  5364.     dw .Trigger1, $0000
  5365.     dw .Trigger2, $0000
  5366.  
  5367.  .MapCallbacks:
  5368.     db 1
  5369. @@ -52,7 +52,7 @@ UnknownScript_0x1a001e:
  5370.     writetext UnknownText_0x1a0433
  5371.     closetext
  5372.     loadmovesprites
  5373.     winlosstext UnknownText_0x1a05a1, $0000
  5374.     setlasttalked $c
  5375.     loadtrainer MYSTICALMAN, EUSINE
  5376.     startbattle
  5377. @@ -401,15 +401,15 @@ CianwoodCity_MapEventHeader:
  5378.  
  5379.  .PersonEvents:
  5380.     db 12
  5381. -   person_event SPRITE_STANDING_YOUNGSTER, 37, 21, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, StandingYoungsterScript_0x1a00b3, -1
  5382. -   person_event SPRITE_POKEFAN_M, 33, 17, $5, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x1a00b6, -1
  5383. -   person_event SPRITE_LASS, 42, 14, $4, 2, 0, -1, -1, 0, 0, 0, LassScript_0x1a00b9, -1
  5384. -   person_event SPRITE_ROCK, 16, 8, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5385. -   person_event SPRITE_ROCK, 17, 9, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5386. -   person_event SPRITE_ROCK, 25, 4, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5387. -   person_event SPRITE_ROCK, 29, 5, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5388. -   person_event SPRITE_ROCK, 27, 10, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5389. -   person_event SPRITE_ROCK, 19, 4, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5390. -   person_event SPRITE_POKEFAN_F, 46, 10, $5, 0, 1, -1, -1, 0, 0, 0, PokefanFScript_0x1a0084, -1
  5391. -   person_event SPRITE_SUPER_NERD, 21, 11, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
  5392. -   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
  5393. +   person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, StandingYoungsterScript_0x1a00b3, -1
  5394. +   person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x1a00b6, -1
  5395. +   person_event SPRITE_LASS, 42, 14, SPRITEMOVEFN_04, 2, 0, -1, -1, 0, 0, 0, LassScript_0x1a00b9, -1
  5396. +   person_event SPRITE_ROCK, 16, 8, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5397. +   person_event SPRITE_ROCK, 17, 9, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5398. +   person_event SPRITE_ROCK, 25, 4, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5399. +   person_event SPRITE_ROCK, 29, 5, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5400. +   person_event SPRITE_ROCK, 27, 10, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5401. +   person_event SPRITE_ROCK, 19, 4, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
  5402. +   person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, PokefanFScript_0x1a0084, -1
  5403. +   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
  5404. +   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
  5405. diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm
  5406. index 773c823..977bea2 100644
  5407. --- a/maps/CianwoodCityPhotoStudio.asm
  5408. +++ b/maps/CianwoodCityPhotoStudio.asm
  5409. @@ -62,4 +62,4 @@ CianwoodCityPhotoStudio_MapEventHeader:
  5410.  
  5411.  .PersonEvents:
  5412.     db 1
  5413. -   person_event SPRITE_FISHING_GURU, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x9e0e0, -1
  5414. +   person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x9e0e0, -1
  5415. diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
  5416. index 4f66a26..f4350cd 100644
  5417. --- a/maps/CianwoodGym.asm
  5418. +++ b/maps/CianwoodGym.asm
  5419. @@ -28,7 +28,7 @@ ChuckScript_0x9d60f:
  5420.     writetext UnknownText_0x9d78a
  5421.     closetext
  5422.     loadmovesprites
  5423.     winlosstext UnknownText_0x9d7f6, $0000
  5424.     loadtrainer CHUCK, 1
  5425.     startbattle
  5426.     returnafterbattle
  5427. @@ -76,7 +76,7 @@ CianwoodGymTriggerRockets:
  5428.     jumpstd radiotowerrockets
  5429.  
  5430.  TrainerBlackbeltYoshi:
  5431.     trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, $0000, BlackbeltYoshiScript
  5432.  
  5433.  BlackbeltYoshiScript:
  5434.     talkaftercancel
  5435. @@ -87,7 +87,7 @@ BlackbeltYoshiScript:
  5436.     end
  5437.  
  5438.  TrainerBlackbeltLao:
  5439.     trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, $0000, BlackbeltLaoScript
  5440.  
  5441.  BlackbeltLaoScript:
  5442.     talkaftercancel
  5443. @@ -98,7 +98,7 @@ BlackbeltLaoScript:
  5444.     end
  5445.  
  5446.  TrainerBlackbeltNob:
  5447.     trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, $0000, BlackbeltNobScript
  5448.  
  5449.  BlackbeltNobScript:
  5450.     talkaftercancel
  5451. @@ -109,7 +109,7 @@ BlackbeltNobScript:
  5452.     end
  5453.  
  5454.  TrainerBlackbeltLung:
  5455.     trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, $0000, BlackbeltLungScript
  5456.  
  5457.  BlackbeltLungScript:
  5458.     talkaftercancel
  5459. @@ -313,12 +313,12 @@ CianwoodGym_MapEventHeader:
  5460.  
  5461.  .PersonEvents:
  5462.     db 9
  5463. -   person_event SPRITE_CHUCK, 1, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ChuckScript_0x9d60f, -1
  5464. -   person_event SPRITE_BLACK_BELT, 12, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltYoshi, -1
  5465. -   person_event SPRITE_BLACK_BELT, 12, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltLao, -1
  5466. -   person_event SPRITE_BLACK_BELT, 9, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltNob, -1
  5467. -   person_event SPRITE_BLACK_BELT, 5, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBlackbeltLung, -1
  5468. -   person_event SPRITE_BOULDER, 1, 5, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5469. -   person_event SPRITE_BOULDER, 7, 3, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5470. -   person_event SPRITE_BOULDER, 7, 4, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5471. -   person_event SPRITE_BOULDER, 7, 5, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5472. +   person_event SPRITE_CHUCK, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ChuckScript_0x9d60f, -1
  5473. +   person_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltYoshi, -1
  5474. +   person_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltLao, -1
  5475. +   person_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltNob, -1
  5476. +   person_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBlackbeltLung, -1
  5477. +   person_event SPRITE_BOULDER, 1, 5, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5478. +   person_event SPRITE_BOULDER, 7, 3, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5479. +   person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5480. +   person_event SPRITE_BOULDER, 7, 5, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
  5481. diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
  5482. index ee69203..0befc7e 100644
  5483. --- a/maps/CianwoodLugiaSpeechHouse.asm
  5484. +++ b/maps/CianwoodLugiaSpeechHouse.asm
  5485. @@ -75,6 +75,6 @@ CianwoodLugiaSpeechHouse_MapEventHeader:
  5486.  
  5487.  .PersonEvents:
  5488.     db 3
  5489. -   person_event SPRITE_TEACHER, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9e1b0, -1
  5490. -   person_event SPRITE_LASS, 5, 6, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9e1b3, -1
  5491. -   person_event SPRITE_TWIN, 2, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TwinScript_0x9e1b6, -1
  5492. +   person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9e1b0, -1
  5493. +   person_event SPRITE_LASS, 5, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9e1b3, -1
  5494. +   person_event SPRITE_TWIN, 2, 0, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TwinScript_0x9e1b6, -1
  5495. diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
  5496. index 8d09c50..a9dedd4 100644
  5497. --- a/maps/CianwoodPharmacy.asm
  5498. +++ b/maps/CianwoodPharmacy.asm
  5499. @@ -3,7 +3,7 @@ CianwoodPharmacy_MapScriptHeader:
  5500.     db 1
  5501.  
  5502.     ; triggers
  5503.     dw CianwoodPharmacyTrigger, $0000
  5504.  
  5505.  .MapCallbacks:
  5506.     db 0
  5507. @@ -90,4 +90,4 @@ CianwoodPharmacy_MapEventHeader:
  5508.  
  5509.  .PersonEvents:
  5510.     db 1
  5511. -   person_event SPRITE_PHARMACIST, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodPharmacist, -1
  5512. +   person_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodPharmacist, -1
  5513. diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm
  5514. index e2c4dce..e21d218 100644
  5515. --- a/maps/CianwoodPokeCenter1F.asm
  5516. +++ b/maps/CianwoodPokeCenter1F.asm
  5517. @@ -143,7 +143,7 @@ CianwoodPokeCenter1F_MapEventHeader:
  5518.  
  5519.  .PersonEvents:
  5520.     db 4
  5521. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9dbcf, -1
  5522. -   person_event SPRITE_LASS, 5, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9dbd2, -1
  5523. -   person_event SPRITE_GYM_GUY, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodGymGuyScript, -1
  5524. -   person_event SPRITE_SUPER_NERD, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x9dbea, -1
  5525. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9dbcf, -1
  5526. +   person_event SPRITE_LASS, 5, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9dbd2, -1
  5527. +   person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodGymGuyScript, -1
  5528. +   person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x9dbea, -1
  5529. diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
  5530. index 871be40..8346adc 100644
  5531. --- a/maps/CinnabarIsland.asm
  5532. +++ b/maps/CinnabarIsland.asm
  5533. @@ -146,4 +146,4 @@ CinnabarIsland_MapEventHeader:
  5534.  
  5535.  .PersonEvents:
  5536.     db 1
  5537. -   person_event SPRITE_BLUE, 6, 9, $3, 0, 0, -1, -1, 0, 0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
  5538. +   person_event SPRITE_BLUE, 6, 9, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
  5539. diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm
  5540. index 14f300c..5d9fd84 100644
  5541. --- a/maps/CinnabarPokeCenter1F.asm
  5542. +++ b/maps/CinnabarPokeCenter1F.asm
  5543. @@ -47,6 +47,6 @@ CinnabarPokeCenter1F_MapEventHeader:
  5544.  
  5545.  .PersonEvents:
  5546.     db 3
  5547. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ab32c, -1
  5548. -   person_event SPRITE_COOLTRAINER_F, 6, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1ab32f, -1
  5549. -   person_event SPRITE_FISHER, 4, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ab332, -1
  5550. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ab32c, -1
  5551. +   person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1ab32f, -1
  5552. +   person_event SPRITE_FISHER, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ab332, -1
  5553. diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
  5554. index c77512f..80028a7 100644
  5555. --- a/maps/Colosseum.asm
  5556. +++ b/maps/Colosseum.asm
  5557. @@ -3,9 +3,9 @@ Colosseum_MapScriptHeader:
  5558.     db 3
  5559.  
  5560.     ; triggers
  5561.     dw .Trigger1, $0000
  5562.     dw .Trigger2, $0000
  5563.     dw .Trigger3, $0000
  5564.  
  5565.  .MapCallbacks:
  5566.     db 2
  5567. @@ -83,5 +83,5 @@ Colosseum_MapEventHeader:
  5568.  
  5569.  .PersonEvents:
  5570.     db 2
  5571. -   person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
  5572. -   person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
  5573. +   person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
  5574. +   person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
  5575. diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
  5576. index 4eb7919..f8aa486 100644
  5577. --- a/maps/CopycatsHouse1F.asm
  5578. +++ b/maps/CopycatsHouse1F.asm
  5579. @@ -85,6 +85,6 @@ CopycatsHouse1F_MapEventHeader:
  5580.  
  5581.  .PersonEvents:
  5582.     db 3
  5583. -   person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x18ad13, -1
  5584. -   person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PokefanFScript_0x18ad16, -1
  5585. -   person_event SPRITE_CLEFAIRY, 6, 6, $16, 0, 0, -1, -1, 0, 0, 0, ClefairyScript_0x18ad2a, -1
  5586. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x18ad13, -1
  5587. +   person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PokefanFScript_0x18ad16, -1
  5588. +   person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ClefairyScript_0x18ad2a, -1
  5589. diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
  5590. index b4e608c..394f201 100644
  5591. --- a/maps/CopycatsHouse2F.asm
  5592. +++ b/maps/CopycatsHouse2F.asm
  5593. @@ -373,9 +373,9 @@ CopycatsHouse2F_MapEventHeader:
  5594.  
  5595.  .PersonEvents:
  5596.     db 6
  5597. -   person_event SPRITE_COPYCAT, 3, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Copycat, EVENT_COPYCAT_1
  5598. -   person_event SPRITE_MOLTRES, 4, 6, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CopycatsDodrio, -1
  5599. -   person_event SPRITE_FAIRY, 1, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
  5600. -   person_event SPRITE_MONSTER, 1, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CopycatsHouse2FDoll, -1
  5601. -   person_event SPRITE_BIRD, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopycatsHouse2FDoll, -1
  5602. -   person_event SPRITE_COPYCAT, 3, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, Copycat, EVENT_COPYCAT_2
  5603. +   person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Copycat, EVENT_COPYCAT_1
  5604. +   person_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CopycatsDodrio, -1
  5605. +   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
  5606. +   person_event SPRITE_MONSTER, 1, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CopycatsHouse2FDoll, -1
  5607. +   person_event SPRITE_BIRD, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopycatsHouse2FDoll, -1
  5608. +   person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, Copycat, EVENT_COPYCAT_2
  5609. diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
  5610. index 4824e67..54ef492 100644
  5611. --- a/maps/DanceTheatre.asm
  5612. +++ b/maps/DanceTheatre.asm
  5613. @@ -6,7 +6,7 @@ DanceTheatre_MapScriptHeader:
  5614.     db 0
  5615.  
  5616.  TrainerKimono_girlNaoko2:
  5617.     trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, $0000, Kimono_girlNaoko2Script
  5618.  
  5619.  Kimono_girlNaoko2Script:
  5620.     talkaftercancel
  5621. @@ -17,7 +17,7 @@ Kimono_girlNaoko2Script:
  5622.     end
  5623.  
  5624.  TrainerKimono_girlSayo:
  5625.     trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, $0000, Kimono_girlSayoScript
  5626.  
  5627.  Kimono_girlSayoScript:
  5628.     talkaftercancel
  5629. @@ -28,7 +28,7 @@ Kimono_girlSayoScript:
  5630.     end
  5631.  
  5632.  TrainerKimono_girlZuki:
  5633.     trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, $0000, Kimono_girlZukiScript
  5634.  
  5635.  Kimono_girlZukiScript:
  5636.     talkaftercancel
  5637. @@ -39,7 +39,7 @@ Kimono_girlZukiScript:
  5638.     end
  5639.  
  5640.  TrainerKimono_girlKuni:
  5641.     trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, $0000, Kimono_girlKuniScript
  5642.  
  5643.  Kimono_girlKuniScript:
  5644.     talkaftercancel
  5645. @@ -50,7 +50,7 @@ Kimono_girlKuniScript:
  5646.     end
  5647.  
  5648.  TrainerKimono_girlMiki:
  5649.     trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, $0000, Kimono_girlMikiScript
  5650.  
  5651.  Kimono_girlMikiScript:
  5652.     talkaftercancel
  5653. @@ -345,12 +345,12 @@ DanceTheatre_MapEventHeader:
  5654.  
  5655.  .PersonEvents:
  5656.     db 9
  5657. -   person_event SPRITE_KIMONO_GIRL, 2, 0, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlNaoko2, -1
  5658. -   person_event SPRITE_KIMONO_GIRL, 1, 2, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlSayo, -1
  5659. -   person_event SPRITE_KIMONO_GIRL, 2, 6, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerKimono_girlZuki, -1
  5660. -   person_event SPRITE_KIMONO_GIRL, 1, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlKuni, -1
  5661. -   person_event SPRITE_KIMONO_GIRL, 2, 11, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlMiki, -1
  5662. -   person_event SPRITE_GENTLEMAN, 10, 7, $7, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x994c6, -1
  5663. -   person_event SPRITE_RHYDON, 8, 6, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RhydonScript_0x9951b, -1
  5664. -   person_event SPRITE_COOLTRAINER_M, 10, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x99525, -1
  5665. -   person_event SPRITE_GRANNY, 6, 3, $7, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99528, -1
  5666. +   person_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlNaoko2, -1
  5667. +   person_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlSayo, -1
  5668. +   person_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerKimono_girlZuki, -1
  5669. +   person_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlKuni, -1
  5670. +   person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlMiki, -1
  5671. +   person_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x994c6, -1
  5672. +   person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RhydonScript_0x9951b, -1
  5673. +   person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x99525, -1
  5674. +   person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99528, -1
  5675. diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
  5676. index 0fdc70f..09ff0b2 100644
  5677. --- a/maps/DarkCaveBlackthornEntrance.asm
  5678. +++ b/maps/DarkCaveBlackthornEntrance.asm
  5679. @@ -73,6 +73,6 @@ DarkCaveBlackthornEntrance_MapEventHeader:
  5680.  
  5681.  .PersonEvents:
  5682.     db 3
  5683. -   person_event SPRITE_PHARMACIST, 3, 7, $3, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x18c720, -1
  5684. -   person_event SPRITE_POKE_BALL, 24, 21, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
  5685. -   person_event SPRITE_POKE_BALL, 22, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
  5686. +   person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x18c720, -1
  5687. +   person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
  5688. +   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
  5689. diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
  5690. index 9807cce..6fd85b2 100644
  5691. --- a/maps/DarkCaveVioletEntrance.asm
  5692. +++ b/maps/DarkCaveVioletEntrance.asm
  5693. @@ -43,11 +43,11 @@ DarkCaveVioletEntrance_MapEventHeader:
  5694.  
  5695.  .PersonEvents:
  5696.     db 8
  5697. -   person_event SPRITE_POKE_BALL, 8, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
  5698. -   person_event SPRITE_ROCK, 14, 16, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  5699. -   person_event SPRITE_ROCK, 6, 27, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  5700. -   person_event SPRITE_ROCK, 14, 7, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  5701. -   person_event SPRITE_ROCK, 31, 36, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  5702. -   person_event SPRITE_POKE_BALL, 22, 36, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
  5703. -   person_event SPRITE_POKE_BALL, 9, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
  5704. -   person_event SPRITE_POKE_BALL, 28, 30, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
  5705. +   person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
  5706. +   person_event SPRITE_ROCK, 14, 16, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  5707. +   person_event SPRITE_ROCK, 6, 27, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  5708. +   person_event SPRITE_ROCK, 14, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  5709. +   person_event SPRITE_ROCK, 31, 36, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
  5710. +   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
  5711. +   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
  5712. +   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
  5713. diff --git a/maps/DayCare.asm b/maps/DayCare.asm
  5714. index 1415c73..0af93ee 100644
  5715. --- a/maps/DayCare.asm
  5716. +++ b/maps/DayCare.asm
  5717. @@ -175,5 +175,5 @@ DayCare_MapEventHeader:
  5718.  
  5719.  .PersonEvents:
  5720.     db 2
  5721. -   person_event SPRITE_GRAMPS, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE
  5722. -   person_event SPRITE_GRANNY, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrannyScript_0x62fc3, -1
  5723. +   person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE
  5724. +   person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrannyScript_0x62fc3, -1
  5725. diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
  5726. index 67d6646..b7d1e00 100644
  5727. --- a/maps/DiglettsCave.asm
  5728. +++ b/maps/DiglettsCave.asm
  5729. @@ -42,4 +42,4 @@ DiglettsCave_MapEventHeader:
  5730.  
  5731.  .PersonEvents:
  5732.     db 1
  5733. -   person_event SPRITE_POKEFAN_M, 31, 3, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x74002, -1
  5734. +   person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x74002, -1
  5735. diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
  5736. index 199b43c..18961a5 100644
  5737. --- a/maps/DragonShrine.asm
  5738. +++ b/maps/DragonShrine.asm
  5739. @@ -3,8 +3,8 @@ DragonShrine_MapScriptHeader:
  5740.     db 2
  5741.  
  5742.     ; triggers
  5743.     dw .Trigger1, $0000
  5744.     dw .Trigger2, $0000
  5745.  
  5746.  .MapCallbacks:
  5747.     db 0
  5748. @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader:
  5749.  
  5750.  .PersonEvents:
  5751.     db 4
  5752. -   person_event SPRITE_ELDER, 1, 5, $6, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
  5753. -   person_event SPRITE_ELDER, 4, 2, $9, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
  5754. -   person_event SPRITE_ELDER, 4, 7, $8, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
  5755. -   person_event SPRITE_CLAIR, 8, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
  5756. +   person_event SPRITE_ELDER, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
  5757. +   person_event SPRITE_ELDER, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
  5758. +   person_event SPRITE_ELDER, 4, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
  5759. +   person_event SPRITE_CLAIR, 8, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
  5760. diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
  5761. index baaa078..b3e2e25 100644
  5762. --- a/maps/DragonsDenB1F.asm
  5763. +++ b/maps/DragonsDenB1F.asm
  5764. @@ -3,8 +3,8 @@ DragonsDenB1F_MapScriptHeader:
  5765.     db 2
  5766.  
  5767.     ; triggers
  5768.     dw UnknownScript_0x18c89d, $0000
  5769.     dw UnknownScript_0x18c89e, $0000
  5770.  
  5771.  .MapCallbacks:
  5772.     db 1
  5773. @@ -78,7 +78,7 @@ UnknownScript_0x18c8f9:
  5774.     end
  5775.  
  5776.  TrainerCooltrainermDarin:
  5777.     trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, $0000, CooltrainermDarinScript
  5778.  
  5779.  CooltrainermDarinScript:
  5780.     talkaftercancel
  5781. @@ -89,7 +89,7 @@ CooltrainermDarinScript:
  5782.     end
  5783.  
  5784.  TrainerCooltrainerfCara:
  5785.     trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, $0000, CooltrainerfCaraScript
  5786.  
  5787.  CooltrainerfCaraScript:
  5788.     talkaftercancel
  5789. @@ -100,7 +100,7 @@ CooltrainerfCaraScript:
  5790.     end
  5791.  
  5792.  TrainerTwinsLeaandpia1:
  5793.     trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, $0000, TwinsLeaandpia1Script
  5794.  
  5795.  TwinsLeaandpia1Script:
  5796.     talkaftercancel
  5797. @@ -111,7 +111,7 @@ TwinsLeaandpia1Script:
  5798.     end
  5799.  
  5800.  TrainerTwinsLeaandpia2:
  5801.     trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, $0000, TwinsLeaandpia2Script
  5802.  
  5803.  TwinsLeaandpia2Script:
  5804.     talkaftercancel
  5805. @@ -419,12 +419,12 @@ DragonsDenB1F_MapEventHeader:
  5806.  
  5807.  .PersonEvents:
  5808.     db 9
  5809. -   person_event SPRITE_POKE_BALL, 16, 35, $1, 0, 0, -1, -1, 0, 0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
  5810. -   person_event SPRITE_CLAIR, 30, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
  5811. -   person_event SPRITE_SILVER, 23, 20, $2, 2, 2, -1, -1, 0, 0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
  5812. -   person_event SPRITE_COOLTRAINER_M, 8, 20, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermDarin, -1
  5813. -   person_event SPRITE_COOLTRAINER_F, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfCara, -1
  5814. -   person_event SPRITE_TWIN, 17, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia1, -1
  5815. -   person_event SPRITE_TWIN, 18, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia2, -1
  5816. -   person_event SPRITE_POKE_BALL, 4, 30, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM
  5817. -   person_event SPRITE_POKE_BALL, 20, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
  5818. +   person_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
  5819. +   person_event SPRITE_CLAIR, 30, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
  5820. +   person_event SPRITE_SILVER, 23, 20, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
  5821. +   person_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermDarin, -1
  5822. +   person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfCara, -1
  5823. +   person_event SPRITE_TWIN, 17, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia1, -1
  5824. +   person_event SPRITE_TWIN, 18, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia2, -1
  5825. +   person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM
  5826. +   person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
  5827. diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
  5828. index 4c5aeef..289046d 100644
  5829. --- a/maps/EarlsPokemonAcademy.asm
  5830. +++ b/maps/EarlsPokemonAcademy.asm
  5831. @@ -106,7 +106,7 @@ AcademyBlackboard:
  5832.     dn 3, 2 ; rows, columns
  5833.     db 5 ; spacing
  5834.     dbw BANK(.Text), .Text
  5835.     dbw $1a, $0000
  5836.  
  5837.  .Text
  5838.     db "PSN@"
  5839. @@ -425,9 +425,9 @@ EarlsPokemonAcademy_MapEventHeader:
  5840.  
  5841.  .PersonEvents:
  5842.     db 6
  5843. -   person_event SPRITE_FISHER, 2, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
  5844. -   person_event SPRITE_YOUNGSTER, 5, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x68a83, -1
  5845. -   person_event SPRITE_GAMEBOY_KID, 11, 3, $6, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x68a86, -1
  5846. -   person_event SPRITE_GAMEBOY_KID, 11, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x68a91, -1
  5847. -   person_event SPRITE_YOUNGSTER, 7, 4, $7, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x68a9c, -1
  5848. -   person_event SPRITE_POKEDEX, 4, 2, $1, 0, 0, -1, -1, 0, 0, 0, AcademyNotebook, -1
  5849. +   person_event SPRITE_FISHER, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
  5850. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x68a83, -1
  5851. +   person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x68a86, -1
  5852. +   person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x68a91, -1
  5853. +   person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x68a9c, -1
  5854. +   person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, AcademyNotebook, -1
  5855. diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
  5856. index 6b072e6..804dd5a 100644
  5857. --- a/maps/EcruteakCity.asm
  5858. +++ b/maps/EcruteakCity.asm
  5859. @@ -290,10 +290,10 @@ EcruteakCity_MapEventHeader:
  5860.  
  5861.  .PersonEvents:
  5862.     db 7
  5863. -   person_event SPRITE_GRAMPS, 15, 18, $2, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a4009, -1
  5864. -   person_event SPRITE_GRAMPS, 21, 20, $3, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a400c, -1
  5865. -   person_event SPRITE_LASS, 29, 21, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1a4012, -1
  5866. -   person_event SPRITE_LASS, 9, 3, $7, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a4015, -1
  5867. -   person_event SPRITE_FISHER, 22, 9, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a4029, -1
  5868. -   person_event SPRITE_YOUNGSTER, 14, 10, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a403d, -1
  5869. -   person_event SPRITE_GRAMPS, 7, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS
  5870. +   person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a4009, -1
  5871. +   person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a400c, -1
  5872. +   person_event SPRITE_LASS, 29, 21, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1a4012, -1
  5873. +   person_event SPRITE_LASS, 9, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a4015, -1
  5874. +   person_event SPRITE_FISHER, 22, 9, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a4029, -1
  5875. +   person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a403d, -1
  5876. +   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
  5877. diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
  5878. index 9c012fe..7d153b5 100644
  5879. --- a/maps/EcruteakGym.asm
  5880. +++ b/maps/EcruteakGym.asm
  5881. @@ -3,8 +3,8 @@ EcruteakGym_MapScriptHeader:
  5882.     db 2
  5883.  
  5884.     ; triggers
  5885.     dw UnknownScript_0x99d53, $0000
  5886.     dw UnknownScript_0x99d57, $0000
  5887.  
  5888.  .MapCallbacks:
  5889.     db 0
  5890. @@ -24,7 +24,7 @@ MortyScript_0x99d58:
  5891.     writetext UnknownText_0x99e65
  5892.     closetext
  5893.     loadmovesprites
  5894.     winlosstext UnknownText_0x9a00a, $0000
  5895.     loadtrainer MORTY, 1
  5896.     startbattle
  5897.     returnafterbattle
  5898. @@ -91,7 +91,7 @@ UnknownScript_0x99dc6:
  5899.     end
  5900.  
  5901.  TrainerSageJeffrey:
  5902.     trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, $0000, SageJeffreyScript
  5903.  
  5904.  SageJeffreyScript:
  5905.     talkaftercancel
  5906. @@ -102,7 +102,7 @@ SageJeffreyScript:
  5907.     end
  5908.  
  5909.  TrainerSagePing:
  5910.     trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, $0000, SagePingScript
  5911.  
  5912.  SagePingScript:
  5913.     talkaftercancel
  5914. @@ -113,7 +113,7 @@ SagePingScript:
  5915.     end
  5916.  
  5917.  TrainerMediumMartha:
  5918.     trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, $0000, MediumMarthaScript
  5919.  
  5920.  MediumMarthaScript:
  5921.     talkaftercancel
  5922. @@ -124,7 +124,7 @@ MediumMarthaScript:
  5923.     end
  5924.  
  5925.  TrainerMediumGrace:
  5926.     trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, $0000, MediumGraceScript
  5927.  
  5928.  MediumGraceScript:
  5929.     talkaftercancel
  5930. @@ -429,10 +429,10 @@ EcruteakGym_MapEventHeader:
  5931.  
  5932.  .PersonEvents:
  5933.     db 7
  5934. -   person_event SPRITE_MORTY, 1, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x99d58, -1
  5935. -   person_event SPRITE_SAGE, 7, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSageJeffrey, -1
  5936. -   person_event SPRITE_SAGE, 13, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSagePing, -1
  5937. -   person_event SPRITE_GRANNY, 5, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerMediumMartha, -1
  5938. -   person_event SPRITE_GRANNY, 9, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerMediumGrace, -1
  5939. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, EcruteakGymGuyScript, -1
  5940. -   person_event SPRITE_GRAMPS, 14, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
  5941. +   person_event SPRITE_MORTY, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x99d58, -1
  5942. +   person_event SPRITE_SAGE, 7, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSageJeffrey, -1
  5943. +   person_event SPRITE_SAGE, 13, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSagePing, -1
  5944. +   person_event SPRITE_GRANNY, 5, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerMediumMartha, -1
  5945. +   person_event SPRITE_GRANNY, 9, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerMediumGrace, -1
  5946. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, EcruteakGymGuyScript, -1
  5947. +   person_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
  5948. diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm
  5949. index b410f7d..7eb175d 100644
  5950. --- a/maps/EcruteakHouse.asm
  5951. +++ b/maps/EcruteakHouse.asm
  5952. @@ -3,8 +3,8 @@ EcruteakHouse_MapScriptHeader:
  5953.     db 2
  5954.  
  5955.     ; triggers
  5956.     dw .Trigger1, $0000
  5957.     dw .Trigger2, $0000
  5958.  
  5959.  .MapCallbacks:
  5960.     db 1
  5961. @@ -298,7 +298,7 @@ EcruteakHouse_MapEventHeader:
  5962.  
  5963.  .PersonEvents:
  5964.     db 4
  5965. -   person_event SPRITE_SAGE, 6, 4, $6, 0, 0, -1, -1, 0, 0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
  5966. -   person_event SPRITE_SAGE, 6, 5, $6, 0, 0, -1, -1, 0, 0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
  5967. -   person_event SPRITE_SAGE, 9, 6, $2, 1, 1, -1, -1, 0, 0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
  5968. -   person_event SPRITE_GRAMPS, 11, 3, $2, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
  5969. +   person_event SPRITE_SAGE, 6, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
  5970. +   person_event SPRITE_SAGE, 6, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
  5971. +   person_event SPRITE_SAGE, 9, 6, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
  5972. +   person_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
  5973. diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
  5974. index bc1b679..98d85bb 100644
  5975. --- a/maps/EcruteakItemfinderHouse.asm
  5976. +++ b/maps/EcruteakItemfinderHouse.asm
  5977. @@ -176,5 +176,5 @@ EcruteakItemfinderHouse_MapEventHeader:
  5978.  
  5979.  .PersonEvents:
  5980.     db 2
  5981. -   person_event SPRITE_COOLTRAINER_M, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x9a5fb, -1
  5982. -   person_event SPRITE_POKEDEX, 3, 3, $1, 0, 0, -1, -1, 0, 0, 0, PokedexScript_0x9a620, -1
  5983. +   person_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x9a5fb, -1
  5984. +   person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, PokedexScript_0x9a620, -1
  5985. diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
  5986. index d3218b2..6e54322 100644
  5987. --- a/maps/EcruteakLugiaSpeechHouse.asm
  5988. +++ b/maps/EcruteakLugiaSpeechHouse.asm
  5989. @@ -58,5 +58,5 @@ EcruteakLugiaSpeechHouse_MapEventHeader:
  5990.  
  5991.  .PersonEvents:
  5992.     db 2
  5993. -   person_event SPRITE_GRAMPS, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x99334, -1
  5994. -   person_event SPRITE_YOUNGSTER, 4, 5, $8, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x99337, -1
  5995. +   person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x99334, -1
  5996. +   person_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x99337, -1
  5997. diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
  5998. index e382615..5b34631 100644
  5999. --- a/maps/EcruteakMart.asm
  6000. +++ b/maps/EcruteakMart.asm
  6001. @@ -57,6 +57,6 @@ EcruteakMart_MapEventHeader:
  6002.  
  6003.  .PersonEvents:
  6004.     db 3
  6005. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x99c3b, -1
  6006. -   person_event SPRITE_SUPER_NERD, 2, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x99c42, -1
  6007. -   person_event SPRITE_GRANNY, 6, 6, $7, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99c45, -1
  6008. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x99c3b, -1
  6009. +   person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x99c42, -1
  6010. +   person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99c45, -1
  6011. diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm
  6012. index 66acfaa..4e8071e 100644
  6013. --- a/maps/EcruteakPokeCenter1F.asm
  6014. +++ b/maps/EcruteakPokeCenter1F.asm
  6015. @@ -3,8 +3,8 @@ EcruteakPokeCenter1F_MapScriptHeader:
  6016.     db 2
  6017.  
  6018.     ; triggers
  6019.     dw UnknownScript_0x98e5f, $0000
  6020.     dw UnknownScript_0x98e63, $0000
  6021.  
  6022.  .MapCallbacks:
  6023.     db 0
  6024. @@ -219,8 +219,8 @@ EcruteakPokeCenter1F_MapEventHeader:
  6025.  
  6026.  .PersonEvents:
  6027.     db 5
  6028. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x98eb0, -1
  6029. -   person_event SPRITE_POKEFAN_M, 6, 7, $a, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x98eb3, -1
  6030. -   person_event SPRITE_COOLTRAINER_F, 4, 1, $3, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x98ebf, -1
  6031. -   person_event SPRITE_GYM_GUY, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x98ec2, -1
  6032. -   person_event SPRITE_BILL, 7, 0, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
  6033. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x98eb0, -1
  6034. +   person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEFN_0A, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x98eb3, -1
  6035. +   person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x98ebf, -1
  6036. +   person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x98ec2, -1
  6037. +   person_event SPRITE_BILL, 7, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
  6038. diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
  6039. index e8673a6..68376ca 100644
  6040. --- a/maps/ElmsHouse.asm
  6041. +++ b/maps/ElmsHouse.asm
  6042. @@ -99,5 +99,5 @@ ElmsHouse_MapEventHeader:
  6043.  
  6044.  .PersonEvents:
  6045.     db 2
  6046. -   person_event SPRITE_TEACHER, 5, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ElmsWife, -1
  6047. -   person_event SPRITE_BUG_CATCHER, 4, 5, $7, 0, 0, -1, -1, 0, 0, 0, ElmsSon, -1
  6048. +   person_event SPRITE_TEACHER, 5, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ElmsWife, -1
  6049. +   person_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ElmsSon, -1
  6050. diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
  6051. index 45e0c23..7abd783 100644
  6052. --- a/maps/ElmsLab.asm
  6053. +++ b/maps/ElmsLab.asm
  6054. @@ -3,12 +3,12 @@ ElmsLab_MapScriptHeader:
  6055.     db 6
  6056.  
  6057.     ; triggers
  6058.     dw UnknownScript_0x78b7a, $0000
  6059.     dw UnknownScript_0x78b7e, $0000
  6060.     dw UnknownScript_0x78b7f, $0000
  6061.     dw UnknownScript_0x78b80, $0000
  6062.     dw UnknownScript_0x78b81, $0000
  6063.     dw UnknownScript_0x78b82, $0000
  6064.  
  6065.  .MapCallbacks:
  6066.     db 1
  6067. @@ -1408,9 +1408,9 @@ ElmsLab_MapEventHeader:
  6068.  
  6069.  .PersonEvents:
  6070.     db 6
  6071. -   person_event SPRITE_ELM, 2, 5, $6, 0, 0, -1, -1, 0, 0, 0, ProfElmScript, -1
  6072. -   person_event SPRITE_SCIENTIST, 9, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
  6073. -   person_event SPRITE_POKE_BALL, 3, 6, $1, 0, 0, -1, -1, 0, 0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
  6074. -   person_event SPRITE_POKE_BALL, 3, 7, $1, 0, 0, -1, -1, 0, 0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
  6075. -   person_event SPRITE_POKE_BALL, 3, 8, $1, 0, 0, -1, -1, 0, 0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
  6076. -   person_event SPRITE_OFFICER, 3, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopScript, EVENT_COP_IN_ELMS_LAB
  6077. +   person_event SPRITE_ELM, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ProfElmScript, -1
  6078. +   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
  6079. +   person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
  6080. +   person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
  6081. +   person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
  6082. +   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
  6083. diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
  6084. index 5e3f3a0..7596674 100644
  6085. --- a/maps/FastShip1F.asm
  6086. +++ b/maps/FastShip1F.asm
  6087. @@ -3,9 +3,9 @@ FastShip1F_MapScriptHeader:
  6088.     db 3
  6089.  
  6090.     ; triggers
  6091.     dw .Trigger1, $0000
  6092.     dw .Trigger2, $0000
  6093.     dw .Trigger3, $0000
  6094.  
  6095.  .MapCallbacks:
  6096.     db 0
  6097. @@ -310,7 +310,7 @@ FastShip1F_MapEventHeader:
  6098.  
  6099.  .PersonEvents:
  6100.     db 4
  6101. -   person_event SPRITE_SAILOR, 2, 25, $6, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x75160, -1
  6102. -   person_event SPRITE_SAILOR, 7, 14, $9, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x751d0, -1
  6103. -   person_event SPRITE_SAILOR, 17, 22, $5, 0, 2, -1, -1, 0, 0, 0, SailorScript_0x751e4, -1
  6104. -   person_event SPRITE_GENTLEMAN, 6, 19, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
  6105. +   person_event SPRITE_SAILOR, 2, 25, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x75160, -1
  6106. +   person_event SPRITE_SAILOR, 7, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x751d0, -1
  6107. +   person_event SPRITE_SAILOR, 17, 22, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, SailorScript_0x751e4, -1
  6108. +   person_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
  6109. diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
  6110. index 735ad6e..b094f58 100644
  6111. --- a/maps/FastShipB1F.asm
  6112. +++ b/maps/FastShipB1F.asm
  6113. @@ -3,8 +3,8 @@ FastShipB1F_MapScriptHeader:
  6114.     db 2
  6115.  
  6116.     ; triggers
  6117.     dw UnknownScript_0x7673a, $0000
  6118.     dw UnknownScript_0x7673b, $0000
  6119.  
  6120.  .MapCallbacks:
  6121.     db 0
  6122. @@ -82,7 +82,7 @@ UnknownScript_0x767a0:
  6123.     end
  6124.  
  6125.  TrainerSailorJeff:
  6126.     trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, $0000, SailorJeffScript
  6127.  
  6128.  SailorJeffScript:
  6129.     talkaftercancel
  6130. @@ -93,7 +93,7 @@ SailorJeffScript:
  6131.     end
  6132.  
  6133.  TrainerPicnickerDebra:
  6134.     trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, $0000, PicnickerDebraScript
  6135.  
  6136.  PicnickerDebraScript:
  6137.     talkaftercancel
  6138. @@ -104,7 +104,7 @@ PicnickerDebraScript:
  6139.     end
  6140.  
  6141.  TrainerJugglerFritz:
  6142.     trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, $0000, JugglerFritzScript
  6143.  
  6144.  JugglerFritzScript:
  6145.     talkaftercancel
  6146. @@ -115,7 +115,7 @@ JugglerFritzScript:
  6147.     end
  6148.  
  6149.  TrainerSailorGarrett:
  6150.     trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, $0000, SailorGarrettScript
  6151.  
  6152.  SailorGarrettScript:
  6153.     talkaftercancel
  6154. @@ -126,7 +126,7 @@ SailorGarrettScript:
  6155.     end
  6156.  
  6157.  TrainerFisherJonah:
  6158.     trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, $0000, FisherJonahScript
  6159.  
  6160.  FisherJonahScript:
  6161.     talkaftercancel
  6162. @@ -137,7 +137,7 @@ FisherJonahScript:
  6163.     end
  6164.  
  6165.  TrainerBlackbeltWai:
  6166.     trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, $0000, BlackbeltWaiScript
  6167.  
  6168.  BlackbeltWaiScript:
  6169.     talkaftercancel
  6170. @@ -148,7 +148,7 @@ BlackbeltWaiScript:
  6171.     end
  6172.  
  6173.  TrainerSailorKenneth:
  6174.     trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, $0000, SailorKennethScript
  6175.  
  6176.  SailorKennethScript:
  6177.     talkaftercancel
  6178. @@ -159,7 +159,7 @@ SailorKennethScript:
  6179.     end
  6180.  
  6181.  TrainerTeacherShirley:
  6182.     trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, $0000, TeacherShirleyScript
  6183.  
  6184.  TeacherShirleyScript:
  6185.     talkaftercancel
  6186. @@ -170,7 +170,7 @@ TeacherShirleyScript:
  6187.     end
  6188.  
  6189.  TrainerSchoolboyNate:
  6190.     trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, $0000, SchoolboyNateScript
  6191.  
  6192.  SchoolboyNateScript:
  6193.     talkaftercancel
  6194. @@ -181,7 +181,7 @@ SchoolboyNateScript:
  6195.     end
  6196.  
  6197.  TrainerSchoolboyRicky:
  6198.     trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, $0000, SchoolboyRickyScript
  6199.  
  6200.  SchoolboyRickyScript:
  6201.     talkaftercancel
  6202. @@ -456,15 +456,15 @@ FastShipB1F_MapEventHeader:
  6203.  
  6204.  .PersonEvents:
  6205.     db 12
  6206. -   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
  6207. -   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
  6208. -   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
  6209. -   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
  6210. -   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
  6211. -   person_event SPRITE_SAILOR, 4, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6212. -   person_event SPRITE_FISHER, 8, 25, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6213. -   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
  6214. -   person_event SPRITE_SAILOR, 4, 23, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6215. -   person_event SPRITE_TEACHER, 11, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6216. -   person_event SPRITE_YOUNGSTER, 9, 14, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6217. -   person_event SPRITE_YOUNGSTER, 11, 14, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6218. +   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
  6219. +   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
  6220. +   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
  6221. +   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
  6222. +   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
  6223. +   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
  6224. +   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
  6225. +   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
  6226. +   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
  6227. +   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
  6228. +   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
  6229. +   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
  6230. diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
  6231. index 4f1e4be..b66181f 100644
  6232. --- a/maps/FastShipCabins_NNW_NNE_NE.asm
  6233. +++ b/maps/FastShipCabins_NNW_NNE_NE.asm
  6234. @@ -6,7 +6,7 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader:
  6235.     db 0
  6236.  
  6237.  TrainerCooltrainermSean:
  6238.     trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, $0000, CooltrainermSeanScript
  6239.  
  6240.  CooltrainermSeanScript:
  6241.     talkaftercancel
  6242. @@ -17,7 +17,7 @@ CooltrainermSeanScript:
  6243.     end
  6244.  
  6245.  TrainerCooltrainerfCarol:
  6246.     trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, $0000, CooltrainerfCarolScript
  6247.  
  6248.  CooltrainerfCarolScript:
  6249.     talkaftercancel
  6250. @@ -28,7 +28,7 @@ CooltrainerfCarolScript:
  6251.     end
  6252.  
  6253.  TrainerPokemaniacEthan:
  6254.     trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, $0000, PokemaniacEthanScript
  6255.  
  6256.  PokemaniacEthanScript:
  6257.     talkaftercancel
  6258. @@ -39,7 +39,7 @@ PokemaniacEthanScript:
  6259.     end
  6260.  
  6261.  TrainerHikerNoland:
  6262.     trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, $0000, HikerNolandScript
  6263.  
  6264.  HikerNolandScript:
  6265.     talkaftercancel
  6266. @@ -50,7 +50,7 @@ HikerNolandScript:
  6267.     end
  6268.  
  6269.  TrainerGentlemanEdward:
  6270.     trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, $0000, GentlemanEdwardScript
  6271.  
  6272.  GentlemanEdwardScript:
  6273.     talkaftercancel
  6274. @@ -61,7 +61,7 @@ GentlemanEdwardScript:
  6275.     end
  6276.  
  6277.  TrainerBurglarCorey:
  6278.     trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, $0000, BurglarCoreyScript
  6279.  
  6280.  BurglarCoreyScript:
  6281.     talkaftercancel
  6282. @@ -78,7 +78,7 @@ SailorScript_0x755f1:
  6283.     writetext UnknownText_0x75812
  6284.     closetext
  6285.     loadmovesprites
  6286.     winlosstext UnknownText_0x75897, $0000
  6287.     loadtrainer SAILOR, STANLY
  6288.     startbattle
  6289.     reloadmap
  6290. @@ -278,10 +278,10 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader:
  6291.  
  6292.  .PersonEvents:
  6293.     db 7
  6294. -   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
  6295. -   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
  6296. -   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
  6297. -   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
  6298. -   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
  6299. -   person_event SPRITE_GENTLEMAN, 30, 7, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6300. -   person_event SPRITE_PHARMACIST, 30, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6301. +   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
  6302. +   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
  6303. +   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
  6304. +   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
  6305. +   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
  6306. +   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
  6307. +   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
  6308. diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
  6309. index cd49d5a..7e75998 100644
  6310. --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
  6311. +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
  6312. @@ -128,7 +128,7 @@ TwinScript_0x75f6d:
  6313.     end
  6314.  
  6315.  TrainerPokefanmColin:
  6316.     trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, $0000, PokefanmColinScript
  6317.  
  6318.  PokefanmColinScript:
  6319.     talkaftercancel
  6320. @@ -139,7 +139,7 @@ PokefanmColinScript:
  6321.     end
  6322.  
  6323.  TrainerTwinsMegandpeg1:
  6324.     trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, $0000, TwinsMegandpeg1Script
  6325.  
  6326.  TwinsMegandpeg1Script:
  6327.     talkaftercancel
  6328. @@ -150,7 +150,7 @@ TwinsMegandpeg1Script:
  6329.     end
  6330.  
  6331.  TrainerTwinsMegandpeg2:
  6332.     trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, $0000, TwinsMegandpeg2Script
  6333.  
  6334.  TwinsMegandpeg2Script:
  6335.     talkaftercancel
  6336. @@ -161,7 +161,7 @@ TwinsMegandpeg2Script:
  6337.     end
  6338.  
  6339.  TrainerPsychicRodney:
  6340.     trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, $0000, PsychicRodneyScript
  6341.  
  6342.  PsychicRodneyScript:
  6343.     talkaftercancel
  6344. @@ -172,7 +172,7 @@ PsychicRodneyScript:
  6345.     end
  6346.  
  6347.  TrainerPokefanmJeremy:
  6348.     trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, $0000, PokefanmJeremyScript
  6349.  
  6350.  PokefanmJeremyScript:
  6351.     talkaftercancel
  6352. @@ -183,7 +183,7 @@ PokefanmJeremyScript:
  6353.     end
  6354.  
  6355.  TrainerPokefanfGeorgia:
  6356.     trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, $0000, PokefanfGeorgiaScript
  6357.  
  6358.  PokefanfGeorgiaScript:
  6359.     talkaftercancel
  6360. @@ -194,7 +194,7 @@ PokefanfGeorgiaScript:
  6361.     end
  6362.  
  6363.  TrainerSupernerdShawn:
  6364.     trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, $0000, SupernerdShawnScript
  6365.  
  6366.  SupernerdShawnScript:
  6367.     talkaftercancel
  6368. @@ -471,14 +471,14 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
  6369.  
  6370.  .PersonEvents:
  6371.     db 11
  6372. -   person_event SPRITE_CAPTAIN, 25, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CaptainScript_0x75ea7, -1
  6373. -   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
  6374. -   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
  6375. -   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
  6376. -   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
  6377. -   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
  6378. -   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
  6379. -   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
  6380. -   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
  6381. -   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
  6382. -   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
  6383. +   person_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CaptainScript_0x75ea7, -1
  6384. +   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
  6385. +   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
  6386. +   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
  6387. +   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
  6388. +   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
  6389. +   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
  6390. +   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
  6391. +   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
  6392. +   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
  6393. +   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
  6394. diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
  6395. index 0c610e5..298bdfc 100644
  6396. --- a/maps/FastShipCabins_SW_SSW_NW.asm
  6397. +++ b/maps/FastShipCabins_SW_SSW_NW.asm
  6398. @@ -6,7 +6,7 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader:
  6399.     db 0
  6400.  
  6401.  TrainerFirebreatherLyle:
  6402.     trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, $0000, FirebreatherLyleScript
  6403.  
  6404.  FirebreatherLyleScript:
  6405.     talkaftercancel
  6406. @@ -17,7 +17,7 @@ FirebreatherLyleScript:
  6407.     end
  6408.  
  6409.  TrainerBug_catcherKen:
  6410.     trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, $0000, Bug_catcherKenScript
  6411.  
  6412.  Bug_catcherKenScript:
  6413.     talkaftercancel
  6414. @@ -28,7 +28,7 @@ Bug_catcherKenScript:
  6415.     end
  6416.  
  6417.  TrainerBeautyCassie:
  6418.     trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, $0000, BeautyCassieScript
  6419.  
  6420.  BeautyCassieScript:
  6421.     talkaftercancel
  6422. @@ -39,7 +39,7 @@ BeautyCassieScript:
  6423.     end
  6424.  
  6425.  TrainerGuitaristClyde:
  6426.     trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, $0000, GuitaristClydeScript
  6427.  
  6428.  GuitaristClydeScript:
  6429.     talkaftercancel
  6430. @@ -239,7 +239,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader:
  6431.  
  6432.  .PersonEvents:
  6433.     db 4
  6434. -   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
  6435. -   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
  6436. -   person_event SPRITE_BUENA, 26, 1, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
  6437. -   person_event SPRITE_ROCKER, 28, 3, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
  6438. +   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
  6439. +   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
  6440. +   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
  6441. +   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
  6442. diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
  6443. index 8b6869c..deadc00 100644
  6444. --- a/maps/FightingDojo.asm
  6445. +++ b/maps/FightingDojo.asm
  6446. @@ -57,5 +57,5 @@ FightingDojo_MapEventHeader:
  6447.  
  6448.  .PersonEvents:
  6449.     db 2
  6450. -   person_event SPRITE_BLACK_BELT, 4, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x189b61, -1
  6451. -   person_event SPRITE_POKE_BALL, 1, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND
  6452. +   person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x189b61, -1
  6453. +   person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND
  6454. diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm
  6455. index d523e58..c6ef1df 100644
  6456. --- a/maps/FuchsiaBillSpeechHouse.asm
  6457. +++ b/maps/FuchsiaBillSpeechHouse.asm
  6458. @@ -40,5 +40,5 @@ FuchsiaBillSpeechHouse_MapEventHeader:
  6459.  
  6460.  .PersonEvents:
  6461.     db 2
  6462. -   person_event SPRITE_POKEFAN_F, 3, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x1963bd, -1
  6463. -   person_event SPRITE_YOUNGSTER, 4, 6, $4, 1, 0, -1, -1, 0, 0, 0, YoungsterScript_0x1963c0, -1
  6464. +   person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x1963bd, -1
  6465. +   person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, YoungsterScript_0x1963c0, -1
  6466. diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
  6467. index 5f8bfd8..d083db4 100644
  6468. --- a/maps/FuchsiaCity.asm
  6469. +++ b/maps/FuchsiaCity.asm
  6470. @@ -154,7 +154,7 @@ FuchsiaCity_MapEventHeader:
  6471.  
  6472.  .PersonEvents:
  6473.     db 4
  6474. -   person_event SPRITE_YOUNGSTER, 18, 23, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x194b22, -1
  6475. -   person_event SPRITE_POKEFAN_M, 8, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x194b25, -1
  6476. -   person_event SPRITE_TEACHER, 14, 16, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x194b28, -1
  6477. -   person_event SPRITE_FRUIT_TREE, 1, 8, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x194b43, -1
  6478. +   person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x194b22, -1
  6479. +   person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x194b25, -1
  6480. +   person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x194b28, -1
  6481. +   person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x194b43, -1
  6482. diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
  6483. index 360783a..46bab76 100644
  6484. --- a/maps/FuchsiaGym.asm
  6485. +++ b/maps/FuchsiaGym.asm
  6486. @@ -14,7 +14,7 @@ JanineScript_0x195db9:
  6487.     writetext UnknownText_0x195f35
  6488.     closetext
  6489.     loadmovesprites
  6490.     winlosstext UnknownText_0x195fa1, $0000
  6491.     loadtrainer JANINE, 1
  6492.     startbattle
  6493.     returnafterbattle
  6494. @@ -66,7 +66,7 @@ UnknownScript_0x195e2c:
  6495.     writetext UnknownText_0x1960e6
  6496.     closetext
  6497.     loadmovesprites
  6498.     winlosstext UnknownText_0x196126, $0000
  6499.     loadtrainer LASS, ALICE
  6500.     startbattle
  6501.     iftrue UnknownScript_0x195e4a
  6502. @@ -100,7 +100,7 @@ UnknownScript_0x195e66:
  6503.     writetext UnknownText_0x196166
  6504.     closetext
  6505.     loadmovesprites
  6506.     winlosstext UnknownText_0x19617b, $0000
  6507.     loadtrainer LASS, LINDA
  6508.     startbattle
  6509.     iftrue UnknownScript_0x195e84
  6510. @@ -134,7 +134,7 @@ UnknownScript_0x195ea0:
  6511.     writetext UnknownText_0x1961bb
  6512.     closetext
  6513.     loadmovesprites
  6514.     winlosstext UnknownText_0x1961f1, $0000
  6515.     loadtrainer PICNICKER, CINDY
  6516.     startbattle
  6517.     iftrue UnknownScript_0x195ebe
  6518. @@ -168,7 +168,7 @@ UnknownScript_0x195eda:
  6519.     writetext UnknownText_0x196228
  6520.     closetext
  6521.     loadmovesprites
  6522.     winlosstext UnknownText_0x19624a, $0000
  6523.     loadtrainer CAMPER, BARRY
  6524.     startbattle
  6525.     iftrue UnknownScript_0x195ef8
  6526. @@ -391,9 +391,9 @@ FuchsiaGym_MapEventHeader:
  6527.  
  6528.  .PersonEvents:
  6529.     db 6
  6530. -   person_event SPRITE_JANINE, 10, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineScript_0x195db9, -1
  6531. -   person_event SPRITE_FUCHSIA_GYM_1, 7, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym1Script_0x195e1b, -1
  6532. -   person_event SPRITE_FUCHSIA_GYM_2, 11, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym2Script_0x195e55, -1
  6533. -   person_event SPRITE_FUCHSIA_GYM_3, 4, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym3Script_0x195e8f, -1
  6534. -   person_event SPRITE_FUCHSIA_GYM_4, 2, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym4Script_0x195ec9, -1
  6535. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuchsiaGymGuyScript, -1
  6536. +   person_event SPRITE_JANINE, 10, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineScript_0x195db9, -1
  6537. +   person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym1Script_0x195e1b, -1
  6538. +   person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym2Script_0x195e55, -1
  6539. +   person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym3Script_0x195e8f, -1
  6540. +   person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym4Script_0x195ec9, -1
  6541. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuchsiaGymGuyScript, -1
  6542. diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
  6543. index 6b240ac..92905d8 100644
  6544. --- a/maps/FuchsiaMart.asm
  6545. +++ b/maps/FuchsiaMart.asm
  6546. @@ -49,6 +49,6 @@ FuchsiaMart_MapEventHeader:
  6547.  
  6548.  .PersonEvents:
  6549.     db 3
  6550. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195ce8, -1
  6551. -   person_event SPRITE_FISHER, 2, 3, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x195cef, -1
  6552. -   person_event SPRITE_COOLTRAINER_F, 6, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x195cf2, -1
  6553. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195ce8, -1
  6554. +   person_event SPRITE_FISHER, 2, 3, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x195cef, -1
  6555. +   person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x195cf2, -1
  6556. diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm
  6557. index 183ec42..739db16 100644
  6558. --- a/maps/FuchsiaPokeCenter1F.asm
  6559. +++ b/maps/FuchsiaPokeCenter1F.asm
  6560. @@ -3,7 +3,7 @@ FuchsiaPokeCenter1F_MapScriptHeader:
  6561.     db 1
  6562.  
  6563.     ; triggers
  6564.     dw UnknownScript_0x196458, $0000
  6565.  
  6566.  .MapCallbacks:
  6567.     db 0
  6568. @@ -102,7 +102,7 @@ FuchsiaPokeCenter1F_MapEventHeader:
  6569.  
  6570.  .PersonEvents:
  6571.     db 4
  6572. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, NurseScript_0x196459, -1
  6573. -   person_event SPRITE_COOLTRAINER_M, 4, 8, $5, 0, 1, -1, -1, 0, 0, 0, CooltrainerMScript_0x19645c, -1
  6574. -   person_event SPRITE_COOLTRAINER_F, 4, 1, $5, 0, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x19645f, -1
  6575. -   person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineImpersonatorScript_0x196462, -1
  6576. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, NurseScript_0x196459, -1
  6577. +   person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, CooltrainerMScript_0x19645c, -1
  6578. +   person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x19645f, -1
  6579. +   person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineImpersonatorScript_0x196462, -1
  6580. diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
  6581. index 39a3313..28aeb9e 100644
  6582. --- a/maps/GoldenrodBikeShop.asm
  6583. +++ b/maps/GoldenrodBikeShop.asm
  6584. @@ -125,4 +125,4 @@ GoldenrodBikeShop_MapEventHeader:
  6585.  
  6586.  .PersonEvents:
  6587.     db 1
  6588. -   person_event SPRITE_CLERK, 2, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ClerkScript_0x54750, -1
  6589. +   person_event SPRITE_CLERK, 2, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ClerkScript_0x54750, -1
  6590. diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm
  6591. index e8fcd76..8a8a7dc 100644
  6592. --- a/maps/GoldenrodBillsHouse.asm
  6593. +++ b/maps/GoldenrodBillsHouse.asm
  6594. @@ -257,6 +257,6 @@ GoldenrodBillsHouse_MapEventHeader:
  6595.  
  6596.  .PersonEvents:
  6597.     db 3
  6598. -   person_event SPRITE_BILL, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, BillsHouseBill, EVENT_MET_BILL
  6599. -   person_event SPRITE_POKEFAN_F, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, BillsMom, -1
  6600. -   person_event SPRITE_TWIN, 4, 5, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BillsSister, -1
  6601. +   person_event SPRITE_BILL, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BillsHouseBill, EVENT_MET_BILL
  6602. +   person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BillsMom, -1
  6603. +   person_event SPRITE_TWIN, 4, 5, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BillsSister, -1
  6604. diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
  6605. index e08d75d..8f8a1a3 100644
  6606. --- a/maps/GoldenrodCity.asm
  6607. +++ b/maps/GoldenrodCity.asm
  6608. @@ -581,18 +581,18 @@ GoldenrodCity_MapEventHeader:
  6609.  
  6610.  .PersonEvents:
  6611.     db 15
  6612. -   person_event SPRITE_POKEFAN_M, 18, 7, $7, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS
  6613. -   person_event SPRITE_YOUNGSTER, 17, 30, $2, 1, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS
  6614. -   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
  6615. -   person_event SPRITE_COOLTRAINER_F, 26, 20, $2, 2, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
  6616. -   person_event SPRITE_YOUNGSTER, 17, 19, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS
  6617. -   person_event SPRITE_LASS, 10, 17, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS
  6618. -   person_event SPRITE_GRAMPS, 27, 11, $5, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS
  6619. -   person_event SPRITE_ROCKET, 16, 4, $7, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
  6620. -   person_event SPRITE_ROCKET, 20, 28, $7, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
  6621. -   person_event SPRITE_ROCKET, 15, 8, $6, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
  6622. -   person_event SPRITE_ROCKET, 23, 16, $9, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  6623. -   person_event SPRITE_ROCKET, 20, 29, $7, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  6624. -   person_event SPRITE_ROCKET, 7, 29, $6, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  6625. -   person_event SPRITE_ROCKET, 10, 31, $8, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  6626. -   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
  6627. +   person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS
  6628. +   person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS
  6629. +   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
  6630. +   person_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
  6631. +   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
  6632. +   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
  6633. +   person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS
  6634. +   person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
  6635. +   person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
  6636. +   person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
  6637. +   person_event SPRITE_ROCKET, 23, 16, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  6638. +   person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  6639. +   person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  6640. +   person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  6641. +   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
  6642. diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
  6643. index fc4064c..66d90f7 100644
  6644. --- a/maps/GoldenrodDeptStore1F.asm
  6645. +++ b/maps/GoldenrodDeptStore1F.asm
  6646. @@ -93,7 +93,7 @@ GoldenrodDeptStore1F_MapEventHeader:
  6647.  
  6648.  .PersonEvents:
  6649.     db 4
  6650. -   person_event SPRITE_RECEPTIONIST, 1, 10, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x55981, -1
  6651. -   person_event SPRITE_POKEFAN_F, 4, 5, $6, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x55987, -1
  6652. -   person_event SPRITE_BUG_CATCHER, 5, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x5598a, -1
  6653. -   person_event SPRITE_GENTLEMAN, 5, 11, $2, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x55984, -1
  6654. +   person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x55981, -1
  6655. +   person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x55987, -1
  6656. +   person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x5598a, -1
  6657. +   person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x55984, -1
  6658. diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
  6659. index 61f8e76..112023b 100644
  6660. --- a/maps/GoldenrodDeptStore2F.asm
  6661. +++ b/maps/GoldenrodDeptStore2F.asm
  6662. @@ -113,8 +113,8 @@ GoldenrodDeptStore2F_MapEventHeader:
  6663.  
  6664.  .PersonEvents:
  6665.     db 5
  6666. -   person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55b5d, -1
  6667. -   person_event SPRITE_CLERK, 6, 13, $8, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55b65, -1
  6668. -   person_event SPRITE_YOUNGSTER, 6, 9, $4, 1, 0, -1, -1, 0, 0, 0, YoungsterScript_0x55b6d, -1
  6669. -   person_event SPRITE_COOLTRAINER_F, 2, 6, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x55b70, -1
  6670. -   person_event SPRITE_GENTLEMAN, 6, 2, $3, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x55b73, -1
  6671. +   person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55b5d, -1
  6672. +   person_event SPRITE_CLERK, 6, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55b65, -1
  6673. +   person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, YoungsterScript_0x55b6d, -1
  6674. +   person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x55b70, -1
  6675. +   person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x55b73, -1
  6676. diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
  6677. index 40e3c50..4363ae7 100644
  6678. --- a/maps/GoldenrodDeptStore3F.asm
  6679. +++ b/maps/GoldenrodDeptStore3F.asm
  6680. @@ -71,6 +71,6 @@ GoldenrodDeptStore3F_MapEventHeader:
  6681.  
  6682.  .PersonEvents:
  6683.     db 3
  6684. -   person_event SPRITE_CLERK, 1, 6, $6, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55db8, -1
  6685. -   person_event SPRITE_SUPER_NERD, 5, 12, $a, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x55dc0, -1
  6686. -   person_event SPRITE_ROCKER, 5, 2, $4, 1, 0, -1, -1, 0, 0, 0, RockerScript_0x55dc3, -1
  6687. +   person_event SPRITE_CLERK, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55db8, -1
  6688. +   person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEFN_0A, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x55dc0, -1
  6689. +   person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, RockerScript_0x55dc3, -1
  6690. diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
  6691. index d26263e..74d2138 100644
  6692. --- a/maps/GoldenrodDeptStore4F.asm
  6693. +++ b/maps/GoldenrodDeptStore4F.asm
  6694. @@ -91,7 +91,7 @@ GoldenrodDeptStore4F_MapEventHeader:
  6695.  
  6696.  .PersonEvents:
  6697.     db 4
  6698. -   person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55ee9, -1
  6699. -   person_event SPRITE_COOLTRAINER_M, 7, 11, $9, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x55ef1, -1
  6700. -   person_event SPRITE_BUG_CATCHER, 2, 7, $5, 0, 1, -1, -1, 0, 0, 0, BugCatcherScript_0x55ef4, -1
  6701. -   person_event SPRITE_GAMEBOY_KID, 1, 5, $6, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x55ef7, -1
  6702. +   person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x55ee9, -1
  6703. +   person_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x55ef1, -1
  6704. +   person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, BugCatcherScript_0x55ef4, -1
  6705. +   person_event SPRITE_GAMEBOY_KID, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x55ef7, -1
  6706. diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
  6707. index 94b1933..741b37a 100644
  6708. --- a/maps/GoldenrodDeptStore5F.asm
  6709. +++ b/maps/GoldenrodDeptStore5F.asm
  6710. @@ -232,9 +232,9 @@ GoldenrodDeptStore5F_MapEventHeader:
  6711.  
  6712.  .PersonEvents:
  6713.     db 6
  6714. -   person_event SPRITE_CLERK, 5, 8, $7, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x5609c, -1
  6715. -   person_event SPRITE_LASS, 6, 3, $2, 1, 1, -1, -1, 0, 0, 0, LassScript_0x56130, -1
  6716. -   person_event SPRITE_COOLTRAINER_M, 3, 6, $3, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x56133, -1
  6717. -   person_event SPRITE_POKEFAN_M, 5, 13, $2, 2, 2, -1, -1, 0, 0, 0, PokefanMScript_0x5613a, -1
  6718. -   person_event SPRITE_TWIN, 1, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x56118, -1
  6719. -   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
  6720. +   person_event SPRITE_CLERK, 5, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x5609c, -1
  6721. +   person_event SPRITE_LASS, 6, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, LassScript_0x56130, -1
  6722. +   person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x56133, -1
  6723. +   person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, PokefanMScript_0x5613a, -1
  6724. +   person_event SPRITE_TWIN, 1, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x56118, -1
  6725. +   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
  6726. diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
  6727. index e64e1db..efc0166 100644
  6728. --- a/maps/GoldenrodDeptStore6F.asm
  6729. +++ b/maps/GoldenrodDeptStore6F.asm
  6730. @@ -169,5 +169,5 @@ GoldenrodDeptStore6F_MapEventHeader:
  6731.  
  6732.  .PersonEvents:
  6733.     db 2
  6734. -   person_event SPRITE_LASS, 2, 10, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x564bf, -1
  6735. -   person_event SPRITE_SUPER_NERD, 2, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x564c2, -1
  6736. +   person_event SPRITE_LASS, 2, 10, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x564bf, -1
  6737. +   person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x564c2, -1
  6738. diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
  6739. index e0606ed..b19ef75 100644
  6740. --- a/maps/GoldenrodDeptStoreB1F.asm
  6741. +++ b/maps/GoldenrodDeptStoreB1F.asm
  6742. @@ -121,11 +121,11 @@ GoldenrodDeptStoreB1F_MapEventHeader:
  6743.  
  6744.  .PersonEvents:
  6745.     db 8
  6746. -   person_event SPRITE_POKE_BALL, 15, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
  6747. -   person_event SPRITE_POKE_BALL, 2, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
  6748. -   person_event SPRITE_POKE_BALL, 3, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
  6749. -   person_event SPRITE_POKE_BALL, 15, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
  6750. -   person_event SPRITE_BLACK_BELT, 10, 9, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x7d7b0, -1
  6751. -   person_event SPRITE_BLACK_BELT, 8, 4, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackBeltScript_0x7d7b3, -1
  6752. -   person_event SPRITE_BLACK_BELT, 13, 6, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x7d7b6, -1
  6753. -   person_event SPRITE_MACHOP, 7, 7, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MachopScript_0x7d7b9, -1
  6754. +   person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
  6755. +   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
  6756. +   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
  6757. +   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
  6758. +   person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x7d7b0, -1
  6759. +   person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackBeltScript_0x7d7b3, -1
  6760. +   person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x7d7b6, -1
  6761. +   person_event SPRITE_MACHOP, 7, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MachopScript_0x7d7b9, -1
  6762. diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
  6763. index 9e65e1b..bb72df1 100644
  6764. --- a/maps/GoldenrodDeptStoreRoof.asm
  6765. +++ b/maps/GoldenrodDeptStoreRoof.asm
  6766. @@ -35,7 +35,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
  6767.  
  6768.  ClerkScript_0x5673f:
  6769.     loadfont
  6770.     pokemart $4, $0000
  6771.     loadmovesprites
  6772.     end
  6773.  
  6774. @@ -225,11 +225,11 @@ GoldenrodDeptStoreRoof_MapEventHeader:
  6775.  
  6776.  .PersonEvents:
  6777.     db 8
  6778. -   person_event SPRITE_CLERK, 4, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
  6779. -   person_event SPRITE_POKEFAN_F, 3, 10, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x56746, -1
  6780. -   person_event SPRITE_FISHER, 1, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x56749, -1
  6781. -   person_event SPRITE_TWIN, 4, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON
  6782. -   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
  6783. -   person_event SPRITE_POKEFAN_M, 0, 7, $5, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF
  6784. -   person_event SPRITE_TEACHER, 3, 5, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF
  6785. -   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
  6786. +   person_event SPRITE_CLERK, 4, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
  6787. +   person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x56746, -1
  6788. +   person_event SPRITE_FISHER, 1, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x56749, -1
  6789. +   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
  6790. +   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
  6791. +   person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF
  6792. +   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
  6793. +   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
  6794. diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
  6795. index 4ff95dd..a22fd2a 100644
  6796. --- a/maps/GoldenrodFlowerShop.asm
  6797. +++ b/maps/GoldenrodFlowerShop.asm
  6798. @@ -172,5 +172,5 @@ GoldenrodFlowerShop_MapEventHeader:
  6799.  
  6800.  .PersonEvents:
  6801.     db 2
  6802. -   person_event SPRITE_TEACHER, 4, 2, $9, 0, 0, -1, -1, 0, 0, 0, FlowerShopTeacherScript, -1
  6803. -   person_event SPRITE_LASS, 6, 5, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
  6804. +   person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FlowerShopTeacherScript, -1
  6805. +   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
  6806. diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
  6807. index 6fcd393..1972ebd 100644
  6808. --- a/maps/GoldenrodGameCorner.asm
  6809. +++ b/maps/GoldenrodGameCorner.asm
  6810. @@ -479,15 +479,15 @@ GoldenrodGameCorner_MapEventHeader:
  6811.  
  6812.  .PersonEvents:
  6813.     db 12
  6814. -   person_event SPRITE_CLERK, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ClerkScript_0x56c25, -1
  6815. -   person_event SPRITE_RECEPTIONIST, 2, 16, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x56c28, -1
  6816. -   person_event SPRITE_RECEPTIONIST, 2, 18, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x56d01, -1
  6817. -   person_event SPRITE_PHARMACIST, 7, 8, $8, 0, 0, -1, 2, (1 << 3) | PAL_OW_BLUE, 0, 0, PharmacistScript_0x56df1, -1
  6818. -   person_event SPRITE_PHARMACIST, 7, 8, $8, 0, 0, -1, 4, (1 << 3) | PAL_OW_BLUE, 0, 0, PharmacistScript_0x56df1, -1
  6819. -   person_event SPRITE_POKEFAN_M, 10, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x56dfc, -1
  6820. -   person_event SPRITE_COOLTRAINER_M, 8, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x56e07, -1
  6821. -   person_event SPRITE_POKEFAN_F, 6, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x56e12, -1
  6822. -   person_event SPRITE_COOLTRAINER_F, 3, 10, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x56e1d, -1
  6823. -   person_event SPRITE_GENTLEMAN, 10, 5, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x56e20, -1
  6824. -   person_event SPRITE_POKEFAN_M, 9, 2, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x56e2b, -1
  6825. -   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
  6826. +   person_event SPRITE_CLERK, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ClerkScript_0x56c25, -1
  6827. +   person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x56c28, -1
  6828. +   person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x56d01, -1
  6829. +   person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEFN_08, 0, 0, -1, 2, (1 << 3) | PAL_OW_BLUE, 0, 0, PharmacistScript_0x56df1, -1
  6830. +   person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEFN_08, 0, 0, -1, 4, (1 << 3) | PAL_OW_BLUE, 0, 0, PharmacistScript_0x56df1, -1
  6831. +   person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x56dfc, -1
  6832. +   person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x56e07, -1
  6833. +   person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x56e12, -1
  6834. +   person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEFN_02, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x56e1d, -1
  6835. +   person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x56e20, -1
  6836. +   person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x56e2b, -1
  6837. +   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
  6838. diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
  6839. index fc30ac0..1bd93b1 100644
  6840. --- a/maps/GoldenrodGym.asm
  6841. +++ b/maps/GoldenrodGym.asm
  6842. @@ -3,8 +3,8 @@ GoldenrodGym_MapScriptHeader:
  6843.     db 2
  6844.  
  6845.     ; triggers
  6846.     dw UnknownScript_0x5400a, $0000
  6847.     dw UnknownScript_0x5400b, $0000
  6848.  
  6849.  .MapCallbacks:
  6850.     db 0
  6851. @@ -23,7 +23,7 @@ WhitneyScript_0x5400c:
  6852.     writetext UnknownText_0x54122
  6853.     closetext
  6854.     loadmovesprites
  6855.     winlosstext UnknownText_0x541a5, $0000
  6856.     loadtrainer WHITNEY, 1
  6857.     startbattle
  6858.     returnafterbattle
  6859. @@ -87,7 +87,7 @@ GoldenrodGymTriggerRockets:
  6860.     jumpstd radiotowerrockets
  6861.  
  6862.  TrainerLassCarrie:
  6863.     trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, $0000, LassCarrieScript
  6864.  
  6865.  LassCarrieScript:
  6866.     talkaftercancel
  6867. @@ -111,7 +111,7 @@ WhitneyCriesScript:
  6868.     end
  6869.  
  6870.  TrainerLassBridget:
  6871.     trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, $0000, LassBridgetScript
  6872.  
  6873.  LassBridgetScript:
  6874.     talkaftercancel
  6875. @@ -122,7 +122,7 @@ LassBridgetScript:
  6876.     end
  6877.  
  6878.  TrainerBeautyVictoria:
  6879.     trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, $0000, BeautyVictoriaScript
  6880.  
  6881.  BeautyVictoriaScript:
  6882.     talkaftercancel
  6883. @@ -133,7 +133,7 @@ BeautyVictoriaScript:
  6884.     end
  6885.  
  6886.  TrainerBeautySamantha:
  6887.     trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, $0000, BeautySamanthaScript
  6888.  
  6889.  BeautySamanthaScript:
  6890.     talkaftercancel
  6891. @@ -393,9 +393,9 @@ GoldenrodGym_MapEventHeader:
  6892.  
  6893.  .PersonEvents:
  6894.     db 6
  6895. -   person_event SPRITE_WHITNEY, 3, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, WhitneyScript_0x5400c, -1
  6896. -   person_event SPRITE_LASS, 13, 9, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerLassCarrie, -1
  6897. -   person_event SPRITE_LASS, 6, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassBridget, -1
  6898. -   person_event SPRITE_BUENA, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautyVictoria, -1
  6899. -   person_event SPRITE_BUENA, 5, 19, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautySamantha, -1
  6900. -   person_event SPRITE_GYM_GUY, 15, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GoldenrodGymGuyScript, -1
  6901. +   person_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, WhitneyScript_0x5400c, -1
  6902. +   person_event SPRITE_LASS, 13, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerLassCarrie, -1
  6903. +   person_event SPRITE_LASS, 6, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassBridget, -1
  6904. +   person_event SPRITE_BUENA, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautyVictoria, -1
  6905. +   person_event SPRITE_BUENA, 5, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBeautySamantha, -1
  6906. +   person_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GoldenrodGymGuyScript, -1
  6907. diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
  6908. index 5987e88..b04b99f 100644
  6909. --- a/maps/GoldenrodHappinessRater.asm
  6910. +++ b/maps/GoldenrodHappinessRater.asm
  6911. @@ -151,6 +151,6 @@ GoldenrodHappinessRater_MapEventHeader:
  6912.  
  6913.  .PersonEvents:
  6914.     db 3
  6915. -   person_event SPRITE_TEACHER, 4, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x54953, -1
  6916. -   person_event SPRITE_POKEFAN_M, 3, 5, $8, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x54997, -1
  6917. -   person_event SPRITE_TWIN, 6, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x5499a, -1
  6918. +   person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x54953, -1
  6919. +   person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x54997, -1
  6920. +   person_event SPRITE_TWIN, 6, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x5499a, -1
  6921. diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
  6922. index 218ca08..acc0bd9 100644
  6923. --- a/maps/GoldenrodMagnetTrainStation.asm
  6924. +++ b/maps/GoldenrodMagnetTrainStation.asm
  6925. @@ -3,7 +3,7 @@ GoldenrodMagnetTrainStation_MapScriptHeader:
  6926.     db 1
  6927.  
  6928.     ; triggers
  6929.     dw .Trigger1, $0000
  6930.  
  6931.  .MapCallbacks:
  6932.     db 0
  6933. @@ -182,5 +182,5 @@ GoldenrodMagnetTrainStation_MapEventHeader:
  6934.  
  6935.  .PersonEvents:
  6936.     db 2
  6937. -   person_event SPRITE_OFFICER, 9, 9, $6, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x550ec, -1
  6938. -   person_event SPRITE_GENTLEMAN, 14, 11, $2, 2, 2, -1, -1, 0, 0, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
  6939. +   person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x550ec, -1
  6940. +   person_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
  6941. diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm
  6942. index ff13bb6..e4228f4 100644
  6943. --- a/maps/GoldenrodNameRatersHouse.asm
  6944. +++ b/maps/GoldenrodNameRatersHouse.asm
  6945. @@ -41,4 +41,4 @@ GoldenrodNameRatersHouse_MapEventHeader:
  6946.  
  6947.  .PersonEvents:
  6948.     db 1
  6949. -   person_event SPRITE_GENTLEMAN, 4, 2, $6, 0, 2, -1, -1, 0, 0, 0, GentlemanScript_0x5577c, -1
  6950. +   person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEFN_06, 0, 2, -1, -1, 0, 0, 0, GentlemanScript_0x5577c, -1
  6951. diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
  6952. index 294849c..402e6e5 100644
  6953. --- a/maps/GoldenrodPPSpeechHouse.asm
  6954. +++ b/maps/GoldenrodPPSpeechHouse.asm
  6955. @@ -67,5 +67,5 @@ GoldenrodPPSpeechHouse_MapEventHeader:
  6956.  
  6957.  .PersonEvents:
  6958.     db 2
  6959. -   person_event SPRITE_FISHER, 4, 2, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x5564a, -1
  6960. -   person_event SPRITE_LASS, 3, 5, $8, 1, 0, -1, -1, 0, 0, 0, LassScript_0x5564d, -1
  6961. +   person_event SPRITE_FISHER, 4, 2, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x5564a, -1
  6962. +   person_event SPRITE_LASS, 3, 5, SPRITEMOVEFN_08, 1, 0, -1, -1, 0, 0, 0, LassScript_0x5564d, -1
  6963. diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm
  6964. index e36bc90..f43a0e6 100644
  6965. --- a/maps/GoldenrodPokeCenter1F.asm
  6966. +++ b/maps/GoldenrodPokeCenter1F.asm
  6967. @@ -818,8 +818,8 @@ GoldenrodPokeCenter1F_MapEventHeader:
  6968.  
  6969.  .PersonEvents:
  6970.     db 5
  6971. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x60f91, -1
  6972. -   person_event SPRITE_LINK_RECEPTIONIST, 8, 16, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, -1
  6973. -   person_event SPRITE_GAMEBOY_KID, 1, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GameboyKidScript_0x6101e, -1
  6974. -   person_event SPRITE_LASS, 4, 1, $5, 0, 1, -1, -1, 0, 0, 0, LassScript_0x61021, -1
  6975. -   person_event SPRITE_POKEFAN_F, 5, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanFScript_0x61024, -1
  6976. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x60f91, -1
  6977. +   person_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, -1
  6978. +   person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GameboyKidScript_0x6101e, -1
  6979. +   person_event SPRITE_LASS, 4, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, LassScript_0x61021, -1
  6980. +   person_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanFScript_0x61024, -1
  6981. diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm
  6982. index 30fb9e7..0bc664e 100644
  6983. --- a/maps/GoldenrodPokeComCenter2FMobile.asm
  6984. +++ b/maps/GoldenrodPokeComCenter2FMobile.asm
  6985. @@ -283,6 +283,6 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader:
  6986.  
  6987.  .PersonEvents:
  6988.     db 3
  6989. -   person_event SPRITE_SCIENTIST, 28, 4, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ScientistScript_0x625d1, -1
  6990. -   person_event SPRITE_SCIENTIST, 27, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x625d4, -1
  6991. -   person_event SPRITE_SCIENTIST, 29, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ScientistScript_0x625d7, -1
  6992. +   person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ScientistScript_0x625d1, -1
  6993. +   person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x625d4, -1
  6994. +   person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ScientistScript_0x625d7, -1
  6995. diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
  6996. index eb6c156..c4d3832 100644
  6997. --- a/maps/GuideGentsHouse.asm
  6998. +++ b/maps/GuideGentsHouse.asm
  6999. @@ -43,4 +43,4 @@ GuideGentsHouse_MapEventHeader:
  7000.  
  7001.  .PersonEvents:
  7002.     db 1
  7003. -   person_event SPRITE_GRAMPS, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
  7004. +   person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
  7005. diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
  7006. index 00ea547..4160fed 100644
  7007. --- a/maps/HallOfFame.asm
  7008. +++ b/maps/HallOfFame.asm
  7009. @@ -3,8 +3,8 @@ HallOfFame_MapScriptHeader:
  7010.     db 2
  7011.  
  7012.     ; triggers
  7013.     dw .Trigger1, $0000
  7014.     dw .Trigger2, $0000
  7015.  
  7016.  .MapCallbacks:
  7017.     db 0
  7018. @@ -126,4 +126,4 @@ HallOfFame_MapEventHeader:
  7019.  
  7020.  .PersonEvents:
  7021.     db 1
  7022. -   person_event SPRITE_LANCE, 12, 4, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
  7023. +   person_event SPRITE_LANCE, 12, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
  7024. diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
  7025. index 5e8dc3a..7a07191 100644
  7026. --- a/maps/IcePath1F.asm
  7027. +++ b/maps/IcePath1F.asm
  7028. @@ -33,6 +33,6 @@ IcePath1F_MapEventHeader:
  7029.  
  7030.  .PersonEvents:
  7031.     db 3
  7032. -   person_event SPRITE_POKE_BALL, 7, 31, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL
  7033. -   person_event SPRITE_POKE_BALL, 23, 32, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP
  7034. -   person_event SPRITE_POKE_BALL, 9, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN
  7035. +   person_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL
  7036. +   person_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP
  7037. +   person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN
  7038. diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
  7039. index 74ec802..6056195 100644
  7040. --- a/maps/IcePathB1F.asm
  7041. +++ b/maps/IcePathB1F.asm
  7042. @@ -107,8 +107,8 @@ IcePathB1F_MapEventHeader:
  7043.  
  7044.  .PersonEvents:
  7045.     db 5
  7046. -   person_event SPRITE_BOULDER, 7, 11, $19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
  7047. -   person_event SPRITE_BOULDER, 8, 7, $19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
  7048. -   person_event SPRITE_BOULDER, 9, 8, $19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
  7049. -   person_event SPRITE_BOULDER, 7, 17, $19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
  7050. -   person_event SPRITE_POKE_BALL, 35, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON
  7051. +   person_event SPRITE_BOULDER, 7, 11, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
  7052. +   person_event SPRITE_BOULDER, 8, 7, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
  7053. +   person_event SPRITE_BOULDER, 9, 8, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
  7054. +   person_event SPRITE_BOULDER, 7, 17, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
  7055. +   person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON
  7056. diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
  7057. index 5e31ea6..803e129 100644
  7058. --- a/maps/IcePathB2FBlackthornSide.asm
  7059. +++ b/maps/IcePathB2FBlackthornSide.asm
  7060. @@ -30,4 +30,4 @@ IcePathB2FBlackthornSide_MapEventHeader:
  7061.  
  7062.  .PersonEvents:
  7063.     db 1
  7064. -   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
  7065. +   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
  7066. diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
  7067. index 09d3766..5669f86 100644
  7068. --- a/maps/IcePathB2FMahoganySide.asm
  7069. +++ b/maps/IcePathB2FMahoganySide.asm
  7070. @@ -45,9 +45,9 @@ IcePathB2FMahoganySide_MapEventHeader:
  7071.  
  7072.  .PersonEvents:
  7073.     db 6
  7074. -   person_event SPRITE_BOULDER, 3, 11, $1, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A
  7075. -   person_event SPRITE_BOULDER, 7, 4, $1, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A
  7076. -   person_event SPRITE_BOULDER, 12, 3, $1, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A
  7077. -   person_event SPRITE_BOULDER, 13, 12, $1, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A
  7078. -   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
  7079. -   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
  7080. +   person_event SPRITE_BOULDER, 3, 11, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A
  7081. +   person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A
  7082. +   person_event SPRITE_BOULDER, 12, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A
  7083. +   person_event SPRITE_BOULDER, 13, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A
  7084. +   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
  7085. +   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
  7086. diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
  7087. index 1be274d..97a474f 100644
  7088. --- a/maps/IcePathB3F.asm
  7089. +++ b/maps/IcePathB3F.asm
  7090. @@ -28,5 +28,5 @@ IcePathB3F_MapEventHeader:
  7091.  
  7092.  .PersonEvents:
  7093.     db 2
  7094. -   person_event SPRITE_POKE_BALL, 7, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE
  7095. -   person_event SPRITE_ROCK, 6, 6, $18, 0, 0, -1, -1, 0, 0, 0, IcePathB3FRock, -1
  7096. +   person_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE
  7097. +   person_event SPRITE_ROCK, 6, 6, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, IcePathB3FRock, -1
  7098. diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
  7099. index cab0b66..2372e5d 100644
  7100. --- a/maps/IlexForest.asm
  7101. +++ b/maps/IlexForest.asm
  7102. @@ -376,7 +376,7 @@ UnknownScript_0x6edf7:
  7103.     end
  7104.  
  7105.  TrainerBug_catcherWayne:
  7106.     trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, $0000, Bug_catcherWayneScript
  7107.  
  7108.  Bug_catcherWayneScript:
  7109.     talkaftercancel
  7110. @@ -950,14 +950,14 @@ IlexForest_MapEventHeader:
  7111.  
  7112.  .PersonEvents:
  7113.     db 11
  7114. -   person_event SPRITE_BIRD, 31, 14, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD
  7115. -   person_event SPRITE_YOUNGSTER, 28, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE
  7116. -   person_event SPRITE_BLACK_BELT, 28, 5, $9, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER
  7117. -   person_event SPRITE_ROCKER, 14, 15, $9, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x6edde, -1
  7118. -   person_event SPRITE_POKE_BALL, 32, 20, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE
  7119. -   person_event SPRITE_KURT, 29, 8, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
  7120. -   person_event SPRITE_LASS, 24, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x6ee0d, EVENT_ILEX_FOREST_LASS
  7121. -   person_event SPRITE_YOUNGSTER, 1, 12, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerBug_catcherWayne, -1
  7122. -   person_event SPRITE_POKE_BALL, 17, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK
  7123. -   person_event SPRITE_POKE_BALL, 7, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE
  7124. -   person_event SPRITE_POKE_BALL, 1, 27, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER
  7125. +   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
  7126. +   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
  7127. +   person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER
  7128. +   person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x6edde, -1
  7129. +   person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE
  7130. +   person_event SPRITE_KURT, 29, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
  7131. +   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
  7132. +   person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerBug_catcherWayne, -1
  7133. +   person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK
  7134. +   person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE
  7135. +   person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER
  7136. diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
  7137. index 57034a7..df938a2 100644
  7138. --- a/maps/IlexForestAzaleaGate.asm
  7139. +++ b/maps/IlexForestAzaleaGate.asm
  7140. @@ -45,5 +45,5 @@ IlexForestAzaleaGate_MapEventHeader:
  7141.  
  7142.  .PersonEvents:
  7143.     db 2
  7144. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x62c7a, -1
  7145. -   person_event SPRITE_GRANNY, 3, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x62c7d, -1
  7146. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x62c7a, -1
  7147. +   person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x62c7d, -1
  7148. diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm
  7149. index c4ab11a..eca25c3 100644
  7150. --- a/maps/IndigoPlateauPokeCenter1F.asm
  7151. +++ b/maps/IndigoPlateauPokeCenter1F.asm
  7152. @@ -3,7 +3,7 @@ IndigoPlateauPokeCenter1F_MapScriptHeader:
  7153.     db 1
  7154.  
  7155.     ; triggers
  7156.     dw UnknownScript_0x180009, $0000
  7157.  
  7158.  .MapCallbacks:
  7159.     db 1
  7160. @@ -319,9 +319,9 @@ IndigoPlateauPokeCenter1F_MapEventHeader:
  7161.  
  7162.  .PersonEvents:
  7163.     db 6
  7164. -   person_event SPRITE_NURSE, 7, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18012c, -1
  7165. -   person_event SPRITE_CLERK, 7, 11, $6, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18012f, -1
  7166. -   person_event SPRITE_COOLTRAINER_M, 11, 11, $2, 2, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x180136, -1
  7167. -   person_event SPRITE_SILVER, 9, 16, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
  7168. -   person_event SPRITE_GRAMPS, 9, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
  7169. -   person_event SPRITE_JYNX, 9, 0, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, AbraScript, EVENT_TELEPORT_GUY
  7170. +   person_event SPRITE_NURSE, 7, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18012c, -1
  7171. +   person_event SPRITE_CLERK, 7, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18012f, -1
  7172. +   person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x180136, -1
  7173. +   person_event SPRITE_SILVER, 9, 16, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
  7174. +   person_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
  7175. +   person_event SPRITE_JYNX, 9, 0, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, AbraScript, EVENT_TELEPORT_GUY
  7176. diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
  7177. index 978aaac..5ca7145 100644
  7178. --- a/maps/KarensRoom.asm
  7179. +++ b/maps/KarensRoom.asm
  7180. @@ -3,8 +3,8 @@ KarensRoom_MapScriptHeader:
  7181.     db 2
  7182.  
  7183.     ; triggers
  7184.     dw UnknownScript_0x180bbc, $0000
  7185.     dw UnknownScript_0x180bc0, $0000
  7186.  
  7187.  .MapCallbacks:
  7188.     db 1
  7189. @@ -52,7 +52,7 @@ KarenScript_0x180bee:
  7190.     writetext UnknownText_0x180c27
  7191.     closetext
  7192.     loadmovesprites
  7193.     winlosstext UnknownText_0x180cf8, $0000
  7194.     loadtrainer KAREN, 1
  7195.     startbattle
  7196.     returnafterbattle
  7197. @@ -153,4 +153,4 @@ KarensRoom_MapEventHeader:
  7198.  
  7199.  .PersonEvents:
  7200.     db 1
  7201. -   person_event SPRITE_KAREN, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KarenScript_0x180bee, -1
  7202. +   person_event SPRITE_KAREN, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KarenScript_0x180bee, -1
  7203. diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
  7204. index 0b2dfa8..42e8eb9 100644
  7205. --- a/maps/KogasRoom.asm
  7206. +++ b/maps/KogasRoom.asm
  7207. @@ -3,8 +3,8 @@ KogasRoom_MapScriptHeader:
  7208.     db 2
  7209.  
  7210.     ; triggers
  7211.     dw UnknownScript_0x180728, $0000
  7212.     dw UnknownScript_0x18072c, $0000
  7213.  
  7214.  .MapCallbacks:
  7215.     db 1
  7216. @@ -52,7 +52,7 @@ KogaScript_0x18075a:
  7217.     writetext UnknownText_0x180793
  7218.     closetext
  7219.     loadmovesprites
  7220.     winlosstext UnknownText_0x1808a9, $0000
  7221.     loadtrainer KOGA, 1
  7222.     startbattle
  7223.     returnafterbattle
  7224. @@ -150,4 +150,4 @@ KogasRoom_MapEventHeader:
  7225.  
  7226.  .PersonEvents:
  7227.     db 1
  7228. -   person_event SPRITE_KOGA, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, KogaScript_0x18075a, -1
  7229. +   person_event SPRITE_KOGA, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, KogaScript_0x18075a, -1
  7230. diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm
  7231. index 50f32a5..3388d9e 100644
  7232. --- a/maps/KrissHouse1F.asm
  7233. +++ b/maps/KrissHouse1F.asm
  7234. @@ -3,8 +3,8 @@ KrissHouse1F_MapScriptHeader:
  7235.     db 2
  7236.  
  7237.     ; triggers
  7238.     dw UnknownScript_0x7a4d6, $0000
  7239.     dw UnknownScript_0x7a4d7, $0000
  7240.  
  7241.  .MapCallbacks:
  7242.     db 0
  7243. @@ -404,8 +404,8 @@ KrissHouse1F_MapEventHeader:
  7244.  
  7245.  .PersonEvents:
  7246.     db 5
  7247. -   person_event SPRITE_MOM, 4, 7, $8, 0, 0, -1, -1, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
  7248. -   person_event SPRITE_MOM, 2, 2, $7, 0, 0, -1, 1, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7249. -   person_event SPRITE_MOM, 4, 7, $8, 0, 0, -1, 2, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7250. -   person_event SPRITE_MOM, 2, 0, $7, 0, 0, -1, 4, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7251. -   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
  7252. +   person_event SPRITE_MOM, 4, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
  7253. +   person_event SPRITE_MOM, 2, 2, SPRITEMOVEFN_07, 0, 0, -1, 1, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7254. +   person_event SPRITE_MOM, 4, 7, SPRITEMOVEFN_08, 0, 0, -1, 2, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7255. +   person_event SPRITE_MOM, 2, 0, SPRITEMOVEFN_07, 0, 0, -1, 4, 0, 0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
  7256. +   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
  7257. diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm
  7258. index 62ec48b..2106585 100644
  7259. --- a/maps/KrissHouse2F.asm
  7260. +++ b/maps/KrissHouse2F.asm
  7261. @@ -132,7 +132,7 @@ KrissHouse2F_MapEventHeader:
  7262.  
  7263.  .PersonEvents:
  7264.     db 4
  7265. -   person_event SPRITE_CONSOLE, 2, 4, $1, 0, 0, -1, -1, 0, 0, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
  7266. -   person_event SPRITE_DOLL_1, 4, 4, $1, 0, 0, -1, -1, 0, 0, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
  7267. -   person_event SPRITE_DOLL_2, 4, 5, $1, 0, 0, -1, -1, 0, 0, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
  7268. -   person_event SPRITE_BIG_DOLL, 1, 0, $21, 0, 0, -1, -1, 0, 0, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
  7269. +   person_event SPRITE_CONSOLE, 2, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
  7270. +   person_event SPRITE_DOLL_1, 4, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
  7271. +   person_event SPRITE_DOLL_2, 4, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
  7272. +   person_event SPRITE_BIG_DOLL, 1, 0, SPRITEMOVEFN_21, 0, 0, -1, -1, 0, 0, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
  7273. diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm
  7274. index defaf84..5226bca 100644
  7275. --- a/maps/KrissNeighborsHouse.asm
  7276. +++ b/maps/KrissNeighborsHouse.asm
  7277. @@ -114,5 +114,5 @@ KrissNeighborsHouse_MapEventHeader:
  7278.  
  7279.  .PersonEvents:
  7280.     db 2
  7281. -   person_event SPRITE_COOLTRAINER_F, 3, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KrissNeighborsDaughter, -1
  7282. -   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
  7283. +   person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, KrissNeighborsDaughter, -1
  7284. +   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
  7285. diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
  7286. index 5a43e1e..54b4902 100644
  7287. --- a/maps/KurtsHouse.asm
  7288. +++ b/maps/KurtsHouse.asm
  7289. @@ -696,8 +696,8 @@ KurtsHouse_MapEventHeader:
  7290.  
  7291.  .PersonEvents:
  7292.     db 5
  7293. -   person_event SPRITE_KURT, 2, 3, $6, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
  7294. -   person_event SPRITE_TWIN, 3, 5, $3, 0, 0, -1, -1, 0, 0, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
  7295. -   person_event SPRITE_SLOWPOKE, 3, 6, $1, 0, 0, -1, -1, 0, 0, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
  7296. -   person_event SPRITE_KURT, 3, 14, $7, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
  7297. -   person_event SPRITE_TWIN, 4, 11, $9, 0, 0, -1, -1, 0, 0, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
  7298. +   person_event SPRITE_KURT, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
  7299. +   person_event SPRITE_TWIN, 3, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
  7300. +   person_event SPRITE_SLOWPOKE, 3, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
  7301. +   person_event SPRITE_KURT, 3, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
  7302. +   person_event SPRITE_TWIN, 4, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
  7303. diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm
  7304. index 8fabac5..7e90e9f 100644
  7305. --- a/maps/LakeofRage.asm
  7306. +++ b/maps/LakeofRage.asm
  7307. @@ -3,8 +3,8 @@ LakeofRage_MapScriptHeader:
  7308.     db 2
  7309.  
  7310.     ; triggers
  7311.     dw .Trigger1, $0000
  7312.     dw .Trigger2, $0000
  7313.  
  7314.  .MapCallbacks:
  7315.     db 2
  7316. @@ -137,7 +137,7 @@ UnknownScript_0x700b8:
  7317.     end
  7318.  
  7319.  TrainerFisherAndre:
  7320.     trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, $0000, FisherAndreScript
  7321.  
  7322.  FisherAndreScript:
  7323.     talkaftercancel
  7324. @@ -148,7 +148,7 @@ FisherAndreScript:
  7325.     end
  7326.  
  7327.  TrainerFisherRaymond:
  7328.     trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, $0000, FisherRaymondScript
  7329.  
  7330.  FisherRaymondScript:
  7331.     talkaftercancel
  7332. @@ -159,7 +159,7 @@ FisherRaymondScript:
  7333.     end
  7334.  
  7335.  TrainerCooltrainermAaron:
  7336.     trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, $0000, CooltrainermAaronScript
  7337.  
  7338.  CooltrainermAaronScript:
  7339.     talkaftercancel
  7340. @@ -170,7 +170,7 @@ CooltrainermAaronScript:
  7341.     end
  7342.  
  7343.  TrainerCooltrainerfLois:
  7344.     trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, $0000, CooltrainerfLoisScript
  7345.  
  7346.  CooltrainerfLoisScript:
  7347.     talkaftercancel
  7348. @@ -509,15 +509,15 @@ LakeofRage_MapEventHeader:
  7349.  
  7350.  .PersonEvents:
  7351.     db 12
  7352. -   person_event SPRITE_LANCE, 28, 21, $7, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
  7353. -   person_event SPRITE_GRAMPS, 26, 20, $7, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x7008e, -1
  7354. -   person_event SPRITE_SUPER_NERD, 13, 36, $8, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x700a2, -1
  7355. -   person_event SPRITE_COOLTRAINER_F, 29, 25, $5, 0, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x700a5, -1
  7356. -   person_event SPRITE_FISHER, 23, 30, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
  7357. -   person_event SPRITE_FISHER, 26, 24, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
  7358. -   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
  7359. -   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
  7360. -   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
  7361. -   person_event SPRITE_SUPER_NERD, 4, 4, $6, 0, 0, -1, -1, 0, 0, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
  7362. -   person_event SPRITE_POKE_BALL, 10, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER
  7363. -   person_event SPRITE_POKE_BALL, 2, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT
  7364. +   person_event SPRITE_LANCE, 28, 21, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
  7365. +   person_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x7008e, -1
  7366. +   person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x700a2, -1
  7367. +   person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, CooltrainerFScript_0x700a5, -1
  7368. +   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
  7369. +   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
  7370. +   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
  7371. +   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
  7372. +   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
  7373. +   person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
  7374. +   person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER
  7375. +   person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT
  7376. diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm
  7377. index caf510f..a61c7bd 100644
  7378. --- a/maps/LakeofRageHiddenPowerHouse.asm
  7379. +++ b/maps/LakeofRageHiddenPowerHouse.asm
  7380. @@ -83,4 +83,4 @@ LakeofRageHiddenPowerHouse_MapEventHeader:
  7381.  
  7382.  .PersonEvents:
  7383.     db 1
  7384. -   person_event SPRITE_FISHER, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, HiddenPowerGuy, -1
  7385. +   person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, HiddenPowerGuy, -1
  7386. diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm
  7387. index 42b3ffa..85f776d 100644
  7388. --- a/maps/LakeofRageMagikarpHouse.asm
  7389. +++ b/maps/LakeofRageMagikarpHouse.asm
  7390. @@ -221,4 +221,4 @@ LakeofRageMagikarpHouse_MapEventHeader:
  7391.  
  7392.  .PersonEvents:
  7393.     db 1
  7394. -   person_event SPRITE_FISHING_GURU, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x19a6ae, -1
  7395. +   person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x19a6ae, -1
  7396. diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
  7397. index aaa239c..5d6b388 100644
  7398. --- a/maps/LancesRoom.asm
  7399. +++ b/maps/LancesRoom.asm
  7400. @@ -3,8 +3,8 @@ LancesRoom_MapScriptHeader:
  7401.     db 2
  7402.  
  7403.     ; triggers
  7404.     dw UnknownScript_0x180e39, $0000
  7405.     dw UnknownScript_0x180e3d, $0000
  7406.  
  7407.  .MapCallbacks:
  7408.     db 1
  7409. @@ -57,7 +57,7 @@ LanceScript_0x180e7b:
  7410.     writetext UnknownText_0x180f67
  7411.     closetext
  7412.     loadmovesprites
  7413.     winlosstext UnknownText_0x1810a4, $0000
  7414.     setlasttalked $2
  7415.     loadtrainer CHAMPION, LANCE
  7416.     startbattle
  7417. @@ -358,6 +358,6 @@ LancesRoom_MapEventHeader:
  7418.  
  7419.  .PersonEvents:
  7420.     db 3
  7421. -   person_event SPRITE_LANCE, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x180e7b, -1
  7422. -   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
  7423. -   person_event SPRITE_OAK, 7, 4, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
  7424. +   person_event SPRITE_LANCE, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x180e7b, -1
  7425. +   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
  7426. +   person_event SPRITE_OAK, 7, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
  7427. diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
  7428. index 7f7d82d..aa9082e 100644
  7429. --- a/maps/LavRadioTower1F.asm
  7430. +++ b/maps/LavRadioTower1F.asm
  7431. @@ -233,8 +233,8 @@ LavRadioTower1F_MapEventHeader:
  7432.  
  7433.  .PersonEvents:
  7434.     db 5
  7435. -   person_event SPRITE_RECEPTIONIST, 6, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x7ee63, -1
  7436. -   person_event SPRITE_OFFICER, 1, 15, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x7ee66, -1
  7437. -   person_event SPRITE_SUPER_NERD, 3, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x7ee69, -1
  7438. -   person_event SPRITE_GENTLEMAN, 1, 9, $7, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x7ee6c, -1
  7439. -   person_event SPRITE_SUPER_NERD, 6, 14, $9, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7eea2, -1
  7440. +   person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x7ee63, -1
  7441. +   person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x7ee66, -1
  7442. +   person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x7ee69, -1
  7443. +   person_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x7ee6c, -1
  7444. +   person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7eea2, -1
  7445. diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
  7446. index f6b7823..119bee6 100644
  7447. --- a/maps/LavenderMart.asm
  7448. +++ b/maps/LavenderMart.asm
  7449. @@ -59,6 +59,6 @@ LavenderMart_MapEventHeader:
  7450.  
  7451.  .PersonEvents:
  7452.     db 3
  7453. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x7eb1c, -1
  7454. -   person_event SPRITE_POKEFAN_M, 6, 6, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x7eb23, -1
  7455. -   person_event SPRITE_ROCKER, 2, 9, $3, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x7eb26, -1
  7456. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x7eb1c, -1
  7457. +   person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x7eb23, -1
  7458. +   person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x7eb26, -1
  7459. diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
  7460. index e00fab6..fd72806 100644
  7461. --- a/maps/LavenderNameRater.asm
  7462. +++ b/maps/LavenderNameRater.asm
  7463. @@ -3,7 +3,7 @@ LavenderNameRater_MapScriptHeader:
  7464.     db 1
  7465.  
  7466.     ; triggers
  7467.     dw UnknownScript_0x7eaf1, $0000
  7468.  
  7469.  .MapCallbacks:
  7470.     db 0
  7471. @@ -40,4 +40,4 @@ LavenderNameRater_MapEventHeader:
  7472.  
  7473.  .PersonEvents:
  7474.     db 1
  7475. -   person_event SPRITE_GENTLEMAN, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LavenderNameRater, -1
  7476. +   person_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LavenderNameRater, -1
  7477. diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm
  7478. index ee1a4bf..f297376 100644
  7479. --- a/maps/LavenderPokeCenter1F.asm
  7480. +++ b/maps/LavenderPokeCenter1F.asm
  7481. @@ -92,7 +92,7 @@ LavenderPokeCenter1F_MapEventHeader:
  7482.  
  7483.  .PersonEvents:
  7484.     db 4
  7485. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x7e6a0, -1
  7486. -   person_event SPRITE_GENTLEMAN, 6, 7, $5, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x7e6a3, -1
  7487. -   person_event SPRITE_TEACHER, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7e6a6, -1
  7488. -   person_event SPRITE_YOUNGSTER, 5, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7e6a9, -1
  7489. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x7e6a0, -1
  7490. +   person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x7e6a3, -1
  7491. +   person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7e6a6, -1
  7492. +   person_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7e6a9, -1
  7493. diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
  7494. index 65b6054..275cae7 100644
  7495. --- a/maps/LavenderTown.asm
  7496. +++ b/maps/LavenderTown.asm
  7497. @@ -129,7 +129,7 @@ LavenderTown_MapEventHeader:
  7498.  
  7499.  .PersonEvents:
  7500.     db 4
  7501. -   person_event SPRITE_POKEFAN_M, 7, 12, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1ad6e4, -1
  7502. -   person_event SPRITE_TEACHER, 15, 2, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1ad6e7, -1
  7503. -   person_event SPRITE_GRAMPS, 12, 14, $7, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1ad6ea, -1
  7504. -   person_event SPRITE_YOUNGSTER, 11, 6, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 1, YoungsterScript_0x1ad6ed, -1
  7505. +   person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1ad6e4, -1
  7506. +   person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1ad6e7, -1
  7507. +   person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1ad6ea, -1
  7508. +   person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 1, YoungsterScript_0x1ad6ed, -1
  7509. diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm
  7510. index 37d0677..9f0cb0f 100644
  7511. --- a/maps/LavenderTownSpeechHouse.asm
  7512. +++ b/maps/LavenderTownSpeechHouse.asm
  7513. @@ -44,4 +44,4 @@ LavenderTownSpeechHouse_MapEventHeader:
  7514.  
  7515.  .PersonEvents:
  7516.     db 1
  7517. -   person_event SPRITE_POKEFAN_F, 3, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x7ea47, -1
  7518. +   person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x7ea47, -1
  7519. diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
  7520. index 9616d1a..fd30455 100644
  7521. --- a/maps/MahoganyGym.asm
  7522. +++ b/maps/MahoganyGym.asm
  7523. @@ -13,7 +13,7 @@ PryceScript_0x199a9e:
  7524.     writetext UnknownText_0x199b8d
  7525.     closetext
  7526.     loadmovesprites
  7527.     winlosstext UnknownText_0x199cb3, $0000
  7528.     loadtrainer PRYCE, 1
  7529.     startbattle
  7530.     returnafterbattle
  7531. @@ -62,7 +62,7 @@ MahoganyGymTriggerRockets:
  7532.     jumpstd radiotowerrockets
  7533.  
  7534.  TrainerSkierRoxanne:
  7535.     trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, $0000, SkierRoxanneScript
  7536.  
  7537.  SkierRoxanneScript:
  7538.     talkaftercancel
  7539. @@ -73,7 +73,7 @@ SkierRoxanneScript:
  7540.     end
  7541.  
  7542.  TrainerSkierClarissa:
  7543.     trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, $0000, SkierClarissaScript
  7544.  
  7545.  SkierClarissaScript:
  7546.     talkaftercancel
  7547. @@ -84,7 +84,7 @@ SkierClarissaScript:
  7548.     end
  7549.  
  7550.  TrainerBoarderRonald:
  7551.     trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, $0000, BoarderRonaldScript
  7552.  
  7553.  BoarderRonaldScript:
  7554.     talkaftercancel
  7555. @@ -95,7 +95,7 @@ BoarderRonaldScript:
  7556.     end
  7557.  
  7558.  TrainerBoarderBrad:
  7559.     trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, $0000, BoarderBradScript
  7560.  
  7561.  BoarderBradScript:
  7562.     talkaftercancel
  7563. @@ -106,7 +106,7 @@ BoarderBradScript:
  7564.     end
  7565.  
  7566.  TrainerBoarderDouglas:
  7567.     trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, $0000, BoarderDouglasScript
  7568.  
  7569.  BoarderDouglasScript:
  7570.     talkaftercancel
  7571. @@ -382,10 +382,10 @@ MahoganyGym_MapEventHeader:
  7572.  
  7573.  .PersonEvents:
  7574.     db 7
  7575. -   person_event SPRITE_PRYCE, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PryceScript_0x199a9e, -1
  7576. -   person_event SPRITE_BUENA, 6, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerSkierRoxanne, -1
  7577. -   person_event SPRITE_ROCKER, 17, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderRonald, -1
  7578. -   person_event SPRITE_BUENA, 17, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerSkierClarissa, -1
  7579. -   person_event SPRITE_ROCKER, 9, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderBrad, -1
  7580. -   person_event SPRITE_ROCKER, 4, 2, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderDouglas, -1
  7581. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MahoganyGymGuyScript, -1
  7582. +   person_event SPRITE_PRYCE, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PryceScript_0x199a9e, -1
  7583. +   person_event SPRITE_BUENA, 6, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerSkierRoxanne, -1
  7584. +   person_event SPRITE_ROCKER, 17, 0, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderRonald, -1
  7585. +   person_event SPRITE_BUENA, 17, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerSkierClarissa, -1
  7586. +   person_event SPRITE_ROCKER, 9, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderBrad, -1
  7587. +   person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBoarderDouglas, -1
  7588. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MahoganyGymGuyScript, -1
  7589. diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
  7590. index 815e53b..caadee4 100644
  7591. --- a/maps/MahoganyMart1F.asm
  7592. +++ b/maps/MahoganyMart1F.asm
  7593. @@ -3,8 +3,8 @@ MahoganyMart1F_MapScriptHeader:
  7594.     db 2
  7595.  
  7596.     ; triggers
  7597.     dw UnknownScript_0x6c356, $0000
  7598.     dw UnknownScript_0x6c357, $0000
  7599.  
  7600.  .MapCallbacks:
  7601.     db 1
  7602. @@ -236,8 +236,8 @@ MahoganyMart1F_MapEventHeader:
  7603.  
  7604.  .PersonEvents:
  7605.     db 5
  7606. -   person_event SPRITE_PHARMACIST, 3, 4, $6, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
  7607. -   person_event SPRITE_BLACK_BELT, 6, 1, $3, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
  7608. -   person_event SPRITE_LANCE, 6, 4, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
  7609. -   person_event SPRITE_DRAGON, 6, 3, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
  7610. -   person_event SPRITE_GRANNY, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
  7611. +   person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
  7612. +   person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
  7613. +   person_event SPRITE_LANCE, 6, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
  7614. +   person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
  7615. +   person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
  7616. diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm
  7617. index f7f8a39..406fee8 100644
  7618. --- a/maps/MahoganyPokeCenter1F.asm
  7619. +++ b/maps/MahoganyPokeCenter1F.asm
  7620. @@ -65,7 +65,7 @@ MahoganyPokeCenter1F_MapEventHeader:
  7621.  
  7622.  .PersonEvents:
  7623.     db 4
  7624. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19a356, -1
  7625. -   person_event SPRITE_POKEFAN_M, 2, 7, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x19a359, -1
  7626. -   person_event SPRITE_YOUNGSTER, 3, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x19a35c, -1
  7627. -   person_event SPRITE_COOLTRAINER_F, 3, 2, $8, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x19a35f, -1
  7628. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19a356, -1
  7629. +   person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x19a359, -1
  7630. +   person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x19a35c, -1
  7631. +   person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x19a35f, -1
  7632. diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
  7633. index e8f3f71..f4590e1 100644
  7634. --- a/maps/MahoganyRedGyaradosSpeechHouse.asm
  7635. +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
  7636. @@ -73,5 +73,5 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader:
  7637.  
  7638.  .PersonEvents:
  7639.     db 2
  7640. -   person_event SPRITE_BLACK_BELT, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x19997f, -1
  7641. -   person_event SPRITE_TEACHER, 5, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x199982, -1
  7642. +   person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x19997f, -1
  7643. +   person_event SPRITE_TEACHER, 5, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x199982, -1
  7644. diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
  7645. index fd58269..7f48aa2 100644
  7646. --- a/maps/MahoganyTown.asm
  7647. +++ b/maps/MahoganyTown.asm
  7648. @@ -3,8 +3,8 @@ MahoganyTown_MapScriptHeader:
  7649.     db 2
  7650.  
  7651.     ; triggers
  7652.     dw .Trigger1, $0000
  7653.     dw .Trigger2, $0000
  7654.  
  7655.  .MapCallbacks:
  7656.     db 1
  7657. @@ -268,7 +268,7 @@ MahoganyTown_MapEventHeader:
  7658.  
  7659.  .PersonEvents:
  7660.     db 4
  7661. -   person_event SPRITE_POKEFAN_M, 8, 19, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
  7662. -   person_event SPRITE_GRAMPS, 9, 6, $5, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1
  7663. -   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
  7664. -   person_event SPRITE_LASS, 8, 12, $6, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS
  7665. +   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
  7666. +   person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1
  7667. +   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
  7668. +   person_event SPRITE_LASS, 8, 12, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS
  7669. diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
  7670. index 3b68cfc..503db4e 100644
  7671. --- a/maps/ManiasHouse.asm
  7672. +++ b/maps/ManiasHouse.asm
  7673. @@ -5,90 +5,90 @@ ManiasHouse_MapScriptHeader:
  7674.  .MapCallbacks:
  7675.     db 0
  7676.  
  7677. -RockerScript_0x9d278:
  7678. +ManiaScript:
  7679.     faceplayer
  7680.     loadfont
  7681.     checkevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
  7682. -   iftrue UnknownScript_0x9d2fa
  7683. +   iftrue .default_postevent
  7684.     checkevent EVENT_GOT_SHUCKIE
  7685. -   iftrue UnknownScript_0x9d2a4
  7686. -   writetext UnknownText_0x9d303
  7687. +   iftrue .alreadyhaveshuckie
  7688. +   writetext ManiaText_AskLookAfterShuckle
  7689.     yesorno
  7690. -   iffalse UnknownScript_0x9d2b6
  7691. +   iffalse .refusetotakeshuckie
  7692.     special SpecialGiveShuckle
  7693. -   iffalse UnknownScript_0x9d2b0
  7694. -   writetext UnknownText_0x9d3ed
  7695. +   iffalse .partyfull
  7696. +   writetext ManiaText_TakeCareOfShuckle
  7697.     keeptextopen
  7698.     waitbutton
  7699. -   writetext UnknownText_0x9d41b
  7700. +   writetext ManiaText_GotShuckle
  7701.     playsound SFX_KEY_ITEM
  7702.     waitbutton
  7703.     loadmovesprites
  7704.     setevent EVENT_GOT_SHUCKIE
  7705.     end
  7706.  
  7707. -UnknownScript_0x9d2a4:
  7708. +.alreadyhaveshuckie:
  7709.     checkflag ENGINE_SHUCKLE_GIVEN
  7710. -   iffalse UnknownScript_0x9d2bc
  7711. -   writetext UnknownText_0x9d3ed
  7712. +   iffalse .returnshuckie
  7713. +   writetext ManiaText_TakeCareOfShuckle
  7714.     closetext
  7715.     loadmovesprites
  7716.     end
  7717.  
  7718. -UnknownScript_0x9d2b0:
  7719. -   writetext UnknownText_0x9d42f
  7720. +.partyfull:
  7721. +   writetext ManiaText_PartyFull
  7722.     closetext
  7723.     loadmovesprites
  7724.     end
  7725.  
  7726. -UnknownScript_0x9d2b6:
  7727. -   writetext UnknownText_0x9d449
  7728. +.refusetotakeshuckie:
  7729. +   writetext ManiaText_IfHeComesBack
  7730.     closetext
  7731.     loadmovesprites
  7732.     end
  7733.  
  7734. -UnknownScript_0x9d2bc:
  7735. -   writetext UnknownText_0x9d470
  7736. +.returnshuckie:
  7737. +   writetext ManiaText_CanIHaveMyMonBack
  7738.     yesorno
  7739. -   iffalse UnknownScript_0x9d2ee
  7740. +   iffalse .refused
  7741.     special SpecialReturnShuckle
  7742. -   if_equal $0, UnknownScript_0x9d2df
  7743. -   if_equal $1, UnknownScript_0x9d2ee
  7744. -   if_equal $3, UnknownScript_0x9d2e5
  7745. -   if_equal $4, UnknownScript_0x9d2fa
  7746. -   writetext UnknownText_0x9d4b1
  7747. +   if_equal $0, .wrong
  7748. +   if_equal $1, .refused
  7749. +   if_equal $3, .superhappy
  7750. +   if_equal $4, .default_postevent
  7751. +   writetext ManiaText_ThankYou
  7752.     closetext
  7753.     loadmovesprites
  7754.     setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
  7755.     end
  7756.  
  7757. -UnknownScript_0x9d2df:
  7758. -   writetext UnknownText_0x9d4bd
  7759. +.wrong:
  7760. +   writetext ManiaText_ShuckleNotThere
  7761.     closetext
  7762.     loadmovesprites
  7763.     end
  7764.  
  7765. -UnknownScript_0x9d2e5:
  7766. -   writetext UnknownText_0x9d4e3
  7767. +.superhappy:
  7768. +   writetext ManiaText_ShuckleLikesYou
  7769.     closetext
  7770.     loadmovesprites
  7771.     setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
  7772.     end
  7773.  
  7774. -UnknownScript_0x9d2ee:
  7775. -   writetext UnknownText_0x9d53f
  7776. +.refused:
  7777. +   writetext ManiaText_SameAsBeingRobbed
  7778.     closetext
  7779.     loadmovesprites
  7780.     end
  7781.  
  7782. -UnknownScript_0x9d2f4:
  7783. -   writetext UnknownText_0x9d5b0
  7784. +.nothingleft:
  7785. +   writetext ManiaText_ShuckleIsYourLastMon
  7786.     closetext
  7787.     loadmovesprites
  7788.     end
  7789.  
  7790. -UnknownScript_0x9d2fa:
  7791. -   writetext UnknownText_0x9d56c
  7792. +.default_postevent:
  7793. +   writetext ManiaText_HappinessSpeech
  7794.     closetext
  7795.     loadmovesprites
  7796.     end
  7797. @@ -96,7 +96,7 @@ UnknownScript_0x9d2fa:
  7798.  UnknownScript_0x9d300:
  7799.     jumpstd picturebookshelf
  7800.  
  7801. -UnknownText_0x9d303:
  7802. +ManiaText_AskLookAfterShuckle:
  7803.     text "I, I'm in shock!"
  7804.  
  7805.     para "A guy about your"
  7806. @@ -120,30 +120,30 @@ UnknownText_0x9d303:
  7807.     line "for a while?"
  7808.     done
  7809.  
  7810. -UnknownText_0x9d3ed:
  7811. +ManiaText_TakeCareOfShuckle:
  7812.     text "Oh, thank you!"
  7813.  
  7814.     para "Take good care of"
  7815.     line "it, please!"
  7816.     done
  7817.  
  7818. -UnknownText_0x9d41b:
  7819. +ManiaText_GotShuckle:
  7820.     text "<PLAYER> received a"
  7821.     line "#MON."
  7822.     done
  7823.  
  7824. -UnknownText_0x9d42f:
  7825. +ManiaText_PartyFull:
  7826.     text "Your #MON party"
  7827.     line "is full."
  7828.     done
  7829.  
  7830. -UnknownText_0x9d449:
  7831. +ManiaText_IfHeComesBack:
  7832.     text "Oh, no… What'll"
  7833.     line "I do if he comes"
  7834.     cont "back?"
  7835.     done
  7836.  
  7837. -UnknownText_0x9d470:
  7838. +ManiaText_CanIHaveMyMonBack:
  7839.     text "Hi! How's my #-"
  7840.     line "MON?"
  7841.  
  7842. @@ -152,17 +152,17 @@ UnknownText_0x9d470:
  7843.     cont "it back?"
  7844.     done
  7845.  
  7846. -UnknownText_0x9d4b1:
  7847. +ManiaText_ThankYou:
  7848.     text "Thank you!"
  7849.     done
  7850.  
  7851. -UnknownText_0x9d4bd:
  7852. +ManiaText_ShuckleNotThere:
  7853.     text "Hey, you don't"
  7854.     line "have my #MON"
  7855.     cont "with you."
  7856.     done
  7857.  
  7858. -UnknownText_0x9d4e3:
  7859. +ManiaText_ShuckleLikesYou:
  7860.     text "My #MON has"
  7861.     line "come to like you."
  7862.  
  7863. @@ -173,13 +173,13 @@ UnknownText_0x9d4e3:
  7864.     line "be good to it!"
  7865.     done
  7866.  
  7867. -UnknownText_0x9d53f:
  7868. +ManiaText_SameAsBeingRobbed:
  7869.     text "Oh, no, no… That's"
  7870.     line "the same as being"
  7871.     cont "robbed."
  7872.     done
  7873.  
  7874. -UnknownText_0x9d56c:
  7875. +ManiaText_HappinessSpeech:
  7876.     text "For #MON, hap-"
  7877.     line "piness is being"
  7878.  
  7879. @@ -187,7 +187,7 @@ UnknownText_0x9d56c:
  7880.     line "treats them well."
  7881.     done
  7882.  
  7883. -UnknownText_0x9d5b0:
  7884. +ManiaText_ShuckleIsYourLastMon:
  7885.     text "If I take my #-"
  7886.     line "MON back, what are"
  7887.  
  7888. @@ -212,4 +212,4 @@ ManiasHouse_MapEventHeader:
  7889.  
  7890.  .PersonEvents:
  7891.     db 1
  7892. -   person_event SPRITE_ROCKER, 4, 2, $3, 0, 0, -1, -1, 0, 0, 0, RockerScript_0x9d278, -1
  7893. +   person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, ManiaScript, -1
  7894. diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
  7895. index 06dd75a..cd792b4 100644
  7896. --- a/maps/MobileBattleRoom.asm
  7897. +++ b/maps/MobileBattleRoom.asm
  7898. @@ -3,8 +3,8 @@ MobileBattleRoom_MapScriptHeader:
  7899.     db 2
  7900.  
  7901.     ; triggers
  7902.     dw .Trigger1, $0000
  7903.     dw .Trigger2, $0000
  7904.  
  7905.  .MapCallbacks:
  7906.     db 0
  7907. diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
  7908. index bebb824..09837e1 100644
  7909. --- a/maps/MobileTradeRoomMobile.asm
  7910. +++ b/maps/MobileTradeRoomMobile.asm
  7911. @@ -3,8 +3,8 @@ MobileTradeRoomMobile_MapScriptHeader:
  7912.     db 2
  7913.  
  7914.     ; triggers
  7915.     dw .Trigger1, $0000
  7916.     dw .Trigger2, $0000
  7917.  
  7918.  .MapCallbacks:
  7919.     db 0
  7920. diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
  7921. index b8ad92a..b5b0fcd 100644
  7922. --- a/maps/MountMoon.asm
  7923. +++ b/maps/MountMoon.asm
  7924. @@ -3,8 +3,8 @@ MountMoon_MapScriptHeader:
  7925.     db 2
  7926.  
  7927.     ; triggers
  7928.     dw UnknownScript_0x74089, $0000
  7929.     dw UnknownScript_0x7408d, $0000
  7930.  
  7931.  .MapCallbacks:
  7932.     db 0
  7933. @@ -182,4 +182,4 @@ MountMoon_MapEventHeader:
  7934.  
  7935.  .PersonEvents:
  7936.     db 1
  7937. -   person_event SPRITE_SILVER, 3, 7, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
  7938. +   person_event SPRITE_SILVER, 3, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
  7939. diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
  7940. index 29f8ff6..66cf07e 100644
  7941. --- a/maps/MountMoonGiftShop.asm
  7942. +++ b/maps/MountMoonGiftShop.asm
  7943. @@ -38,7 +38,7 @@ MountMoonGiftShop_MapEventHeader:
  7944.  
  7945.  .PersonEvents:
  7946.     db 4
  7947. -   person_event SPRITE_GRAMPS, 3, 4, $6, 0, 0, -1, 1, 0, 0, 0, GrampsScript_0x771a8, -1
  7948. -   person_event SPRITE_GRAMPS, 2, 1, $9, 0, 0, -1, 2, 0, 0, 0, GrampsScript_0x771a8, -1
  7949. -   person_event SPRITE_LASS, 6, 1, $5, 0, 1, -1, 1, 0, 0, 0, LassScript_0x771b0, -1
  7950. -   person_event SPRITE_LASS, 4, 5, $4, 1, 0, -1, 2, 0, 0, 0, LassScript_0x771b0, -1
  7951. +   person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEFN_06, 0, 0, -1, 1, 0, 0, 0, GrampsScript_0x771a8, -1
  7952. +   person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, 2, 0, 0, 0, GrampsScript_0x771a8, -1
  7953. +   person_event SPRITE_LASS, 6, 1, SPRITEMOVEFN_05, 0, 1, -1, 1, 0, 0, 0, LassScript_0x771b0, -1
  7954. +   person_event SPRITE_LASS, 4, 5, SPRITEMOVEFN_04, 1, 0, -1, 2, 0, 0, 0, LassScript_0x771b0, -1
  7955. diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
  7956. index b371ae4..5895143 100644
  7957. --- a/maps/MountMoonSquare.asm
  7958. +++ b/maps/MountMoonSquare.asm
  7959. @@ -3,7 +3,7 @@ MountMoonSquare_MapScriptHeader:
  7960.     db 1
  7961.  
  7962.     ; triggers
  7963.     dw UnknownScript_0x77092, $0000
  7964.  
  7965.  .MapCallbacks:
  7966.     db 2
  7967. @@ -155,6 +155,6 @@ MountMoonSquare_MapEventHeader:
  7968.  
  7969.  .PersonEvents:
  7970.     db 3
  7971. -   person_event SPRITE_FAIRY, 6, 6, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
  7972. -   person_event SPRITE_FAIRY, 6, 7, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
  7973. -   person_event SPRITE_ROCK, 7, 7, $18, 0, 0, -1, -1, 0, 0, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
  7974. +   person_event SPRITE_FAIRY, 6, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
  7975. +   person_event SPRITE_FAIRY, 6, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
  7976. +   person_event SPRITE_ROCK, 7, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
  7977. diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
  7978. index f830f56..6f4c4cc 100644
  7979. --- a/maps/MountMortar1FInside.asm
  7980. +++ b/maps/MountMortar1FInside.asm
  7981. @@ -6,7 +6,7 @@ MountMortar1FInside_MapScriptHeader:
  7982.     db 0
  7983.  
  7984.  TrainerPokemaniacMiller:
  7985.     trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, $0000, PokemaniacMillerScript
  7986.  
  7987.  PokemaniacMillerScript:
  7988.     talkaftercancel
  7989. @@ -17,7 +17,7 @@ PokemaniacMillerScript:
  7990.     end
  7991.  
  7992.  TrainerSupernerdMarkus:
  7993.     trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, $0000, SupernerdMarkusScript
  7994.  
  7995.  SupernerdMarkusScript:
  7996.     talkaftercancel
  7997. @@ -127,13 +127,13 @@ MountMortar1FInside_MapEventHeader:
  7998.  
  7999.  .PersonEvents:
  8000.     db 10
  8001. -   person_event SPRITE_BOULDER, 43, 21, $19, 0, 0, -1, -1, 0, 0, 0, MountMortar1FBoulder, -1
  8002. -   person_event SPRITE_POKE_BALL, 38, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
  8003. -   person_event SPRITE_POKE_BALL, 10, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
  8004. -   person_event SPRITE_POKE_BALL, 27, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
  8005. -   person_event SPRITE_POKE_BALL, 20, 22, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
  8006. -   person_event SPRITE_POKE_BALL, 19, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
  8007. -   person_event SPRITE_SUPER_NERD, 43, 33, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacMiller, -1
  8008. -   person_event SPRITE_SUPER_NERD, 28, 24, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdMarkus, -1
  8009. -   person_event SPRITE_POKE_BALL, 16, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
  8010. -   person_event SPRITE_POKE_BALL, 17, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
  8011. +   person_event SPRITE_BOULDER, 43, 21, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, MountMortar1FBoulder, -1
  8012. +   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
  8013. +   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
  8014. +   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
  8015. +   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
  8016. +   person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
  8017. +   person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacMiller, -1
  8018. +   person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdMarkus, -1
  8019. +   person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
  8020. +   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
  8021. diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
  8022. index f9c4271..51a87ad 100644
  8023. --- a/maps/MountMortar1FOutside.asm
  8024. +++ b/maps/MountMortar1FOutside.asm
  8025. @@ -40,5 +40,5 @@ MountMortar1FOutside_MapEventHeader:
  8026.  
  8027.  .PersonEvents:
  8028.     db 2
  8029. -   person_event SPRITE_POKE_BALL, 15, 13, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
  8030. -   person_event SPRITE_POKE_BALL, 18, 31, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
  8031. +   person_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
  8032. +   person_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
  8033. diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
  8034. index 5580a35..6c3197a 100644
  8035. --- a/maps/MountMortar2FInside.asm
  8036. +++ b/maps/MountMortar2FInside.asm
  8037. @@ -6,7 +6,7 @@ MountMortar2FInside_MapScriptHeader:
  8038.     db 0
  8039.  
  8040.  TrainerSupernerdHugh:
  8041.     trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, $0000, SupernerdHughScript
  8042.  
  8043.  SupernerdHughScript:
  8044.     talkaftercancel
  8045. @@ -76,10 +76,10 @@ MountMortar2FInside_MapEventHeader:
  8046.  
  8047.  .PersonEvents:
  8048.     db 7
  8049. -   person_event SPRITE_POKE_BALL, 22, 28, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
  8050. -   person_event SPRITE_POKE_BALL, 33, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
  8051. -   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
  8052. -   person_event SPRITE_POKE_BALL, 5, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
  8053. -   person_event SPRITE_POKE_BALL, 11, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
  8054. -   person_event SPRITE_POKE_BALL, 5, 28, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
  8055. -   person_event SPRITE_SUPER_NERD, 26, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdHugh, -1
  8056. +   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
  8057. +   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
  8058. +   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
  8059. +   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
  8060. +   person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
  8061. +   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
  8062. +   person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdHugh, -1
  8063. diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
  8064. index 5ed95af..0c7ae8c 100644
  8065. --- a/maps/MountMortarB1F.asm
  8066. +++ b/maps/MountMortarB1F.asm
  8067. @@ -15,7 +15,7 @@ BlackBeltScript_0x7e1f6:
  8068.     writetext UnknownText_0x7e24d
  8069.     closetext
  8070.     loadmovesprites
  8071.     winlosstext UnknownText_0x7e2a9, $0000
  8072.     loadtrainer BLACKBELT_T, KIYO
  8073.     startbattle
  8074.     returnafterbattle
  8075. @@ -144,10 +144,10 @@ MountMortarB1F_MapEventHeader:
  8076.  
  8077.  .PersonEvents:
  8078.     db 7
  8079. -   person_event SPRITE_POKE_BALL, 12, 29, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
  8080. -   person_event SPRITE_POKE_BALL, 16, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS
  8081. -   person_event SPRITE_BOULDER, 10, 9, $19, 0, 0, -1, -1, 0, 0, 0, MountMortarB1FBoulder, -1
  8082. -   person_event SPRITE_BLACK_BELT, 4, 16, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BlackBeltScript_0x7e1f6, -1
  8083. -   person_event SPRITE_POKE_BALL, 24, 34, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
  8084. -   person_event SPRITE_POKE_BALL, 3, 32, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
  8085. -   person_event SPRITE_POKE_BALL, 26, 21, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP
  8086. +   person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
  8087. +   person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS
  8088. +   person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, MountMortarB1FBoulder, -1
  8089. +   person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BlackBeltScript_0x7e1f6, -1
  8090. +   person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
  8091. +   person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
  8092. +   person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP
  8093. diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
  8094. index f16f6af..ada363a 100644
  8095. --- a/maps/MoveDeletersHouse.asm
  8096. +++ b/maps/MoveDeletersHouse.asm
  8097. @@ -35,4 +35,4 @@ MoveDeletersHouse_MapEventHeader:
  8098.  
  8099.  .PersonEvents:
  8100.     db 1
  8101. -   person_event SPRITE_SUPER_NERD, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, MoveDeleter, -1
  8102. +   person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, MoveDeleter, -1
  8103. diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
  8104. index a3bc193..2874f7b 100644
  8105. --- a/maps/MrFujisHouse.asm
  8106. +++ b/maps/MrFujisHouse.asm
  8107. @@ -91,8 +91,8 @@ MrFujisHouse_MapEventHeader:
  8108.  
  8109.  .PersonEvents:
  8110.     db 5
  8111. -   person_event SPRITE_SUPER_NERD, 1, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x7e8ca, -1
  8112. -   person_event SPRITE_LASS, 4, 3, $2, 1, 1, -1, -1, 0, 0, 0, LassScript_0x7e8cd, -1
  8113. -   person_event SPRITE_RHYDON, 4, 7, $16, 0, 0, -1, -1, 0, 0, 0, MrFujisPsyduck, -1
  8114. -   person_event SPRITE_GROWLITHE, 5, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MrFujisNidorino, -1
  8115. -   person_event SPRITE_MOLTRES, 3, 1, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MrFujisPidgey, -1
  8116. +   person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x7e8ca, -1
  8117. +   person_event SPRITE_LASS, 4, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, LassScript_0x7e8cd, -1
  8118. +   person_event SPRITE_RHYDON, 4, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, MrFujisPsyduck, -1
  8119. +   person_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, MrFujisNidorino, -1
  8120. +   person_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MrFujisPidgey, -1
  8121. diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
  8122. index 2600801..d06b3c7 100644
  8123. --- a/maps/MrPokemonsHouse.asm
  8124. +++ b/maps/MrPokemonsHouse.asm
  8125. @@ -3,8 +3,8 @@ MrPokemonsHouse_MapScriptHeader:
  8126.     db 2
  8127.  
  8128.     ; triggers
  8129.     dw UnknownScript_0x196e51, $0000
  8130.     dw UnknownScript_0x196e55, $0000
  8131.  
  8132.  .MapCallbacks:
  8133.     db 0
  8134. @@ -392,5 +392,5 @@ MrPokemonsHouse_MapEventHeader:
  8135.  
  8136.  .PersonEvents:
  8137.     db 2
  8138. -   person_event SPRITE_GENTLEMAN, 5, 3, $9, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196e97, -1
  8139. -   person_event SPRITE_OAK, 5, 6, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
  8140. +   person_event SPRITE_GENTLEMAN, 5, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196e97, -1
  8141. +   person_event SPRITE_OAK, 5, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
  8142. diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
  8143. index 63177f8..9c2e2e9 100644
  8144. --- a/maps/MrPsychicsHouse.asm
  8145. +++ b/maps/MrPsychicsHouse.asm
  8146. @@ -63,4 +63,4 @@ MrPsychicsHouse_MapEventHeader:
  8147.  
  8148.  .PersonEvents:
  8149.     db 1
  8150. -   person_event SPRITE_FISHING_GURU, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MrPsychic, -1
  8151. +   person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MrPsychic, -1
  8152. diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
  8153. index 3c326d1..4f5833a 100644
  8154. --- a/maps/NationalPark.asm
  8155. +++ b/maps/NationalPark.asm
  8156. @@ -56,7 +56,7 @@ GameboyKidScript_0x5c037:
  8157.     end
  8158.  
  8159.  TrainerSchoolboyJack1:
  8160.     trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, $0000, SchoolboyJack1Script
  8161.  
  8162.  SchoolboyJack1Script:
  8163.     writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK
  8164. @@ -86,7 +86,7 @@ UnknownScript_0x5c074:
  8165.  
  8166.  UnknownScript_0x5c088:
  8167.     scall UnknownScript_0x5c114
  8168.     winlosstext SchoolboyJack1BeatenText, $0000
  8169.     copybytetovar wJackFightCount
  8170.     if_equal 4, .Fight4
  8171.     if_equal 3, .Fight3
  8172. @@ -173,7 +173,7 @@ UnknownScript_0x5c114:
  8173.     end
  8174.  
  8175.  TrainerPokefanmWilliam:
  8176.     trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, $0000, PokefanmWilliamScript
  8177.  
  8178.  PokefanmWilliamScript:
  8179.     talkaftercancel
  8180. @@ -184,7 +184,7 @@ PokefanmWilliamScript:
  8181.     end
  8182.  
  8183.  TrainerPokefanfBeverly1:
  8184.     trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, $0000, PokefanfBeverly1Script
  8185.  
  8186.  PokefanfBeverly1Script:
  8187.     writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY
  8188. @@ -263,7 +263,7 @@ UnknownScript_0x5c1ab:
  8189.     end
  8190.  
  8191.  TrainerLassKrise:
  8192.     trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, $0000, LassKriseScript
  8193.  
  8194.  LassKriseScript:
  8195.     talkaftercancel
  8196. @@ -521,17 +521,17 @@ NationalPark_MapEventHeader:
  8197.  
  8198.  .PersonEvents:
  8199.     db 14
  8200. -   person_event SPRITE_LASS, 24, 15, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x5c002, -1
  8201. -   person_event SPRITE_POKEFAN_F, 4, 14, $6, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x5c005, -1
  8202. -   person_event SPRITE_TEACHER, 40, 27, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5c008, -1
  8203. -   person_event SPRITE_YOUNGSTER, 41, 11, $8, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x5c023, -1
  8204. -   person_event SPRITE_YOUNGSTER, 41, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c026, -1
  8205. -   person_event SPRITE_TEACHER, 41, 17, $2, 2, 1, -1, -1, 0, 0, 0, TeacherScript_0x5c029, -1
  8206. -   person_event SPRITE_GROWLITHE, 40, 26, $16, 0, 0, -1, -1, 0, 0, 0, GrowlitheScript_0x5c02c, -1
  8207. -   person_event SPRITE_YOUNGSTER, 23, 27, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyJack1, -1
  8208. -   person_event SPRITE_POKEFAN_F, 29, 18, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerPokefanfBeverly1, -1
  8209. -   person_event SPRITE_POKEFAN_M, 9, 16, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerPokefanmWilliam, -1
  8210. -   person_event SPRITE_LASS, 14, 8, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassKrise, -1
  8211. -   person_event SPRITE_POKE_BALL, 12, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL
  8212. -   person_event SPRITE_GAMEBOY_KID, 6, 26, $6, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x5c037, -1
  8213. -   person_event SPRITE_POKE_BALL, 43, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG
  8214. +   person_event SPRITE_LASS, 24, 15, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x5c002, -1
  8215. +   person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x5c005, -1
  8216. +   person_event SPRITE_TEACHER, 40, 27, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5c008, -1
  8217. +   person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x5c023, -1
  8218. +   person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x5c026, -1
  8219. +   person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, TeacherScript_0x5c029, -1
  8220. +   person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, GrowlitheScript_0x5c02c, -1
  8221. +   person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyJack1, -1
  8222. +   person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerPokefanfBeverly1, -1
  8223. +   person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerPokefanmWilliam, -1
  8224. +   person_event SPRITE_LASS, 14, 8, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassKrise, -1
  8225. +   person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL
  8226. +   person_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x5c037, -1
  8227. +   person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG
  8228. diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
  8229. index 5e67aac..e0fd05f 100644
  8230. --- a/maps/NationalParkBugContest.asm
  8231. +++ b/maps/NationalParkBugContest.asm
  8232. @@ -230,15 +230,15 @@ NationalParkBugContest_MapEventHeader:
  8233.  
  8234.  .PersonEvents:
  8235.     db 12
  8236. -   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
  8237. -   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
  8238. -   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
  8239. -   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
  8240. -   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
  8241. -   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
  8242. -   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
  8243. -   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
  8244. -   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
  8245. -   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
  8246. -   person_event SPRITE_POKE_BALL, 12, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL
  8247. -   person_event SPRITE_POKE_BALL, 43, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG
  8248. +   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
  8249. +   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
  8250. +   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
  8251. +   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
  8252. +   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
  8253. +   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
  8254. +   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
  8255. +   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
  8256. +   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
  8257. +   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
  8258. +   person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL
  8259. +   person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG
  8260. diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
  8261. index 49788b9..f0ab81b 100644
  8262. --- a/maps/NewBarkTown.asm
  8263. +++ b/maps/NewBarkTown.asm
  8264. @@ -3,8 +3,8 @@ NewBarkTown_MapScriptHeader:
  8265.     db 2
  8266.  
  8267.     ; triggers
  8268.     dw .Trigger1, $0000
  8269.     dw .Trigger2, $0000
  8270.  
  8271.  .MapCallbacks:
  8272.     db 1
  8273. @@ -305,6 +305,6 @@ NewBarkTown_MapEventHeader:
  8274.  
  8275.  .PersonEvents:
  8276.     db 3
  8277. -   person_event SPRITE_TEACHER, 8, 6, $3, 0, 1, -1, -1, 0, 0, 0, TeacherScript_0x1a806f, -1
  8278. -   person_event SPRITE_FISHER, 9, 12, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a809b, -1
  8279. -   person_event SPRITE_SILVER, 2, 3, $9, 0, 0, -1, -1, 0, 0, 0, SilverScript_0x1a809e, EVENT_RIVAL_NEW_BARK_TOWN
  8280. +   person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEFN_03, 0, 1, -1, -1, 0, 0, 0, TeacherScript_0x1a806f, -1
  8281. +   person_event SPRITE_FISHER, 9, 12, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a809b, -1
  8282. +   person_event SPRITE_SILVER, 2, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SilverScript_0x1a809e, EVENT_RIVAL_NEW_BARK_TOWN
  8283. diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
  8284. index b5f1f30..69b0608 100644
  8285. --- a/maps/OaksLab.asm
  8286. +++ b/maps/OaksLab.asm
  8287. @@ -283,7 +283,7 @@ OaksLab_MapEventHeader:
  8288.  
  8289.  .PersonEvents:
  8290.     db 4
  8291. -   person_event SPRITE_OAK, 2, 4, $6, 0, 0, -1, -1, 0, 0, 0, Oak, -1
  8292. -   person_event SPRITE_SCIENTIST, 8, 1, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b40f, -1
  8293. -   person_event SPRITE_SCIENTIST, 9, 8, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b412, -1
  8294. -   person_event SPRITE_SCIENTIST, 4, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b415, -1
  8295. +   person_event SPRITE_OAK, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, Oak, -1
  8296. +   person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b40f, -1
  8297. +   person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b412, -1
  8298. +   person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x19b415, -1
  8299. diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
  8300. index 94747e3..43c6d24 100644
  8301. --- a/maps/OlivineCafe.asm
  8302. +++ b/maps/OlivineCafe.asm
  8303. @@ -90,6 +90,6 @@ OlivineCafe_MapEventHeader:
  8304.  
  8305.  .PersonEvents:
  8306.     db 3
  8307. -   person_event SPRITE_SAILOR, 3, 4, $8, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x9c8c1, -1
  8308. -   person_event SPRITE_FISHING_GURU, 3, 7, $4, 1, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x9c8d9, -1
  8309. -   person_event SPRITE_SAILOR, 6, 6, $7, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x9c8dc, -1
  8310. +   person_event SPRITE_SAILOR, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x9c8c1, -1
  8311. +   person_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x9c8d9, -1
  8312. +   person_event SPRITE_SAILOR, 6, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x9c8dc, -1
  8313. diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
  8314. index a3d67a0..f05bfdc 100644
  8315. --- a/maps/OlivineCity.asm
  8316. +++ b/maps/OlivineCity.asm
  8317. @@ -3,8 +3,8 @@ OlivineCity_MapScriptHeader:
  8318.     db 2
  8319.  
  8320.     ; triggers
  8321.     dw .Trigger1, $0000
  8322.     dw .Trigger2, $0000
  8323.  
  8324.  .MapCallbacks:
  8325.     db 1
  8326. @@ -320,7 +320,7 @@ OlivineCity_MapEventHeader:
  8327.  
  8328.  .PersonEvents:
  8329.     db 4
  8330. -   person_event SPRITE_SAILOR, 27, 26, $4, 1, 0, -1, -1, 0, 0, 0, SailorScript_0x1a88a3, -1
  8331. -   person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x1a88a6, -1
  8332. -   person_event SPRITE_SAILOR, 21, 17, $2, 1, 1, -1, -1, 0, 0, 0, SailorScript_0x1a88ba, -1
  8333. -   person_event SPRITE_OLIVINE_RIVAL, 11, 10, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY
  8334. +   person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, SailorScript_0x1a88a3, -1
  8335. +   person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x1a88a6, -1
  8336. +   person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, SailorScript_0x1a88ba, -1
  8337. +   person_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY
  8338. diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
  8339. index 3fea640..1a59718 100644
  8340. --- a/maps/OlivineGoodRodHouse.asm
  8341. +++ b/maps/OlivineGoodRodHouse.asm
  8342. @@ -96,4 +96,4 @@ OlivineGoodRodHouse_MapEventHeader:
  8343.  
  8344.  .PersonEvents:
  8345.     db 1
  8346. -   person_event SPRITE_FISHING_GURU, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GoodRodGuru, -1
  8347. +   person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GoodRodGuru, -1
  8348. diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
  8349. index a1ae6dc..5539729 100644
  8350. --- a/maps/OlivineGym.asm
  8351. +++ b/maps/OlivineGym.asm
  8352. @@ -13,7 +13,7 @@ JasmineScript_0x9c12f:
  8353.     writetext UnknownText_0x9c1b9
  8354.     closetext
  8355.     loadmovesprites
  8356.     winlosstext UnknownText_0x9c2bb, $0000
  8357.     loadtrainer JASMINE, 1
  8358.     startbattle
  8359.     returnafterbattle
  8360. @@ -212,5 +212,5 @@ OlivineGym_MapEventHeader:
  8361.  
  8362.  .PersonEvents:
  8363.     db 2
  8364. -   person_event SPRITE_JASMINE, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
  8365. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OlivineGymGuyScript, -1
  8366. +   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
  8367. +   person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OlivineGymGuyScript, -1
  8368. diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
  8369. index 7e4f955..b6b2cb9 100644
  8370. --- a/maps/OlivineHouseBeta.asm
  8371. +++ b/maps/OlivineHouseBeta.asm
  8372. @@ -54,5 +54,5 @@ OlivineHouseBeta_MapEventHeader:
  8373.  
  8374.  .PersonEvents:
  8375.     db 2
  8376. -   person_event SPRITE_TEACHER, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9c58f, -1
  8377. -   person_event SPRITE_RHYDON, 4, 6, $4, 2, 0, -1, -1, 0, 0, 0, RhydonScript_0x9c592, -1
  8378. +   person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9c58f, -1
  8379. +   person_event SPRITE_RHYDON, 4, 6, SPRITEMOVEFN_04, 2, 0, -1, -1, 0, 0, 0, RhydonScript_0x9c592, -1
  8380. diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
  8381. index 10fdf1b..8d4b57b 100644
  8382. --- a/maps/OlivineLighthouse1F.asm
  8383. +++ b/maps/OlivineLighthouse1F.asm
  8384. @@ -52,5 +52,5 @@ OlivineLighthouse1F_MapEventHeader:
  8385.  
  8386.  .PersonEvents:
  8387.     db 2
  8388. -   person_event SPRITE_SAILOR, 2, 8, $6, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x5ae67, -1
  8389. -   person_event SPRITE_POKEFAN_F, 9, 16, $4, 2, 0, -1, -1, 0, 0, 0, PokefanFScript_0x5ae6a, -1
  8390. +   person_event SPRITE_SAILOR, 2, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x5ae67, -1
  8391. +   person_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEFN_04, 2, 0, -1, -1, 0, 0, 0, PokefanFScript_0x5ae6a, -1
  8392. diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
  8393. index 7603357..d29774b 100644
  8394. --- a/maps/OlivineLighthouse2F.asm
  8395. +++ b/maps/OlivineLighthouse2F.asm
  8396. @@ -6,7 +6,7 @@ OlivineLighthouse2F_MapScriptHeader:
  8397.     db 0
  8398.  
  8399.  TrainerGentlemanAlfred:
  8400.     trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, $0000, GentlemanAlfredScript
  8401.  
  8402.  GentlemanAlfredScript:
  8403.     talkaftercancel
  8404. @@ -17,7 +17,7 @@ GentlemanAlfredScript:
  8405.     end
  8406.  
  8407.  TrainerSailorHuey1:
  8408.     trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, $0000, SailorHuey1Script
  8409.  
  8410.  SailorHuey1Script:
  8411.     writecode VAR_CALLERID, PHONE_SAILOR_HUEY
  8412. @@ -45,7 +45,7 @@ UnknownScript_0x5afb3:
  8413.  
  8414.  UnknownScript_0x5afc7:
  8415.     scall UnknownScript_0x5b06b
  8416.     winlosstext SailorHuey1BeatenText, $0000
  8417.     copybytetovar wHueyFightCount
  8418.     if_equal 3, .Fight3
  8419.     if_equal 2, .Fight2
  8420. @@ -221,5 +221,5 @@ OlivineLighthouse2F_MapEventHeader:
  8421.  
  8422.  .PersonEvents:
  8423.     db 2
  8424. -   person_event SPRITE_SAILOR, 3, 9, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorHuey1, -1
  8425. -   person_event SPRITE_GENTLEMAN, 8, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerGentlemanAlfred, -1
  8426. +   person_event SPRITE_SAILOR, 3, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorHuey1, -1
  8427. +   person_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerGentlemanAlfred, -1
  8428. diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
  8429. index dd39a63..9f81a49 100644
  8430. --- a/maps/OlivineLighthouse3F.asm
  8431. +++ b/maps/OlivineLighthouse3F.asm
  8432. @@ -6,7 +6,7 @@ OlivineLighthouse3F_MapScriptHeader:
  8433.     db 0
  8434.  
  8435.  TrainerBird_keeperTheo:
  8436.     trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, $0000, Bird_keeperTheoScript
  8437.  
  8438.  Bird_keeperTheoScript:
  8439.     talkaftercancel
  8440. @@ -17,7 +17,7 @@ Bird_keeperTheoScript:
  8441.     end
  8442.  
  8443.  TrainerGentlemanPreston:
  8444.     trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, $0000, GentlemanPrestonScript
  8445.  
  8446.  GentlemanPrestonScript:
  8447.     talkaftercancel
  8448. @@ -28,7 +28,7 @@ GentlemanPrestonScript:
  8449.     end
  8450.  
  8451.  TrainerSailorTerrell:
  8452.     trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, $0000, SailorTerrellScript
  8453.  
  8454.  SailorTerrellScript:
  8455.     talkaftercancel
  8456. @@ -130,7 +130,7 @@ OlivineLighthouse3F_MapEventHeader:
  8457.  
  8458.  .PersonEvents:
  8459.     db 4
  8460. -   person_event SPRITE_SAILOR, 2, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSailorTerrell, -1
  8461. -   person_event SPRITE_GENTLEMAN, 5, 13, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerGentlemanPreston, -1
  8462. -   person_event SPRITE_YOUNGSTER, 9, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperTheo, -1
  8463. -   person_event SPRITE_POKE_BALL, 2, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
  8464. +   person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSailorTerrell, -1
  8465. +   person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerGentlemanPreston, -1
  8466. +   person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperTheo, -1
  8467. +   person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
  8468. diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
  8469. index 6b66621..2be5e12 100644
  8470. --- a/maps/OlivineLighthouse4F.asm
  8471. +++ b/maps/OlivineLighthouse4F.asm
  8472. @@ -6,7 +6,7 @@ OlivineLighthouse4F_MapScriptHeader:
  8473.     db 0
  8474.  
  8475.  TrainerLassConnie:
  8476.     trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, $0000, LassConnie1Script
  8477.  
  8478.  LassConnie1Script:
  8479.     talkaftercancel
  8480. @@ -17,7 +17,7 @@ LassConnie1Script:
  8481.     end
  8482.  
  8483.  TrainerSailorKent:
  8484.     trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, $0000, SailorKentScript
  8485.  
  8486.  SailorKentScript:
  8487.     talkaftercancel
  8488. @@ -102,5 +102,5 @@ OlivineLighthouse4F_MapEventHeader:
  8489.  
  8490.  .PersonEvents:
  8491.     db 2
  8492. -   person_event SPRITE_SAILOR, 14, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorKent, -1
  8493. -   person_event SPRITE_LASS, 2, 11, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassConnie, -1
  8494. +   person_event SPRITE_SAILOR, 14, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorKent, -1
  8495. +   person_event SPRITE_LASS, 2, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassConnie, -1
  8496. diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
  8497. index 4915ee4..378c25c 100644
  8498. --- a/maps/OlivineLighthouse5F.asm
  8499. +++ b/maps/OlivineLighthouse5F.asm
  8500. @@ -6,7 +6,7 @@ OlivineLighthouse5F_MapScriptHeader:
  8501.     db 0
  8502.  
  8503.  TrainerBird_keeperDenis:
  8504.     trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, $0000, Bird_keeperDenisScript
  8505.  
  8506.  Bird_keeperDenisScript:
  8507.     talkaftercancel
  8508. @@ -17,7 +17,7 @@ Bird_keeperDenisScript:
  8509.     end
  8510.  
  8511.  TrainerSailorErnest:
  8512.     trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, $0000, SailorErnestScript
  8513.  
  8514.  SailorErnestScript:
  8515.     talkaftercancel
  8516. @@ -107,8 +107,8 @@ OlivineLighthouse5F_MapEventHeader:
  8517.  
  8518.  .PersonEvents:
  8519.     db 5
  8520. -   person_event SPRITE_SAILOR, 11, 8, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorErnest, -1
  8521. -   person_event SPRITE_YOUNGSTER, 3, 8, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerBird_keeperDenis, -1
  8522. -   person_event SPRITE_POKE_BALL, 12, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
  8523. -   person_event SPRITE_POKE_BALL, 15, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
  8524. -   person_event SPRITE_POKE_BALL, 13, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
  8525. +   person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSailorErnest, -1
  8526. +   person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerBird_keeperDenis, -1
  8527. +   person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
  8528. +   person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
  8529. +   person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
  8530. diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
  8531. index 71934fe..143b041 100644
  8532. --- a/maps/OlivineLighthouse6F.asm
  8533. +++ b/maps/OlivineLighthouse6F.asm
  8534. @@ -270,6 +270,6 @@ OlivineLighthouse6F_MapEventHeader:
  8535.  
  8536.  .PersonEvents:
  8537.     db 3
  8538. -   person_event SPRITE_JASMINE, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
  8539. -   person_event SPRITE_MONSTER, 8, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MonsterScript_0x60c3a, -1
  8540. -   person_event SPRITE_POKE_BALL, 4, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
  8541. +   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
  8542. +   person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MonsterScript_0x60c3a, -1
  8543. +   person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
  8544. diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
  8545. index 3b0546e..f4c55ea 100644
  8546. --- a/maps/OlivineMart.asm
  8547. +++ b/maps/OlivineMart.asm
  8548. @@ -57,6 +57,6 @@ OlivineMart_MapEventHeader:
  8549.  
  8550.  .PersonEvents:
  8551.     db 3
  8552. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x9cac7, -1
  8553. -   person_event SPRITE_COOLTRAINER_F, 2, 6, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x9cace, -1
  8554. -   person_event SPRITE_LASS, 6, 1, $8, 0, 0, -1, -1, 0, 0, 0, LassScript_0x9cad1, -1
  8555. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x9cac7, -1
  8556. +   person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x9cace, -1
  8557. +   person_event SPRITE_LASS, 6, 1, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, LassScript_0x9cad1, -1
  8558. diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm
  8559. index 63c8509..816775a 100644
  8560. --- a/maps/OlivinePokeCenter1F.asm
  8561. +++ b/maps/OlivinePokeCenter1F.asm
  8562. @@ -59,7 +59,7 @@ OlivinePokeCenter1F_MapEventHeader:
  8563.  
  8564.  .PersonEvents:
  8565.     db 4
  8566. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9c002, -1
  8567. -   person_event SPRITE_FISHING_GURU, 4, 8, $5, 0, 1, -1, -1, 0, 0, 0, FishingGuruScript_0x9c005, -1
  8568. -   person_event SPRITE_FISHER, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x9c008, -1
  8569. -   person_event SPRITE_TEACHER, 1, 7, $6, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9c00b, -1
  8570. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9c002, -1
  8571. +   person_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, FishingGuruScript_0x9c005, -1
  8572. +   person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x9c008, -1
  8573. +   person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9c00b, -1
  8574. diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
  8575. index ab1307f..6ac458c 100644
  8576. --- a/maps/OlivinePort.asm
  8577. +++ b/maps/OlivinePort.asm
  8578. @@ -3,8 +3,8 @@ OlivinePort_MapScriptHeader:
  8579.     db 2
  8580.  
  8581.     ; triggers
  8582.     dw UnknownScript_0x748ac, $0000
  8583.     dw UnknownScript_0x748ad, $0000
  8584.  
  8585.  .MapCallbacks:
  8586.     db 0
  8587. @@ -397,10 +397,10 @@ OlivinePort_MapEventHeader:
  8588.  
  8589.  .PersonEvents:
  8590.     db 7
  8591. -   person_event SPRITE_SAILOR, 23, 7, $7, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
  8592. -   person_event SPRITE_SAILOR, 15, 7, $7, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
  8593. -   person_event SPRITE_SAILOR, 15, 6, $9, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
  8594. -   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
  8595. -   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
  8596. -   person_event SPRITE_YOUNGSTER, 15, 4, $6, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
  8597. -   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
  8598. +   person_event SPRITE_SAILOR, 23, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
  8599. +   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
  8600. +   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
  8601. +   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
  8602. +   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
  8603. +   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
  8604. +   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
  8605. diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
  8606. index f5f95d3..37c42d9 100644
  8607. --- a/maps/OlivinePortPassage.asm
  8608. +++ b/maps/OlivinePortPassage.asm
  8609. @@ -36,4 +36,4 @@ OlivinePortPassage_MapEventHeader:
  8610.  
  8611.  .PersonEvents:
  8612.     db 1
  8613. -   person_event SPRITE_POKEFAN_M, 1, 17, $8, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
  8614. +   person_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
  8615. diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
  8616. index e968dd1..2f209b8 100644
  8617. --- a/maps/OlivinePunishmentSpeechHouse.asm
  8618. +++ b/maps/OlivinePunishmentSpeechHouse.asm
  8619. @@ -54,5 +54,5 @@ OlivinePunishmentSpeechHouse_MapEventHeader:
  8620.  
  8621.  .PersonEvents:
  8622.     db 2
  8623. -   person_event SPRITE_POKEFAN_M, 2, 1, $3, 0, 0, -1, -1, 0, 0, 0, OlivinePunishmentSpeechHouseDad, -1
  8624. -   person_event SPRITE_LASS, 5, 5, $5, 0, 2, -1, -1, 0, 0, 0, OlivinePunishmentSpeechHouseDaughter, -1
  8625. +   person_event SPRITE_POKEFAN_M, 2, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, OlivinePunishmentSpeechHouseDad, -1
  8626. +   person_event SPRITE_LASS, 5, 5, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, OlivinePunishmentSpeechHouseDaughter, -1
  8627. diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm
  8628. index 717abfe..82a3037 100644
  8629. --- a/maps/OlivineVoltorbHouse.asm
  8630. +++ b/maps/OlivineVoltorbHouse.asm
  8631. @@ -35,4 +35,4 @@ OlivineVoltorbHouse_MapEventHeader:
  8632.  
  8633.  .PersonEvents:
  8634.     db 1
  8635. -   person_event SPRITE_FISHING_GURU, 3, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Tim, -1
  8636. +   person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Tim, -1
  8637. diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
  8638. index efaae10..fc92d50 100644
  8639. --- a/maps/PalletTown.asm
  8640. +++ b/maps/PalletTown.asm
  8641. @@ -89,5 +89,5 @@ PalletTown_MapEventHeader:
  8642.  
  8643.  .PersonEvents:
  8644.     db 2
  8645. -   person_event SPRITE_TEACHER, 8, 3, $2, 2, 2, -1, -1, 0, 0, 0, TeacherScript_0x1ac6d5, -1
  8646. -   person_event SPRITE_FISHER, 14, 12, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ac6d8, -1
  8647. +   person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, TeacherScript_0x1ac6d5, -1
  8648. +   person_event SPRITE_FISHER, 14, 12, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ac6d8, -1
  8649. diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
  8650. index 2b74bea..50e8348 100644
  8651. --- a/maps/PewterCity.asm
  8652. +++ b/maps/PewterCity.asm
  8653. @@ -174,8 +174,8 @@ PewterCity_MapEventHeader:
  8654.  
  8655.  .PersonEvents:
  8656.     db 5
  8657. -   person_event SPRITE_COOLTRAINER_F, 11, 19, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18c009, -1
  8658. -   person_event SPRITE_BUG_CATCHER, 29, 14, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18c00c, -1
  8659. -   person_event SPRITE_GRAMPS, 17, 29, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x18c00f, -1
  8660. -   person_event SPRITE_FRUIT_TREE, 3, 32, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x18c03e, -1
  8661. -   person_event SPRITE_FRUIT_TREE, 3, 30, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x18c040, -1
  8662. +   person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18c009, -1
  8663. +   person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18c00c, -1
  8664. +   person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x18c00f, -1
  8665. +   person_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x18c03e, -1
  8666. +   person_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x18c040, -1
  8667. diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
  8668. index 3f5b734..cd12ded 100644
  8669. --- a/maps/PewterGym.asm
  8670. +++ b/maps/PewterGym.asm
  8671. @@ -13,7 +13,7 @@ BrockScript_0x1a2864:
  8672.     writetext UnknownText_0x1a28d0
  8673.     closetext
  8674.     loadmovesprites
  8675.     winlosstext UnknownText_0x1a29bb, $0000
  8676.     loadtrainer BROCK, 1
  8677.     startbattle
  8678.     returnafterbattle
  8679. @@ -36,7 +36,7 @@ BrockScript_0x1a2864:
  8680.     end
  8681.  
  8682.  TrainerCamperJerry:
  8683.     trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, $0000, CamperJerryScript
  8684.  
  8685.  CamperJerryScript:
  8686.     talkaftercancel
  8687. @@ -222,6 +222,6 @@ PewterGym_MapEventHeader:
  8688.  
  8689.  .PersonEvents:
  8690.     db 3
  8691. -   person_event SPRITE_BROCK, 1, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrockScript_0x1a2864, -1
  8692. -   person_event SPRITE_YOUNGSTER, 5, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperJerry, -1
  8693. -   person_event SPRITE_GYM_GUY, 11, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, PewterGymGuyScript, -1
  8694. +   person_event SPRITE_BROCK, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrockScript_0x1a2864, -1
  8695. +   person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperJerry, -1
  8696. +   person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, PewterGymGuyScript, -1
  8697. diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
  8698. index 557f0d5..431b854 100644
  8699. --- a/maps/PewterMart.asm
  8700. +++ b/maps/PewterMart.asm
  8701. @@ -57,6 +57,6 @@ PewterMart_MapEventHeader:
  8702.  
  8703.  .PersonEvents:
  8704.     db 3
  8705. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x1a2dcb, -1
  8706. -   person_event SPRITE_YOUNGSTER, 2, 9, $5, 0, 2, -1, -1, 0, 0, 0, YoungsterScript_0x1a2dd2, -1
  8707. -   person_event SPRITE_SUPER_NERD, 6, 6, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a2dd5, -1
  8708. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x1a2dcb, -1
  8709. +   person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, YoungsterScript_0x1a2dd2, -1
  8710. +   person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a2dd5, -1
  8711. diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
  8712. index 773871d..9fa9c29 100644
  8713. --- a/maps/PewterNidoranSpeechHouse.asm
  8714. +++ b/maps/PewterNidoranSpeechHouse.asm
  8715. @@ -41,5 +41,5 @@ PewterNidoranSpeechHouse_MapEventHeader:
  8716.  
  8717.  .PersonEvents:
  8718.     db 2
  8719. -   person_event SPRITE_SUPER_NERD, 5, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x1a2807, -1
  8720. -   person_event SPRITE_GROWLITHE, 5, 4, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrowlitheScript_0x1a280a, -1
  8721. +   person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x1a2807, -1
  8722. +   person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrowlitheScript_0x1a280a, -1
  8723. diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm
  8724. index 0cbb4bb..2ae1d39 100644
  8725. --- a/maps/PewterPokeCenter1F.asm
  8726. +++ b/maps/PewterPokeCenter1F.asm
  8727. @@ -78,8 +78,8 @@ PewterPokeCenter1F_MapEventHeader:
  8728.  
  8729.  .PersonEvents:
  8730.     db 5
  8731. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1a2ee7, -1
  8732. -   person_event SPRITE_TEACHER, 6, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a2eea, -1
  8733. -   person_event SPRITE_JIGGLYPUFF, 3, 1, $16, 0, 0, -1, -1, 0, 0, 0, JigglypuffScript_0x1a2eed, -1
  8734. -   person_event SPRITE_BUG_CATCHER, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x1a2ef7, -1
  8735. -   person_event SPRITE_POKEFAN_M, 2, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1a2efa, -1
  8736. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1a2ee7, -1
  8737. +   person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a2eea, -1
  8738. +   person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, JigglypuffScript_0x1a2eed, -1
  8739. +   person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x1a2ef7, -1
  8740. +   person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x1a2efa, -1
  8741. diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
  8742. index 1284ec3..575d782 100644
  8743. --- a/maps/PewterSnoozeSpeechHouse.asm
  8744. +++ b/maps/PewterSnoozeSpeechHouse.asm
  8745. @@ -36,4 +36,4 @@ PewterSnoozeSpeechHouse_MapEventHeader:
  8746.  
  8747.  .PersonEvents:
  8748.     db 1
  8749. -   person_event SPRITE_GRAMPS, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x1a3059, -1
  8750. +   person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x1a3059, -1
  8751. diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
  8752. index 9a6e307..cba746f 100644
  8753. --- a/maps/PokeCenter2F.asm
  8754. +++ b/maps/PokeCenter2F.asm
  8755. @@ -3,12 +3,12 @@ PokeCenter2F_MapScriptHeader:
  8756.     db 6
  8757.  
  8758.     ; triggers
  8759.     dw .Trigger1, $0000
  8760.     dw .Trigger2, $0000
  8761.     dw .Trigger3, $0000
  8762.     dw .Trigger4, $0000
  8763.     dw .Trigger5, $0000
  8764.     dw .Trigger6, $0000
  8765.  
  8766.  .MapCallbacks:
  8767.     db 0
  8768. @@ -1040,7 +1040,7 @@ PokeCenter2F_MapEventHeader:
  8769.  
  8770.  .PersonEvents:
  8771.     db 4
  8772. -   person_event SPRITE_LINK_RECEPTIONIST, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_Trade, -1
  8773. -   person_event SPRITE_LINK_RECEPTIONIST, 2, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_Battle, -1
  8774. -   person_event SPRITE_LINK_RECEPTIONIST, 3, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_TimeCapsule, -1
  8775. -   person_event SPRITE_OFFICER, 1, 1, $6, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
  8776. +   person_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_Trade, -1
  8777. +   person_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_Battle, -1
  8778. +   person_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LinkReceptionistScript_TimeCapsule, -1
  8779. +   person_event SPRITE_OFFICER, 1, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
  8780. diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
  8781. index ef5130d..3945c1e 100644
  8782. --- a/maps/PokeSeersHouse.asm
  8783. +++ b/maps/PokeSeersHouse.asm
  8784. @@ -30,4 +30,4 @@ PokeSeersHouse_MapEventHeader:
  8785.  
  8786.  .PersonEvents:
  8787.     db 1
  8788. -   person_event SPRITE_GRANNY, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SeerScript, -1
  8789. +   person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SeerScript, -1
  8790. diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
  8791. index 29d3cbb..c37b471 100644
  8792. --- a/maps/PokemonFanClub.asm
  8793. +++ b/maps/PokemonFanClub.asm
  8794. @@ -307,9 +307,9 @@ PokemonFanClub_MapEventHeader:
  8795.  
  8796.  .PersonEvents:
  8797.     db 6
  8798. -   person_event SPRITE_GENTLEMAN, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x1917e9, -1
  8799. -   person_event SPRITE_RECEPTIONIST, 1, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x191821, -1
  8800. -   person_event SPRITE_FISHER, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x191824, -1
  8801. -   person_event SPRITE_TEACHER, 2, 7, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x19186b, -1
  8802. -   person_event SPRITE_FAIRY, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, FairyScript_0x19186e, EVENT_VERMILION_FAN_CLUB_DOLL
  8803. -   person_event SPRITE_ODDISH, 3, 7, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OddishScript_0x191871, -1
  8804. +   person_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x1917e9, -1
  8805. +   person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x191821, -1
  8806. +   person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x191824, -1
  8807. +   person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x19186b, -1
  8808. +   person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FairyScript_0x19186e, EVENT_VERMILION_FAN_CLUB_DOLL
  8809. +   person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OddishScript_0x191871, -1
  8810. diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
  8811. index 2057e2b..c20e61b 100644
  8812. --- a/maps/PowerPlant.asm
  8813. +++ b/maps/PowerPlant.asm
  8814. @@ -3,8 +3,8 @@ PowerPlant_MapScriptHeader:
  8815.     db 2
  8816.  
  8817.     ; triggers
  8818.     dw UnknownScript_0x188dc3, $0000
  8819.     dw UnknownScript_0x188dc4, $0000
  8820.  
  8821.  .MapCallbacks:
  8822.     db 0
  8823. @@ -401,10 +401,10 @@ PowerPlant_MapEventHeader:
  8824.  
  8825.  .PersonEvents:
  8826.     db 7
  8827. -   person_event SPRITE_OFFICER, 14, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x188df5, -1
  8828. -   person_event SPRITE_GYM_GUY, 9, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e15, -1
  8829. -   person_event SPRITE_GYM_GUY, 11, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e29, -1
  8830. -   person_event SPRITE_OFFICER, 3, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x188e3d, -1
  8831. -   person_event SPRITE_GYM_GUY, 2, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e51, -1
  8832. -   person_event SPRITE_FISHER, 10, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PowerPlantManager, -1
  8833. -   person_event SPRITE_GYM_GUY, 5, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188ecb, -1
  8834. +   person_event SPRITE_OFFICER, 14, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x188df5, -1
  8835. +   person_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e15, -1
  8836. +   person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e29, -1
  8837. +   person_event SPRITE_OFFICER, 3, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, OfficerScript_0x188e3d, -1
  8838. +   person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e51, -1
  8839. +   person_event SPRITE_FISHER, 10, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PowerPlantManager, -1
  8840. +   person_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x188ecb, -1
  8841. diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
  8842. index f39a065..6f5cea2 100644
  8843. --- a/maps/RadioTower1F.asm
  8844. +++ b/maps/RadioTower1F.asm
  8845. @@ -178,7 +178,7 @@ YoungsterScript_0x5ce54:
  8846.     jumptextfaceplayer UnknownText_0x5d4ac
  8847.  
  8848.  TrainerGruntM3:
  8849.     trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, $0000, GruntM3Script
  8850.  
  8851.  GruntM3Script:
  8852.     talkaftercancel
  8853. @@ -484,9 +484,9 @@ RadioTower1F_MapEventHeader:
  8854.  
  8855.  .PersonEvents:
  8856.     db 6
  8857. -   person_event SPRITE_RECEPTIONIST, 6, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x5cd29, -1
  8858. -   person_event SPRITE_LASS, 4, 16, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS
  8859. -   person_event SPRITE_YOUNGSTER, 4, 15, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS
  8860. -   person_event SPRITE_ROCKET, 1, 14, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8861. -   person_event SPRITE_GENTLEMAN, 6, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
  8862. -   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
  8863. +   person_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x5cd29, -1
  8864. +   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
  8865. +   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
  8866. +   person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8867. +   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
  8868. +   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
  8869. diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
  8870. index 6439214..8e16dd1 100644
  8871. --- a/maps/RadioTower2F.asm
  8872. +++ b/maps/RadioTower2F.asm
  8873. @@ -42,7 +42,7 @@ BlackBeltScript_0x5d722:
  8874.     jumptextfaceplayer UnknownText_0x5da44
  8875.  
  8876.  TrainerGruntM4:
  8877.     trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, $0000, GruntM4Script
  8878.  
  8879.  GruntM4Script:
  8880.     talkaftercancel
  8881. @@ -53,7 +53,7 @@ GruntM4Script:
  8882.     end
  8883.  
  8884.  TrainerGruntM5:
  8885.     trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, $0000, GruntM5Script
  8886.  
  8887.  GruntM5Script:
  8888.     talkaftercancel
  8889. @@ -64,7 +64,7 @@ GruntM5Script:
  8890.     end
  8891.  
  8892.  TrainerGruntM6:
  8893.     trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, $0000, GruntM6Script
  8894.  
  8895.  GruntM6Script:
  8896.     talkaftercancel
  8897. @@ -75,7 +75,7 @@ GruntM6Script:
  8898.     end
  8899.  
  8900.  TrainerGruntF2:
  8901.     trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, $0000, GruntF2Script
  8902.  
  8903.  GruntF2Script:
  8904.     talkaftercancel
  8905. @@ -720,14 +720,14 @@ RadioTower2F_MapEventHeader:
  8906.  
  8907.  .PersonEvents:
  8908.     db 11
  8909. -   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
  8910. -   person_event SPRITE_TEACHER, 2, 17, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x5d701, -1
  8911. -   person_event SPRITE_ROCKET, 4, 1, $7, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8912. -   person_event SPRITE_ROCKET, 4, 8, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8913. -   person_event SPRITE_ROCKET, 1, 4, $6, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8914. -   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
  8915. -   person_event SPRITE_BLACK_BELT, 1, 0, $6, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
  8916. -   person_event SPRITE_BLACK_BELT, 1, 1, $6, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  8917. -   person_event SPRITE_JIGGLYPUFF, 1, 12, $16, 0, 0, -1, -1, 0, 0, 0, JigglypuffScript_0x5d715, -1
  8918. -   person_event SPRITE_BUENA, 5, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Buena, -1
  8919. -   person_event SPRITE_RECEPTIONIST, 7, 12, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
  8920. +   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
  8921. +   person_event SPRITE_TEACHER, 2, 17, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x5d701, -1
  8922. +   person_event SPRITE_ROCKET, 4, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8923. +   person_event SPRITE_ROCKET, 4, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8924. +   person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8925. +   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
  8926. +   person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
  8927. +   person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  8928. +   person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, JigglypuffScript_0x5d715, -1
  8929. +   person_event SPRITE_BUENA, 5, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Buena, -1
  8930. +   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
  8931. diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
  8932. index 4329295..4df995a 100644
  8933. --- a/maps/RadioTower3F.asm
  8934. +++ b/maps/RadioTower3F.asm
  8935. @@ -77,7 +77,7 @@ UnknownScript_0x5e5a1:
  8936.     end
  8937.  
  8938.  TrainerGruntM7:
  8939.     trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, $0000, GruntM7Script
  8940.  
  8941.  GruntM7Script:
  8942.     talkaftercancel
  8943. @@ -88,7 +88,7 @@ GruntM7Script:
  8944.     end
  8945.  
  8946.  TrainerGruntM8:
  8947.     trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, $0000, GruntM8Script
  8948.  
  8949.  GruntM8Script:
  8950.     talkaftercancel
  8951. @@ -99,7 +99,7 @@ GruntM8Script:
  8952.     end
  8953.  
  8954.  TrainerGruntM9:
  8955.     trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, $0000, GruntM9Script
  8956.  
  8957.  GruntM9Script:
  8958.     talkaftercancel
  8959. @@ -110,7 +110,7 @@ GruntM9Script:
  8960.     end
  8961.  
  8962.  TrainerScientistMarc:
  8963.     trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, $0000, ScientistMarcScript
  8964.  
  8965.  ScientistMarcScript:
  8966.     talkaftercancel
  8967. @@ -343,10 +343,10 @@ RadioTower3F_MapEventHeader:
  8968.  
  8969.  .PersonEvents:
  8970.     db 7
  8971. -   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
  8972. -   person_event SPRITE_GYM_GUY, 4, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GymGuyScript_0x5e556, -1
  8973. -   person_event SPRITE_COOLTRAINER_F, 3, 11, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x5e56a, -1
  8974. -   person_event SPRITE_ROCKET, 1, 5, $9, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8975. -   person_event SPRITE_ROCKET, 2, 6, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8976. -   person_event SPRITE_ROCKET, 6, 16, $7, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8977. -   person_event SPRITE_SCIENTIST, 6, 9, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8978. +   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
  8979. +   person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GymGuyScript_0x5e556, -1
  8980. +   person_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x5e56a, -1
  8981. +   person_event SPRITE_ROCKET, 1, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8982. +   person_event SPRITE_ROCKET, 2, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8983. +   person_event SPRITE_ROCKET, 6, 16, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  8984. +   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
  8985. diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
  8986. index be4cd0c..f90fe14 100644
  8987. --- a/maps/RadioTower4F.asm
  8988. +++ b/maps/RadioTower4F.asm
  8989. @@ -47,7 +47,7 @@ GrowlitheScript_0x5ebb2:
  8990.     end
  8991.  
  8992.  TrainerGruntM10:
  8993.     trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, $0000, GruntM10Script
  8994.  
  8995.  GruntM10Script:
  8996.     talkaftercancel
  8997. @@ -58,7 +58,7 @@ GruntM10Script:
  8998.     end
  8999.  
  9000.  TrainerExecutivem2:
  9001.     trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, $0000, Executivem2Script
  9002.  
  9003.  Executivem2Script:
  9004.     talkaftercancel
  9005. @@ -69,7 +69,7 @@ Executivem2Script:
  9006.     end
  9007.  
  9008.  TrainerGruntF4:
  9009.     trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, $0000, GruntF4Script
  9010.  
  9011.  GruntF4Script:
  9012.     talkaftercancel
  9013. @@ -80,7 +80,7 @@ GruntF4Script:
  9014.     end
  9015.  
  9016.  TrainerScientistRich:
  9017.     trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, $0000, ScientistRichScript
  9018.  
  9019.  ScientistRichScript:
  9020.     talkaftercancel
  9021. @@ -257,10 +257,10 @@ RadioTower4F_MapEventHeader:
  9022.  
  9023.  .PersonEvents:
  9024.     db 7
  9025. -   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
  9026. -   person_event SPRITE_TEACHER, 6, 14, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5eb85, -1
  9027. -   person_event SPRITE_GROWLITHE, 7, 12, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrowlitheScript_0x5ebb2, -1
  9028. -   person_event SPRITE_ROCKET, 6, 5, $1f, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9029. -   person_event SPRITE_ROCKET, 1, 14, $8, 0, 2, -1, -1, 0, 2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9030. -   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
  9031. -   person_event SPRITE_SCIENTIST, 2, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9032. +   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
  9033. +   person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5eb85, -1
  9034. +   person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrowlitheScript_0x5ebb2, -1
  9035. +   person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEFN_1F, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9036. +   person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEFN_08, 0, 2, -1, -1, 0, 2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9037. +   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
  9038. +   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
  9039. diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
  9040. index 499e7fb..de3d5f7 100644
  9041. --- a/maps/RadioTower5F.asm
  9042. +++ b/maps/RadioTower5F.asm
  9043. @@ -3,9 +3,9 @@ RadioTower5F_MapScriptHeader:
  9044.     db 3
  9045.  
  9046.     ; triggers
  9047.     dw UnknownScript_0x6000e, $0000
  9048.     dw UnknownScript_0x6000f, $0000
  9049.     dw UnknownScript_0x60010, $0000
  9050.  
  9051.  .MapCallbacks:
  9052.     db 0
  9053. @@ -32,7 +32,7 @@ UnknownScript_0x60011:
  9054.     writetext UnknownText_0x60147
  9055.     closetext
  9056.     loadmovesprites
  9057.     winlosstext UnknownText_0x60223, $0000
  9058.     setlasttalked $2
  9059.     loadtrainer EXECUTIVEM, 3
  9060.     startbattle
  9061. @@ -63,7 +63,7 @@ UnknownScript_0x60054:
  9062.     end
  9063.  
  9064.  TrainerExecutivef1:
  9065.     trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, $0000, Executivef1Script
  9066.  
  9067.  Executivef1Script:
  9068.     talkaftercancel
  9069. @@ -81,7 +81,7 @@ UnknownScript_0x6006e:
  9070.     writetext UnknownText_0x603d1
  9071.     closetext
  9072.     loadmovesprites
  9073.     winlosstext UnknownText_0x604f3, $0000
  9074.     setlasttalked $3
  9075.     loadtrainer EXECUTIVEM, 1
  9076.     startbattle
  9077. @@ -439,8 +439,8 @@ RadioTower5F_MapEventHeader:
  9078.  
  9079.  .PersonEvents:
  9080.     db 5
  9081. -   person_event SPRITE_GENTLEMAN, 6, 3, $3, 0, 0, -1, -1, 0, 0, 0, Director, -1
  9082. -   person_event SPRITE_ROCKET, 5, 13, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9083. -   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
  9084. -   person_event SPRITE_ROCKER, 5, 13, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
  9085. -   person_event SPRITE_POKE_BALL, 5, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL
  9086. +   person_event SPRITE_GENTLEMAN, 6, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, Director, -1
  9087. +   person_event SPRITE_ROCKET, 5, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  9088. +   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
  9089. +   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
  9090. +   person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL
  9091. diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
  9092. index a3e23c6..2826705 100644
  9093. --- a/maps/RedsHouse1F.asm
  9094. +++ b/maps/RedsHouse1F.asm
  9095. @@ -3,7 +3,7 @@ RedsHouse1F_MapScriptHeader:
  9096.     db 1
  9097.  
  9098.     ; triggers
  9099.     dw .Trigger, $0000
  9100.  
  9101.  .MapCallbacks:
  9102.     db 0
  9103. @@ -94,4 +94,4 @@ RedsHouse1F_MapEventHeader:
  9104.  
  9105.  .PersonEvents:
  9106.     db 1
  9107. -   person_event SPRITE_REDS_MOM, 3, 5, $8, 0, 0, -1, -1, 0, 0, 0, RedsMom, -1
  9108. +   person_event SPRITE_REDS_MOM, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, RedsMom, -1
  9109. diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
  9110. index 6f4c0f6..5c35584 100644
  9111. --- a/maps/RockTunnel1F.asm
  9112. +++ b/maps/RockTunnel1F.asm
  9113. @@ -42,5 +42,5 @@ RockTunnel1F_MapEventHeader:
  9114.  
  9115.  .PersonEvents:
  9116.     db 2
  9117. -   person_event SPRITE_POKE_BALL, 18, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER
  9118. -   person_event SPRITE_POKE_BALL, 15, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
  9119. +   person_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER
  9120. +   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
  9121. diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
  9122. index 3f95471..5889d35 100644
  9123. --- a/maps/RockTunnelB1F.asm
  9124. +++ b/maps/RockTunnelB1F.asm
  9125. @@ -38,6 +38,6 @@ RockTunnelB1F_MapEventHeader:
  9126.  
  9127.  .PersonEvents:
  9128.     db 3
  9129. -   person_event SPRITE_POKE_BALL, 25, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON
  9130. -   person_event SPRITE_POKE_BALL, 17, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP
  9131. -   person_event SPRITE_POKE_BALL, 2, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE
  9132. +   person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON
  9133. +   person_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP
  9134. +   person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE
  9135. diff --git a/maps/Route1.asm b/maps/Route1.asm
  9136. index 0c175e9..12434ea 100644
  9137. --- a/maps/Route1.asm
  9138. +++ b/maps/Route1.asm
  9139. @@ -6,7 +6,7 @@ Route1_MapScriptHeader:
  9140.     db 0
  9141.  
  9142.  TrainerSchoolboyDanny:
  9143.     trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, $0000, SchoolboyDannyScript
  9144.  
  9145.  SchoolboyDannyScript:
  9146.     talkaftercancel
  9147. @@ -17,7 +17,7 @@ SchoolboyDannyScript:
  9148.     end
  9149.  
  9150.  TrainerCooltrainerfQuinn:
  9151.     trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, $0000, CooltrainerfQuinnScript
  9152.  
  9153.  CooltrainerfQuinnScript:
  9154.     talkaftercancel
  9155. @@ -91,6 +91,6 @@ Route1_MapEventHeader:
  9156.  
  9157.  .PersonEvents:
  9158.     db 3
  9159. -   person_event SPRITE_YOUNGSTER, 12, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSchoolboyDanny, -1
  9160. -   person_event SPRITE_COOLTRAINER_F, 25, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfQuinn, -1
  9161. -   person_event SPRITE_FRUIT_TREE, 7, 3, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac581, -1
  9162. +   person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSchoolboyDanny, -1
  9163. +   person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfQuinn, -1
  9164. +   person_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac581, -1
  9165. diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm
  9166. index 8374255..2ddca4e 100644
  9167. --- a/maps/Route10PokeCenter1F.asm
  9168. +++ b/maps/Route10PokeCenter1F.asm
  9169. @@ -92,7 +92,7 @@ Route10PokeCenter1F_MapEventHeader:
  9170.  
  9171.  .PersonEvents:
  9172.     db 4
  9173. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x188bd4, -1
  9174. -   person_event SPRITE_GENTLEMAN, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x188bd7, -1
  9175. -   person_event SPRITE_GYM_GUY, 2, 7, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x188bda, -1
  9176. -   person_event SPRITE_COOLTRAINER_F, 3, 1, $6, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x188bee, -1
  9177. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x188bd4, -1
  9178. +   person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x188bd7, -1
  9179. +   person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x188bda, -1
  9180. +   person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x188bee, -1
  9181. diff --git a/maps/Route10South.asm b/maps/Route10South.asm
  9182. index 662509b..84e81eb 100644
  9183. --- a/maps/Route10South.asm
  9184. +++ b/maps/Route10South.asm
  9185. @@ -6,7 +6,7 @@ Route10South_MapScriptHeader:
  9186.     db 0
  9187.  
  9188.  TrainerHikerJim:
  9189.     trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, $0000, HikerJimScript
  9190.  
  9191.  HikerJimScript:
  9192.     talkaftercancel
  9193. @@ -17,7 +17,7 @@ HikerJimScript:
  9194.     end
  9195.  
  9196.  TrainerPokefanmRobert:
  9197.     trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, $0000, PokefanmRobertScript
  9198.  
  9199.  PokefanmRobertScript:
  9200.     talkaftercancel
  9201. @@ -88,5 +88,5 @@ Route10South_MapEventHeader:
  9202.  
  9203.  .PersonEvents:
  9204.     db 2
  9205. -   person_event SPRITE_POKEFAN_M, 3, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerJim, -1
  9206. -   person_event SPRITE_POKEFAN_M, 10, 8, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmRobert, -1
  9207. +   person_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerJim, -1
  9208. +   person_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmRobert, -1
  9209. diff --git a/maps/Route11.asm b/maps/Route11.asm
  9210. index c3ee336..ad0965b 100644
  9211. --- a/maps/Route11.asm
  9212. +++ b/maps/Route11.asm
  9213. @@ -6,7 +6,7 @@ Route11_MapScriptHeader:
  9214.     db 0
  9215.  
  9216.  TrainerYoungsterOwen:
  9217.     trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, $0000, YoungsterOwenScript
  9218.  
  9219.  YoungsterOwenScript:
  9220.     talkaftercancel
  9221. @@ -17,7 +17,7 @@ YoungsterOwenScript:
  9222.     end
  9223.  
  9224.  TrainerYoungsterJason:
  9225.     trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, $0000, YoungsterJasonScript
  9226.  
  9227.  YoungsterJasonScript:
  9228.     talkaftercancel
  9229. @@ -28,7 +28,7 @@ YoungsterJasonScript:
  9230.     end
  9231.  
  9232.  TrainerPsychicHerman:
  9233.     trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, $0000, PsychicHermanScript
  9234.  
  9235.  PsychicHermanScript:
  9236.     talkaftercancel
  9237. @@ -39,7 +39,7 @@ PsychicHermanScript:
  9238.     end
  9239.  
  9240.  TrainerPsychicFidel:
  9241.     trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, $0000, PsychicFidelScript
  9242.  
  9243.  PsychicFidelScript:
  9244.     talkaftercancel
  9245. @@ -156,8 +156,8 @@ Route11_MapEventHeader:
  9246.  
  9247.  .PersonEvents:
  9248.     db 5
  9249. -   person_event SPRITE_YOUNGSTER, 14, 22, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterOwen, -1
  9250. -   person_event SPRITE_YOUNGSTER, 4, 20, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterJason, -1
  9251. -   person_event SPRITE_YOUNGSTER, 7, 28, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicHerman, -1
  9252. -   person_event SPRITE_YOUNGSTER, 6, 8, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicFidel, -1
  9253. -   person_event SPRITE_FRUIT_TREE, 2, 32, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x68055, -1
  9254. +   person_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterOwen, -1
  9255. +   person_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterJason, -1
  9256. +   person_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicHerman, -1
  9257. +   person_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicFidel, -1
  9258. +   person_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x68055, -1
  9259. diff --git a/maps/Route12.asm b/maps/Route12.asm
  9260. index 8b7ebe9..6fd879a 100644
  9261. --- a/maps/Route12.asm
  9262. +++ b/maps/Route12.asm
  9263. @@ -6,7 +6,7 @@ Route12_MapScriptHeader:
  9264.     db 0
  9265.  
  9266.  TrainerFisherKyle:
  9267.     trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, $0000, FisherKyleScript
  9268.  
  9269.  FisherKyleScript:
  9270.     talkaftercancel
  9271. @@ -17,7 +17,7 @@ FisherKyleScript:
  9272.     end
  9273.  
  9274.  TrainerFisherMartin:
  9275.     trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, $0000, FisherMartinScript
  9276.  
  9277.  FisherMartinScript:
  9278.     talkaftercancel
  9279. @@ -28,7 +28,7 @@ FisherMartinScript:
  9280.     end
  9281.  
  9282.  TrainerFisherStephen:
  9283.     trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, $0000, FisherStephenScript
  9284.  
  9285.  FisherStephenScript:
  9286.     talkaftercancel
  9287. @@ -39,7 +39,7 @@ FisherStephenScript:
  9288.     end
  9289.  
  9290.  TrainerFisherBarney:
  9291.     trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, $0000, FisherBarneyScript
  9292.  
  9293.  FisherBarneyScript:
  9294.     talkaftercancel
  9295. @@ -178,9 +178,9 @@ Route12_MapEventHeader:
  9296.  
  9297.  .PersonEvents:
  9298.     db 6
  9299. -   person_event SPRITE_FISHER, 13, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherMartin, -1
  9300. -   person_event SPRITE_FISHER, 23, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherStephen, -1
  9301. -   person_event SPRITE_FISHER, 38, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerFisherBarney, -1
  9302. -   person_event SPRITE_FISHER, 7, 6, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherKyle, -1
  9303. -   person_event SPRITE_POKE_BALL, 43, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM
  9304. -   person_event SPRITE_POKE_BALL, 51, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET
  9305. +   person_event SPRITE_FISHER, 13, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherMartin, -1
  9306. +   person_event SPRITE_FISHER, 23, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherStephen, -1
  9307. +   person_event SPRITE_FISHER, 38, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerFisherBarney, -1
  9308. +   person_event SPRITE_FISHER, 7, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherKyle, -1
  9309. +   person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM
  9310. +   person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET
  9311. diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
  9312. index bc4376e..ba25ab1 100644
  9313. --- a/maps/Route12SuperRodHouse.asm
  9314. +++ b/maps/Route12SuperRodHouse.asm
  9315. @@ -93,4 +93,4 @@ Route12SuperRodHouse_MapEventHeader:
  9316.  
  9317.  .PersonEvents:
  9318.     db 1
  9319. -   person_event SPRITE_FISHING_GURU, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x7f484, -1
  9320. +   person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x7f484, -1
  9321. diff --git a/maps/Route13.asm b/maps/Route13.asm
  9322. index 6314a69..1ddb39f 100644
  9323. --- a/maps/Route13.asm
  9324. +++ b/maps/Route13.asm
  9325. @@ -6,7 +6,7 @@ Route13_MapScriptHeader:
  9326.     db 0
  9327.  
  9328.  TrainerPokefanmAlex:
  9329.     trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, $0000, PokefanmAlexScript
  9330.  
  9331.  PokefanmAlexScript:
  9332.     talkaftercancel
  9333. @@ -17,7 +17,7 @@ PokefanmAlexScript:
  9334.     end
  9335.  
  9336.  TrainerPokefanmJoshua:
  9337.     trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, $0000, PokefanmJoshuaScript
  9338.  
  9339.  PokefanmJoshuaScript:
  9340.     talkaftercancel
  9341. @@ -28,7 +28,7 @@ PokefanmJoshuaScript:
  9342.     end
  9343.  
  9344.  TrainerBird_keeperPerry:
  9345.     trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, $0000, Bird_keeperPerryScript
  9346.  
  9347.  Bird_keeperPerryScript:
  9348.     talkaftercancel
  9349. @@ -39,7 +39,7 @@ Bird_keeperPerryScript:
  9350.     end
  9351.  
  9352.  TrainerBird_keeperBret:
  9353.     trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, $0000, Bird_keeperBretScript
  9354.  
  9355.  Bird_keeperBretScript:
  9356.     talkaftercancel
  9357. @@ -50,7 +50,7 @@ Bird_keeperBretScript:
  9358.     end
  9359.  
  9360.  TrainerHikerKenny:
  9361.     trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, $0000, HikerKennyScript
  9362.  
  9363.  HikerKennyScript:
  9364.     talkaftercancel
  9365. @@ -204,8 +204,8 @@ Route13_MapEventHeader:
  9366.  
  9367.  .PersonEvents:
  9368.     db 5
  9369. -   person_event SPRITE_YOUNGSTER, 6, 42, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBird_keeperPerry, -1
  9370. -   person_event SPRITE_YOUNGSTER, 6, 43, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBird_keeperBret, -1
  9371. -   person_event SPRITE_POKEFAN_M, 8, 32, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmJoshua, -1
  9372. -   person_event SPRITE_POKEFAN_M, 10, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerHikerKenny, -1
  9373. -   person_event SPRITE_POKEFAN_M, 6, 25, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanmAlex, -1
  9374. +   person_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBird_keeperPerry, -1
  9375. +   person_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBird_keeperBret, -1
  9376. +   person_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmJoshua, -1
  9377. +   person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerHikerKenny, -1
  9378. +   person_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanmAlex, -1
  9379. diff --git a/maps/Route14.asm b/maps/Route14.asm
  9380. index 0884356..7c34fc2 100644
  9381. --- a/maps/Route14.asm
  9382. +++ b/maps/Route14.asm
  9383. @@ -14,7 +14,7 @@ TeacherScript_0x1ad47f:
  9384.     end
  9385.  
  9386.  TrainerPokefanmCarter:
  9387.     trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, $0000, PokefanmCarterScript
  9388.  
  9389.  PokefanmCarterScript:
  9390.     talkaftercancel
  9391. @@ -25,7 +25,7 @@ PokefanmCarterScript:
  9392.     end
  9393.  
  9394.  TrainerBird_keeperRoy:
  9395.     trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, $0000, Bird_keeperRoyScript
  9396.  
  9397.  Bird_keeperRoyScript:
  9398.     talkaftercancel
  9399. @@ -36,7 +36,7 @@ Bird_keeperRoyScript:
  9400.     end
  9401.  
  9402.  TrainerPokefanmTrevor:
  9403.     trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, $0000, PokefanmTrevorScript
  9404.  
  9405.  PokefanmTrevorScript:
  9406.     talkaftercancel
  9407. @@ -124,7 +124,7 @@ Route14_MapEventHeader:
  9408.  
  9409.  .PersonEvents:
  9410.     db 4
  9411. -   person_event SPRITE_POKEFAN_M, 15, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmCarter, -1
  9412. -   person_event SPRITE_YOUNGSTER, 27, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperRoy, -1
  9413. -   person_event SPRITE_POKEFAN_M, 11, 6, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmTrevor, -1
  9414. -   person_event SPRITE_TEACHER, 5, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 4, TeacherScript_0x1ad47f, -1
  9415. +   person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmCarter, -1
  9416. +   person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperRoy, -1
  9417. +   person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmTrevor, -1
  9418. +   person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 4, TeacherScript_0x1ad47f, -1
  9419. diff --git a/maps/Route15.asm b/maps/Route15.asm
  9420. index a5480c8..9432c44 100644
  9421. --- a/maps/Route15.asm
  9422. +++ b/maps/Route15.asm
  9423. @@ -6,7 +6,7 @@ Route15_MapScriptHeader:
  9424.     db 0
  9425.  
  9426.  TrainerTeacherColette:
  9427.     trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, $0000, TeacherColetteScript
  9428.  
  9429.  TeacherColetteScript:
  9430.     talkaftercancel
  9431. @@ -17,7 +17,7 @@ TeacherColetteScript:
  9432.     end
  9433.  
  9434.  TrainerTeacherHillary:
  9435.     trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, $0000, TeacherHillaryScript
  9436.  
  9437.  TeacherHillaryScript:
  9438.     talkaftercancel
  9439. @@ -28,7 +28,7 @@ TeacherHillaryScript:
  9440.     end
  9441.  
  9442.  TrainerSchoolboyKipp:
  9443.     trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, $0000, SchoolboyKippScript
  9444.  
  9445.  SchoolboyKippScript:
  9446.     talkaftercancel
  9447. @@ -39,7 +39,7 @@ SchoolboyKippScript:
  9448.     end
  9449.  
  9450.  TrainerSchoolboyTommy:
  9451.     trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, $0000, SchoolboyTommyScript
  9452.  
  9453.  SchoolboyTommyScript:
  9454.     talkaftercancel
  9455. @@ -50,7 +50,7 @@ SchoolboyTommyScript:
  9456.     end
  9457.  
  9458.  TrainerSchoolboyJohnny:
  9459.     trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, $0000, SchoolboyJohnnyScript
  9460.  
  9461.  SchoolboyJohnnyScript:
  9462.     talkaftercancel
  9463. @@ -61,7 +61,7 @@ SchoolboyJohnnyScript:
  9464.     end
  9465.  
  9466.  TrainerSchoolboyBilly:
  9467.     trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, $0000, SchoolboyBillyScript
  9468.  
  9469.  SchoolboyBillyScript:
  9470.     talkaftercancel
  9471. @@ -210,10 +210,10 @@ Route15_MapEventHeader:
  9472.  
  9473.  .PersonEvents:
  9474.     db 7
  9475. -   person_event SPRITE_YOUNGSTER, 10, 10, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSchoolboyKipp, -1
  9476. -   person_event SPRITE_YOUNGSTER, 13, 15, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyTommy, -1
  9477. -   person_event SPRITE_YOUNGSTER, 10, 33, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyJohnny, -1
  9478. -   person_event SPRITE_YOUNGSTER, 10, 27, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyBilly, -1
  9479. -   person_event SPRITE_TEACHER, 12, 30, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerTeacherColette, -1
  9480. -   person_event SPRITE_TEACHER, 10, 20, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerTeacherHillary, -1
  9481. -   person_event SPRITE_POKE_BALL, 5, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP
  9482. +   person_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSchoolboyKipp, -1
  9483. +   person_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyTommy, -1
  9484. +   person_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyJohnny, -1
  9485. +   person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyBilly, -1
  9486. +   person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerTeacherColette, -1
  9487. +   person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerTeacherHillary, -1
  9488. +   person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP
  9489. diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
  9490. index 2ffb7ee..b13051d 100644
  9491. --- a/maps/Route15FuchsiaGate.asm
  9492. +++ b/maps/Route15FuchsiaGate.asm
  9493. @@ -35,4 +35,4 @@ Route15FuchsiaGate_MapEventHeader:
  9494.  
  9495.  .PersonEvents:
  9496.     db 1
  9497. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19679e, -1
  9498. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19679e, -1
  9499. diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
  9500. index aab16e3..e46b573 100644
  9501. --- a/maps/Route16FuchsiaSpeechHouse.asm
  9502. +++ b/maps/Route16FuchsiaSpeechHouse.asm
  9503. @@ -38,4 +38,4 @@ Route16FuchsiaSpeechHouse_MapEventHeader:
  9504.  
  9505.  .PersonEvents:
  9506.     db 1
  9507. -   person_event SPRITE_SUPER_NERD, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x73373, -1
  9508. +   person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x73373, -1
  9509. diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
  9510. index b2ad14e..e2e860b 100644
  9511. --- a/maps/Route16Gate.asm
  9512. +++ b/maps/Route16Gate.asm
  9513. @@ -3,7 +3,7 @@ Route16Gate_MapScriptHeader:
  9514.     db 1
  9515.  
  9516.     ; triggers
  9517.     dw UnknownScript_0x733e9, $0000
  9518.  
  9519.  .MapCallbacks:
  9520.     db 0
  9521. @@ -80,4 +80,4 @@ Route16Gate_MapEventHeader:
  9522.  
  9523.  .PersonEvents:
  9524.     db 1
  9525. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x733ea, -1
  9526. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x733ea, -1
  9527. diff --git a/maps/Route17.asm b/maps/Route17.asm
  9528. index 6543def..5518d86 100644
  9529. --- a/maps/Route17.asm
  9530. +++ b/maps/Route17.asm
  9531. @@ -15,7 +15,7 @@ UnknownScript_0x1ad0ab:
  9532.     return
  9533.  
  9534.  TrainerBikerCharles:
  9535.     trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, $0000, BikerCharlesScript
  9536.  
  9537.  BikerCharlesScript:
  9538.     talkaftercancel
  9539. @@ -26,7 +26,7 @@ BikerCharlesScript:
  9540.     end
  9541.  
  9542.  TrainerBikerRiley:
  9543.     trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, $0000, BikerRileyScript
  9544.  
  9545.  BikerRileyScript:
  9546.     talkaftercancel
  9547. @@ -37,7 +37,7 @@ BikerRileyScript:
  9548.     end
  9549.  
  9550.  TrainerBikerJoel:
  9551.     trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, $0000, BikerJoelScript
  9552.  
  9553.  BikerJoelScript:
  9554.     talkaftercancel
  9555. @@ -48,7 +48,7 @@ BikerJoelScript:
  9556.     end
  9557.  
  9558.  TrainerBikerGlenn:
  9559.     trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, $0000, BikerGlennScript
  9560.  
  9561.  BikerGlennScript:
  9562.     talkaftercancel
  9563. @@ -150,7 +150,7 @@ Route17_MapEventHeader:
  9564.  
  9565.  .PersonEvents:
  9566.     db 4
  9567. -   person_event SPRITE_BIKER, 17, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerBikerRiley, -1
  9568. -   person_event SPRITE_BIKER, 68, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBikerJoel, -1
  9569. -   person_event SPRITE_BIKER, 53, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBikerGlenn, -1
  9570. -   person_event SPRITE_BIKER, 80, 6, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerBikerCharles, -1
  9571. +   person_event SPRITE_BIKER, 17, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerBikerRiley, -1
  9572. +   person_event SPRITE_BIKER, 68, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBikerJoel, -1
  9573. +   person_event SPRITE_BIKER, 53, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBikerGlenn, -1
  9574. +   person_event SPRITE_BIKER, 80, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerBikerCharles, -1
  9575. diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm
  9576. index c23d76d..7ef82c1 100644
  9577. --- a/maps/Route1718Gate.asm
  9578. +++ b/maps/Route1718Gate.asm
  9579. @@ -3,7 +3,7 @@ Route1718Gate_MapScriptHeader:
  9580.     db 1
  9581.  
  9582.     ; triggers
  9583.     dw UnknownScript_0x7360d, $0000
  9584.  
  9585.  .MapCallbacks:
  9586.     db 0
  9587. @@ -71,4 +71,4 @@ Route1718Gate_MapEventHeader:
  9588.  
  9589.  .PersonEvents:
  9590.     db 1
  9591. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7360e, -1
  9592. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7360e, -1
  9593. diff --git a/maps/Route18.asm b/maps/Route18.asm
  9594. index 00728f8..e895951 100644
  9595. --- a/maps/Route18.asm
  9596. +++ b/maps/Route18.asm
  9597. @@ -6,7 +6,7 @@ Route18_MapScriptHeader:
  9598.     db 0
  9599.  
  9600.  TrainerBird_keeperBoris:
  9601.     trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, $0000, Bird_keeperBorisScript
  9602.  
  9603.  Bird_keeperBorisScript:
  9604.     talkaftercancel
  9605. @@ -17,7 +17,7 @@ Bird_keeperBorisScript:
  9606.     end
  9607.  
  9608.  TrainerBird_keeperBob:
  9609.     trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, $0000, Bird_keeperBobScript
  9610.  
  9611.  Bird_keeperBobScript:
  9612.     talkaftercancel
  9613. @@ -91,5 +91,5 @@ Route18_MapEventHeader:
  9614.  
  9615.  .PersonEvents:
  9616.     db 2
  9617. -   person_event SPRITE_YOUNGSTER, 12, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBoris, -1
  9618. -   person_event SPRITE_YOUNGSTER, 6, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBob, -1
  9619. +   person_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBoris, -1
  9620. +   person_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBob, -1
  9621. diff --git a/maps/Route19.asm b/maps/Route19.asm
  9622. index beb87fd..6c58a16 100644
  9623. --- a/maps/Route19.asm
  9624. +++ b/maps/Route19.asm
  9625. @@ -22,7 +22,7 @@ Route19_MapScriptHeader:
  9626.     return
  9627.  
  9628.  TrainerSwimmerfDawn:
  9629.     trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, $0000, SwimmerfDawnScript
  9630.  
  9631.  SwimmerfDawnScript:
  9632.     talkaftercancel
  9633. @@ -33,7 +33,7 @@ SwimmerfDawnScript:
  9634.     end
  9635.  
  9636.  TrainerSwimmermHarold:
  9637.     trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, $0000, SwimmermHaroldScript
  9638.  
  9639.  SwimmermHaroldScript:
  9640.     talkaftercancel
  9641. @@ -44,7 +44,7 @@ SwimmermHaroldScript:
  9642.     end
  9643.  
  9644.  TrainerSwimmermJerome:
  9645.     trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, $0000, SwimmermJeromeScript
  9646.  
  9647.  SwimmermJeromeScript:
  9648.     talkaftercancel
  9649. @@ -55,7 +55,7 @@ SwimmermJeromeScript:
  9650.     end
  9651.  
  9652.  TrainerSwimmermTucker:
  9653.     trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, $0000, SwimmermTuckerScript
  9654.  
  9655.  SwimmermTuckerScript:
  9656.     talkaftercancel
  9657. @@ -247,9 +247,9 @@ Route19_MapEventHeader:
  9658.  
  9659.  .PersonEvents:
  9660.     db 6
  9661. -   person_event SPRITE_SWIMMER_GIRL, 23, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerSwimmerfDawn, -1
  9662. -   person_event SPRITE_SWIMMER_GUY, 28, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermHarold, -1
  9663. -   person_event SPRITE_SWIMMER_GUY, 17, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermJerome, -1
  9664. -   person_event SPRITE_SWIMMER_GUY, 23, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerSwimmermTucker, -1
  9665. -   person_event SPRITE_FISHER, 5, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 1, FisherScript_0x19ea4d, -1
  9666. -   person_event SPRITE_FISHER, 5, 11, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, FisherScript_0x19ea61, -1
  9667. +   person_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerSwimmerfDawn, -1
  9668. +   person_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermHarold, -1
  9669. +   person_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermJerome, -1
  9670. +   person_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerSwimmermTucker, -1
  9671. +   person_event SPRITE_FISHER, 5, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 1, FisherScript_0x19ea4d, -1
  9672. +   person_event SPRITE_FISHER, 5, 11, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, FisherScript_0x19ea61, -1
  9673. diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
  9674. index 1036a5f..87b4397 100644
  9675. --- a/maps/Route19FuchsiaGate.asm
  9676. +++ b/maps/Route19FuchsiaGate.asm
  9677. @@ -61,4 +61,4 @@ Route19FuchsiaGate_MapEventHeader:
  9678.  
  9679.  .PersonEvents:
  9680.     db 1
  9681. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x1ab3f6, -1
  9682. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x1ab3f6, -1
  9683. diff --git a/maps/Route2.asm b/maps/Route2.asm
  9684. index 79a72bf..96ef0cf 100644
  9685. --- a/maps/Route2.asm
  9686. +++ b/maps/Route2.asm
  9687. @@ -6,7 +6,7 @@ Route2_MapScriptHeader:
  9688.     db 0
  9689.  
  9690.  TrainerBug_catcherRob:
  9691.     trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, $0000, Bug_catcherRobScript
  9692.  
  9693.  Bug_catcherRobScript:
  9694.     talkaftercancel
  9695. @@ -17,7 +17,7 @@ Bug_catcherRobScript:
  9696.     end
  9697.  
  9698.  TrainerBug_catcherEd:
  9699.     trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, $0000, Bug_catcherEdScript
  9700.  
  9701.  Bug_catcherEdScript:
  9702.     talkaftercancel
  9703. @@ -28,7 +28,7 @@ Bug_catcherEdScript:
  9704.     end
  9705.  
  9706.  TrainerBug_catcherDoug:
  9707.     trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, $0000, Bug_catcherDougScript
  9708.  
  9709.  Bug_catcherDougScript:
  9710.     talkaftercancel
  9711. @@ -162,11 +162,11 @@ Route2_MapEventHeader:
  9712.  
  9713.  .PersonEvents:
  9714.     db 8
  9715. -   person_event SPRITE_BUG_CATCHER, 45, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 5, TrainerBug_catcherRob, -1
  9716. -   person_event SPRITE_BUG_CATCHER, 4, 6, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherEd, -1
  9717. -   person_event SPRITE_BUG_CATCHER, 40, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherDoug, -1
  9718. -   person_event SPRITE_POKE_BALL, 29, 0, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT
  9719. -   person_event SPRITE_POKE_BALL, 23, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION
  9720. -   person_event SPRITE_POKE_BALL, 2, 19, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS
  9721. -   person_event SPRITE_POKE_BALL, 50, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER
  9722. -   person_event SPRITE_FRUIT_TREE, 14, 10, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac306, -1
  9723. +   person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 5, TrainerBug_catcherRob, -1
  9724. +   person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherEd, -1
  9725. +   person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherDoug, -1
  9726. +   person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT
  9727. +   person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION
  9728. +   person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS
  9729. +   person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER
  9730. +   person_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac306, -1
  9731. diff --git a/maps/Route20.asm b/maps/Route20.asm
  9732. index e623138..0873c9c 100644
  9733. --- a/maps/Route20.asm
  9734. +++ b/maps/Route20.asm
  9735. @@ -14,7 +14,7 @@ Route20_MapScriptHeader:
  9736.     return
  9737.  
  9738.  TrainerSwimmerfNicole:
  9739.     trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, $0000, SwimmerfNicoleScript
  9740.  
  9741.  SwimmerfNicoleScript:
  9742.     talkaftercancel
  9743. @@ -25,7 +25,7 @@ SwimmerfNicoleScript:
  9744.     end
  9745.  
  9746.  TrainerSwimmerfLori:
  9747.     trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, $0000, SwimmerfLoriScript
  9748.  
  9749.  SwimmerfLoriScript:
  9750.     talkaftercancel
  9751. @@ -36,7 +36,7 @@ SwimmerfLoriScript:
  9752.     end
  9753.  
  9754.  TrainerSwimmermCameron:
  9755.     trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, $0000, SwimmermCameronScript
  9756.  
  9757.  SwimmermCameronScript:
  9758.     talkaftercancel
  9759. @@ -127,6 +127,6 @@ Route20_MapEventHeader:
  9760.  
  9761.  .PersonEvents:
  9762.     db 3
  9763. -   person_event SPRITE_SWIMMER_GIRL, 8, 52, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfNicole, -1
  9764. -   person_event SPRITE_SWIMMER_GIRL, 13, 45, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfLori, -1
  9765. -   person_event SPRITE_SWIMMER_GUY, 13, 12, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermCameron, -1
  9766. +   person_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfNicole, -1
  9767. +   person_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfLori, -1
  9768. +   person_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermCameron, -1
  9769. diff --git a/maps/Route21.asm b/maps/Route21.asm
  9770. index 15dd2d9..a1aeb83 100644
  9771. --- a/maps/Route21.asm
  9772. +++ b/maps/Route21.asm
  9773. @@ -6,7 +6,7 @@ Route21_MapScriptHeader:
  9774.     db 0
  9775.  
  9776.  TrainerSwimmermSeth:
  9777.     trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, $0000, SwimmermSethScript
  9778.  
  9779.  SwimmermSethScript:
  9780.     talkaftercancel
  9781. @@ -17,7 +17,7 @@ SwimmermSethScript:
  9782.     end
  9783.  
  9784.  TrainerSwimmerfNikki:
  9785.     trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, $0000, SwimmerfNikkiScript
  9786.  
  9787.  SwimmerfNikkiScript:
  9788.     talkaftercancel
  9789. @@ -28,7 +28,7 @@ SwimmerfNikkiScript:
  9790.     end
  9791.  
  9792.  TrainerFisherArnold:
  9793.     trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, $0000, FisherArnoldScript
  9794.  
  9795.  FisherArnoldScript:
  9796.     talkaftercancel
  9797. @@ -99,6 +99,6 @@ Route21_MapEventHeader:
  9798.  
  9799.  .PersonEvents:
  9800.     db 3
  9801. -   person_event SPRITE_SWIMMER_GIRL, 16, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfNikki, -1
  9802. -   person_event SPRITE_SWIMMER_GUY, 30, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerSwimmermSeth, -1
  9803. -   person_event SPRITE_FISHER, 22, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherArnold, -1
  9804. +   person_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfNikki, -1
  9805. +   person_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerSwimmermSeth, -1
  9806. +   person_event SPRITE_FISHER, 22, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherArnold, -1
  9807. diff --git a/maps/Route24.asm b/maps/Route24.asm
  9808. index fffc4ca..0a35bce 100644
  9809. --- a/maps/Route24.asm
  9810. +++ b/maps/Route24.asm
  9811. @@ -130,4 +130,4 @@ Route24_MapEventHeader:
  9812.  
  9813.  .PersonEvents:
  9814.     db 1
  9815. -   person_event SPRITE_ROCKET, 7, 8, $3, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
  9816. +   person_event SPRITE_ROCKET, 7, 8, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
  9817. diff --git a/maps/Route25.asm b/maps/Route25.asm
  9818. index 7b3fee4..cea7ecd 100644
  9819. --- a/maps/Route25.asm
  9820. +++ b/maps/Route25.asm
  9821. @@ -3,8 +3,8 @@ Route25_MapScriptHeader:
  9822.     db 2
  9823.  
  9824.     ; triggers
  9825.     dw UnknownScript_0x19ee9e, $0000
  9826.     dw UnknownScript_0x19ee9f, $0000
  9827.  
  9828.  .MapCallbacks:
  9829.     db 0
  9830. @@ -68,7 +68,7 @@ UnknownScript_0x19eee0:
  9831.     end
  9832.  
  9833.  TrainerSchoolboyDudley:
  9834.     trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, $0000, SchoolboyDudleyScript
  9835.  
  9836.  SchoolboyDudleyScript:
  9837.     talkaftercancel
  9838. @@ -79,7 +79,7 @@ SchoolboyDudleyScript:
  9839.     end
  9840.  
  9841.  TrainerLassEllen:
  9842.     trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, $0000, LassEllenScript
  9843.  
  9844.  LassEllenScript:
  9845.     talkaftercancel
  9846. @@ -90,7 +90,7 @@ LassEllenScript:
  9847.     end
  9848.  
  9849.  TrainerSchoolboyJoe:
  9850.     trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, $0000, SchoolboyJoeScript
  9851.  
  9852.  SchoolboyJoeScript:
  9853.     talkaftercancel
  9854. @@ -101,7 +101,7 @@ SchoolboyJoeScript:
  9855.     end
  9856.  
  9857.  TrainerLassLaura:
  9858.     trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, $0000, LassLauraScript
  9859.  
  9860.  LassLauraScript:
  9861.     talkaftercancel
  9862. @@ -112,7 +112,7 @@ LassLauraScript:
  9863.     end
  9864.  
  9865.  TrainerCamperLloyd:
  9866.     trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, $0000, CamperLloydScript
  9867.  
  9868.  CamperLloydScript:
  9869.     talkaftercancel
  9870. @@ -123,7 +123,7 @@ CamperLloydScript:
  9871.     end
  9872.  
  9873.  TrainerLassShannon:
  9874.     trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, $0000, LassShannonScript
  9875.  
  9876.  LassShannonScript:
  9877.     talkaftercancel
  9878. @@ -134,7 +134,7 @@ LassShannonScript:
  9879.     end
  9880.  
  9881.  TrainerSupernerdPat:
  9882.     trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, $0000, SupernerdPatScript
  9883.  
  9884.  SupernerdPatScript:
  9885.     talkaftercancel
  9886. @@ -160,7 +160,7 @@ UnknownScript_0x19efc7:
  9887.     writetext UnknownText_0x19f49d
  9888.     closetext
  9889.     loadmovesprites
  9890.     winlosstext UnknownText_0x19f4fd, $0000
  9891.     loadtrainer COOLTRAINERM, KEVIN
  9892.     startbattle
  9893.     returnafterbattle
  9894. @@ -439,14 +439,14 @@ Route25_MapEventHeader:
  9895.  
  9896.  .PersonEvents:
  9897.     db 11
  9898. -   person_event SPRITE_MISTY, 9, 46, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
  9899. -   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
  9900. -   person_event SPRITE_YOUNGSTER, 8, 12, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyDudley, -1
  9901. -   person_event SPRITE_LASS, 11, 16, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassEllen, -1
  9902. -   person_event SPRITE_YOUNGSTER, 8, 21, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyJoe, -1
  9903. -   person_event SPRITE_LASS, 6, 22, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassLaura, -1
  9904. -   person_event SPRITE_YOUNGSTER, 4, 25, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperLloyd, -1
  9905. -   person_event SPRITE_LASS, 11, 28, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassShannon, -1
  9906. -   person_event SPRITE_SUPER_NERD, 7, 31, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerSupernerdPat, -1
  9907. -   person_event SPRITE_COOLTRAINER_M, 8, 37, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x19efac, -1
  9908. -   person_event SPRITE_POKE_BALL, 4, 32, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN
  9909. +   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
  9910. +   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
  9911. +   person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSchoolboyDudley, -1
  9912. +   person_event SPRITE_LASS, 11, 16, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassEllen, -1
  9913. +   person_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyJoe, -1
  9914. +   person_event SPRITE_LASS, 6, 22, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerLassLaura, -1
  9915. +   person_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperLloyd, -1
  9916. +   person_event SPRITE_LASS, 11, 28, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerLassShannon, -1
  9917. +   person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerSupernerdPat, -1
  9918. +   person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x19efac, -1
  9919. +   person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN
  9920. diff --git a/maps/Route26.asm b/maps/Route26.asm
  9921. index 8feb734..fb08ce3 100644
  9922. --- a/maps/Route26.asm
  9923. +++ b/maps/Route26.asm
  9924. @@ -6,7 +6,7 @@ Route26_MapScriptHeader:
  9925.     db 0
  9926.  
  9927.  TrainerCooltrainermJake:
  9928.     trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, $0000, CooltrainermJakeScript
  9929.  
  9930.  CooltrainermJakeScript:
  9931.     talkaftercancel
  9932. @@ -17,7 +17,7 @@ CooltrainermJakeScript:
  9933.     end
  9934.  
  9935.  TrainerCooltrainermGaven3:
  9936.     trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, $0000, CooltrainermGaven3Script
  9937.  
  9938.  CooltrainermGaven3Script:
  9939.     writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
  9940. @@ -47,7 +47,7 @@ UnknownScript_0x1a4d65:
  9941.  
  9942.  UnknownScript_0x1a4d79:
  9943.     scall UnknownScript_0x1a4dd7
  9944.     winlosstext CooltrainermGaven3BeatenText, $0000
  9945.     copybytetovar wGavenFightCount
  9946.     if_equal 2, .Fight2
  9947.     if_equal 1, .Fight1
  9948. @@ -110,7 +110,7 @@ UnknownScript_0x1a4dd7:
  9949.     end
  9950.  
  9951.  TrainerCooltrainerfJoyce:
  9952.     trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, $0000, CooltrainerfJoyceScript
  9953.  
  9954.  CooltrainerfJoyceScript:
  9955.     talkaftercancel
  9956. @@ -121,7 +121,7 @@ CooltrainerfJoyceScript:
  9957.     end
  9958.  
  9959.  TrainerCooltrainerfBeth1:
  9960.     trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, $0000, CooltrainerfBeth1Script
  9961.  
  9962.  CooltrainerfBeth1Script:
  9963.     writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH
  9964. @@ -151,7 +151,7 @@ UnknownScript_0x1a4e21:
  9965.  
  9966.  UnknownScript_0x1a4e35:
  9967.     scall UnknownScript_0x1a4e93
  9968.     winlosstext CooltrainerfBeth1BeatenText, $0000
  9969.     copybytetovar wBethFightCount
  9970.     if_equal 2, .Fight2
  9971.     if_equal 1, .Fight1
  9972. @@ -214,7 +214,7 @@ UnknownScript_0x1a4e93:
  9973.     end
  9974.  
  9975.  TrainerPsychicRichard:
  9976.     trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, $0000, PsychicRichardScript
  9977.  
  9978.  PsychicRichardScript:
  9979.     talkaftercancel
  9980. @@ -225,7 +225,7 @@ PsychicRichardScript:
  9981.     end
  9982.  
  9983.  TrainerFisherScott:
  9984.     trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, $0000, FisherScottScript
  9985.  
  9986.  FisherScottScript:
  9987.     talkaftercancel
  9988. @@ -421,11 +421,11 @@ Route26_MapEventHeader:
  9989.  
  9990.  .PersonEvents:
  9991.     db 8
  9992. -   person_event SPRITE_COOLTRAINER_M, 24, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainermJake, -1
  9993. -   person_event SPRITE_COOLTRAINER_M, 38, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermGaven3, -1
  9994. -   person_event SPRITE_COOLTRAINER_F, 56, 10, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfJoyce, -1
  9995. -   person_event SPRITE_COOLTRAINER_F, 8, 5, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainerfBeth1, -1
  9996. -   person_event SPRITE_YOUNGSTER, 79, 13, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPsychicRichard, -1
  9997. -   person_event SPRITE_FISHER, 92, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherScott, -1
  9998. -   person_event SPRITE_FRUIT_TREE, 54, 14, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a4ec2, -1
  9999. -   person_event SPRITE_POKE_BALL, 15, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER
  10000. +   person_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainermJake, -1
  10001. +   person_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermGaven3, -1
  10002. +   person_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfJoyce, -1
  10003. +   person_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainerfBeth1, -1
  10004. +   person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPsychicRichard, -1
  10005. +   person_event SPRITE_FISHER, 92, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherScott, -1
  10006. +   person_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a4ec2, -1
  10007. +   person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER
  10008. diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm
  10009. index b0a8a1c..98ff25f 100644
  10010. --- a/maps/Route26DayofWeekSiblingsHouse.asm
  10011. +++ b/maps/Route26DayofWeekSiblingsHouse.asm
  10012. @@ -84,4 +84,4 @@ Route26DayofWeekSiblingsHouse_MapEventHeader:
  10013.  
  10014.  .PersonEvents:
  10015.     db 1
  10016. -   person_event SPRITE_POKEDEX, 3, 3, $1, 0, 0, -1, -1, 0, 0, 0, PokedexScript_0x7b1e4, -1
  10017. +   person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, PokedexScript_0x7b1e4, -1
  10018. diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm
  10019. index 44e3e90..be50228 100644
  10020. --- a/maps/Route26HealSpeechHouse.asm
  10021. +++ b/maps/Route26HealSpeechHouse.asm
  10022. @@ -64,4 +64,4 @@ Route26HealSpeechHouse_MapEventHeader:
  10023.  
  10024.  .PersonEvents:
  10025.     db 1
  10026. -   person_event SPRITE_TEACHER, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7b125, -1
  10027. +   person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7b125, -1
  10028. diff --git a/maps/Route27.asm b/maps/Route27.asm
  10029. index 3a3d871..1a4d81e 100644
  10030. --- a/maps/Route27.asm
  10031. +++ b/maps/Route27.asm
  10032. @@ -3,8 +3,8 @@ Route27_MapScriptHeader:
  10033.     db 2
  10034.  
  10035.     ; triggers
  10036.     dw UnknownScript_0x1a0871, $0000
  10037.     dw UnknownScript_0x1a0872, $0000
  10038.  
  10039.  .MapCallbacks:
  10040.     db 0
  10041. @@ -40,7 +40,7 @@ FisherScript_0x1a089c:
  10042.     jumptextfaceplayer UnknownText_0x1a0a71
  10043.  
  10044.  TrainerPsychicGilbert:
  10045.     trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, $0000, PsychicGilbertScript
  10046.  
  10047.  PsychicGilbertScript:
  10048.     talkaftercancel
  10049. @@ -51,7 +51,7 @@ PsychicGilbertScript:
  10050.     end
  10051.  
  10052.  TrainerBird_keeperJose2:
  10053.     trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, $0000, Bird_keeperJose2Script
  10054.  
  10055.  Bird_keeperJose2Script:
  10056.     writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
  10057. @@ -83,7 +83,7 @@ UnknownScript_0x1a08eb:
  10058.  
  10059.  UnknownScript_0x1a08ff:
  10060.     scall UnknownScript_0x1a096f
  10061.     winlosstext Bird_keeperJose2BeatenText, $0000
  10062.     copybytetovar wJoseFightCount
  10063.     if_equal 2, .Fight2
  10064.     if_equal 1, .Fight1
  10065. @@ -164,7 +164,7 @@ UnknownScript_0x1a0977:
  10066.     end
  10067.  
  10068.  TrainerCooltrainermBlake:
  10069.     trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, $0000, CooltrainermBlakeScript
  10070.  
  10071.  CooltrainermBlakeScript:
  10072.     talkaftercancel
  10073. @@ -175,7 +175,7 @@ CooltrainermBlakeScript:
  10074.     end
  10075.  
  10076.  TrainerCooltrainermBrian:
  10077.     trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, $0000, CooltrainermBrianScript
  10078.  
  10079.  CooltrainermBrianScript:
  10080.     talkaftercancel
  10081. @@ -186,7 +186,7 @@ CooltrainermBrianScript:
  10082.     end
  10083.  
  10084.  TrainerCooltrainerfReena:
  10085.     trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, $0000, CooltrainerfReena1Script
  10086.  
  10087.  CooltrainerfReena1Script:
  10088.     writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA
  10089. @@ -216,7 +216,7 @@ UnknownScript_0x1a09d5:
  10090.  
  10091.  UnknownScript_0x1a09e9:
  10092.     scall UnknownScript_0x1a0a47
  10093.     winlosstext CooltrainerfReena1BeatenText, $0000
  10094.     copybytetovar wReenaFightCount
  10095.     if_equal 2, .Fight2
  10096.     if_equal 1, .Fight1
  10097. @@ -279,7 +279,7 @@ UnknownScript_0x1a0a47:
  10098.     end
  10099.  
  10100.  TrainerCooltrainerfMegan:
  10101.     trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, $0000, CooltrainerfMeganScript
  10102.  
  10103.  CooltrainerfMeganScript:
  10104.     talkaftercancel
  10105. @@ -479,12 +479,12 @@ Route27_MapEventHeader:
  10106.  
  10107.  .PersonEvents:
  10108.     db 9
  10109. -   person_event SPRITE_COOLTRAINER_M, 7, 48, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermBlake, -1
  10110. -   person_event SPRITE_COOLTRAINER_M, 6, 58, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermBrian, -1
  10111. -   person_event SPRITE_COOLTRAINER_F, 10, 72, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainerfReena, -1
  10112. -   person_event SPRITE_COOLTRAINER_F, 6, 37, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfMegan, -1
  10113. -   person_event SPRITE_YOUNGSTER, 7, 65, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicGilbert, -1
  10114. -   person_event SPRITE_YOUNGSTER, 13, 58, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperJose2, -1
  10115. -   person_event SPRITE_POKE_BALL, 12, 60, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM
  10116. -   person_event SPRITE_POKE_BALL, 12, 53, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY
  10117. -   person_event SPRITE_FISHER, 10, 21, $3, 0, 0, -1, -1, 0, 0, 3, FisherScript_0x1a089c, -1
  10118. +   person_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermBlake, -1
  10119. +   person_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermBrian, -1
  10120. +   person_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainerfReena, -1
  10121. +   person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfMegan, -1
  10122. +   person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicGilbert, -1
  10123. +   person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperJose2, -1
  10124. +   person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM
  10125. +   person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY
  10126. +   person_event SPRITE_FISHER, 10, 21, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 3, FisherScript_0x1a089c, -1
  10127. diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
  10128. index 9737ae9..4a837aa 100644
  10129. --- a/maps/Route27SandstormHouse.asm
  10130. +++ b/maps/Route27SandstormHouse.asm
  10131. @@ -109,4 +109,4 @@ Route27SandstormHouse_MapEventHeader:
  10132.  
  10133.  .PersonEvents:
  10134.     db 1
  10135. -   person_event SPRITE_GRANNY, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, SandstormHouseWoman, -1
  10136. +   person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SandstormHouseWoman, -1
  10137. diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm
  10138. index a0f474b..ae7c41b 100644
  10139. --- a/maps/Route28FamousSpeechHouse.asm
  10140. +++ b/maps/Route28FamousSpeechHouse.asm
  10141. @@ -3,7 +3,7 @@ Route28FamousSpeechHouse_MapScriptHeader:
  10142.     db 1
  10143.  
  10144.     ; triggers
  10145.     dw .Trigger, $0000
  10146.  
  10147.  .MapCallbacks:
  10148.     db 0
  10149. @@ -87,5 +87,5 @@ Route28FamousSpeechHouse_MapEventHeader:
  10150.  
  10151.  .PersonEvents:
  10152.     db 2
  10153. -   person_event SPRITE_COOLTRAINER_F, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Celebrity, -1
  10154. -   person_event SPRITE_MOLTRES, 5, 6, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CelebritysFearow, -1
  10155. +   person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Celebrity, -1
  10156. +   person_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CelebritysFearow, -1
  10157. diff --git a/maps/Route29.asm b/maps/Route29.asm
  10158. index 0fa4f76..f8456b5 100644
  10159. --- a/maps/Route29.asm
  10160. +++ b/maps/Route29.asm
  10161. @@ -3,8 +3,8 @@ Route29_MapScriptHeader:
  10162.     db 2
  10163.  
  10164.     ; triggers
  10165.     dw UnknownScript_0x1a0f59, $0000
  10166.     dw UnknownScript_0x1a0f5a, $0000
  10167.  
  10168.  .MapCallbacks:
  10169.     db 1
  10170. @@ -430,11 +430,11 @@ Route29_MapEventHeader:
  10171.  
  10172.  .PersonEvents:
  10173.     db 8
  10174. -   person_event SPRITE_COOLTRAINER_M, 12, 50, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x1a0ff1, -1
  10175. -   person_event SPRITE_YOUNGSTER, 16, 27, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a1028, -1
  10176. -   person_event SPRITE_TEACHER, 11, 15, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a102b, -1
  10177. -   person_event SPRITE_FRUIT_TREE, 2, 12, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a1089, -1
  10178. -   person_event SPRITE_FISHER, 3, 25, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x1a102e, -1
  10179. -   person_event SPRITE_COOLTRAINER_M, 4, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x1a1031, -1
  10180. -   person_event SPRITE_TEACHER, 12, 29, $3, 0, 0, -1, -1, 0, 0, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
  10181. -   person_event SPRITE_POKE_BALL, 2, 48, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION
  10182. +   person_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x1a0ff1, -1
  10183. +   person_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a1028, -1
  10184. +   person_event SPRITE_TEACHER, 11, 15, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a102b, -1
  10185. +   person_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a1089, -1
  10186. +   person_event SPRITE_FISHER, 3, 25, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x1a102e, -1
  10187. +   person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x1a1031, -1
  10188. +   person_event SPRITE_TEACHER, 12, 29, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
  10189. +   person_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION
  10190. diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm
  10191. index 513e8f2..c138a0b 100644
  10192. --- a/maps/Route2946Gate.asm
  10193. +++ b/maps/Route2946Gate.asm
  10194. @@ -51,5 +51,5 @@ Route2946Gate_MapEventHeader:
  10195.  
  10196.  .PersonEvents:
  10197.     db 2
  10198. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x7b5bb, -1
  10199. -   person_event SPRITE_YOUNGSTER, 4, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x7b5be, -1
  10200. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x7b5bb, -1
  10201. +   person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x7b5be, -1
  10202. diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
  10203. index a49673d..8aa24ef 100644
  10204. --- a/maps/Route2Gate.asm
  10205. +++ b/maps/Route2Gate.asm
  10206. @@ -41,4 +41,4 @@ Route2Gate_MapEventHeader:
  10207.  
  10208.  .PersonEvents:
  10209.     db 1
  10210. -   person_event SPRITE_SCIENTIST, 4, 6, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x9b952, -1
  10211. +   person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x9b952, -1
  10212. diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm
  10213. index 8910846..0c71d08 100644
  10214. --- a/maps/Route2NuggetSpeechHouse.asm
  10215. +++ b/maps/Route2NuggetSpeechHouse.asm
  10216. @@ -66,4 +66,4 @@ Route2NuggetSpeechHouse_MapEventHeader:
  10217.  
  10218.  .PersonEvents:
  10219.     db 1
  10220. -   person_event SPRITE_FISHER, 4, 2, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x9b847, -1
  10221. +   person_event SPRITE_FISHER, 4, 2, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x9b847, -1
  10222. diff --git a/maps/Route3.asm b/maps/Route3.asm
  10223. index 8743543..3feda23 100644
  10224. --- a/maps/Route3.asm
  10225. +++ b/maps/Route3.asm
  10226. @@ -6,7 +6,7 @@ Route3_MapScriptHeader:
  10227.     db 0
  10228.  
  10229.  TrainerFirebreatherOtis:
  10230.     trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, $0000, FirebreatherOtisScript
  10231.  
  10232.  FirebreatherOtisScript:
  10233.     talkaftercancel
  10234. @@ -17,7 +17,7 @@ FirebreatherOtisScript:
  10235.     end
  10236.  
  10237.  TrainerYoungsterWarren:
  10238.     trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, $0000, YoungsterWarrenScript
  10239.  
  10240.  YoungsterWarrenScript:
  10241.     talkaftercancel
  10242. @@ -28,7 +28,7 @@ YoungsterWarrenScript:
  10243.     end
  10244.  
  10245.  TrainerYoungsterJimmy:
  10246.     trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, $0000, YoungsterJimmyScript
  10247.  
  10248.  YoungsterJimmyScript:
  10249.     talkaftercancel
  10250. @@ -39,7 +39,7 @@ YoungsterJimmyScript:
  10251.     end
  10252.  
  10253.  TrainerFirebreatherBurt:
  10254.     trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, $0000, FirebreatherBurtScript
  10255.  
  10256.  FirebreatherBurtScript:
  10257.     talkaftercancel
  10258. @@ -143,7 +143,7 @@ Route3_MapEventHeader:
  10259.  
  10260.  .PersonEvents:
  10261.     db 4
  10262. -   person_event SPRITE_FISHER, 12, 26, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherOtis, -1
  10263. -   person_event SPRITE_YOUNGSTER, 7, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterWarren, -1
  10264. -   person_event SPRITE_YOUNGSTER, 3, 16, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerYoungsterJimmy, -1
  10265. -   person_event SPRITE_FISHER, 5, 49, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerFirebreatherBurt, -1
  10266. +   person_event SPRITE_FISHER, 12, 26, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherOtis, -1
  10267. +   person_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterWarren, -1
  10268. +   person_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerYoungsterJimmy, -1
  10269. +   person_event SPRITE_FISHER, 5, 49, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerFirebreatherBurt, -1
  10270. diff --git a/maps/Route30.asm b/maps/Route30.asm
  10271. index 07667a7..13836a5 100644
  10272. --- a/maps/Route30.asm
  10273. +++ b/maps/Route30.asm
  10274. @@ -26,7 +26,7 @@ YoungsterScript_0x1a1673:
  10275.     end
  10276.  
  10277.  TrainerYoungsterJoey:
  10278.     trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, $0000, YoungsterJoey1Script
  10279.  
  10280.  YoungsterJoey1Script:
  10281.     writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY
  10282. @@ -56,7 +56,7 @@ UnknownScript_0x1a16cc:
  10283.  
  10284.  UnknownScript_0x1a16e0:
  10285.     scall UnknownScript_0x1a179b
  10286.     winlosstext YoungsterJoey1BeatenText, $0000
  10287.     copybytetovar wJoeyFightCount
  10288.     if_equal 4, .Fight4
  10289.     if_equal 3, .Fight3
  10290. @@ -173,7 +173,7 @@ UnknownScript_0x1a17a6:
  10291.     end
  10292.  
  10293.  TrainerYoungsterMikey:
  10294.     trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, $0000, YoungsterMikeyScript
  10295.  
  10296.  YoungsterMikeyScript:
  10297.     talkaftercancel
  10298. @@ -184,7 +184,7 @@ YoungsterMikeyScript:
  10299.     end
  10300.  
  10301.  TrainerBug_catcherDon:
  10302.     trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, $0000, Bug_catcherDonScript
  10303.  
  10304.  Bug_catcherDonScript:
  10305.     talkaftercancel
  10306. @@ -416,14 +416,14 @@ Route30_MapEventHeader:
  10307.  
  10308.  .PersonEvents:
  10309.     db 11
  10310. -   person_event SPRITE_YOUNGSTER, 26, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE
  10311. -   person_event SPRITE_YOUNGSTER, 28, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
  10312. -   person_event SPRITE_YOUNGSTER, 23, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerYoungsterMikey, -1
  10313. -   person_event SPRITE_BUG_CATCHER, 7, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherDon, -1
  10314. -   person_event SPRITE_YOUNGSTER, 30, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a17d2, -1
  10315. -   person_event SPRITE_MONSTER, 24, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
  10316. -   person_event SPRITE_MONSTER, 25, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
  10317. -   person_event SPRITE_FRUIT_TREE, 39, 5, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a17f7, -1
  10318. -   person_event SPRITE_FRUIT_TREE, 5, 11, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a17f9, -1
  10319. -   person_event SPRITE_COOLTRAINER_F, 13, 2, $6, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x1a17e6, -1
  10320. -   person_event SPRITE_POKE_BALL, 35, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE
  10321. +   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
  10322. +   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
  10323. +   person_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerYoungsterMikey, -1
  10324. +   person_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherDon, -1
  10325. +   person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a17d2, -1
  10326. +   person_event SPRITE_MONSTER, 24, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
  10327. +   person_event SPRITE_MONSTER, 25, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
  10328. +   person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a17f7, -1
  10329. +   person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a17f9, -1
  10330. +   person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, CooltrainerFScript_0x1a17e6, -1
  10331. +   person_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE
  10332. diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm
  10333. index 3590efc..56a3604 100644
  10334. --- a/maps/Route30BerrySpeechHouse.asm
  10335. +++ b/maps/Route30BerrySpeechHouse.asm
  10336. @@ -62,4 +62,4 @@ Route30BerrySpeechHouse_MapEventHeader:
  10337.  
  10338.  .PersonEvents:
  10339.     db 1
  10340. -   person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x196d64, -1
  10341. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x196d64, -1
  10342. diff --git a/maps/Route31.asm b/maps/Route31.asm
  10343. index 8328591..9bf820e 100644
  10344. --- a/maps/Route31.asm
  10345. +++ b/maps/Route31.asm
  10346. @@ -19,7 +19,7 @@ UnknownScript_0x1a5443:
  10347.     return
  10348.  
  10349.  TrainerBug_catcherWade1:
  10350.     trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, $0000, Bug_catcherWade1Script
  10351.  
  10352.  Bug_catcherWade1Script:
  10353.     writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE
  10354. @@ -51,7 +51,7 @@ UnknownScript_0x1a547f:
  10355.  
  10356.  UnknownScript_0x1a5493:
  10357.     scall UnknownScript_0x1a5564
  10358.     winlosstext Bug_catcherWade1BeatenText, $0000
  10359.     copybytetovar wWadeFightCount
  10360.     if_equal 4, .Fight4
  10361.     if_equal 3, .Fight3
  10362. @@ -430,10 +430,10 @@ Route31_MapEventHeader:
  10363.  
  10364.  .PersonEvents:
  10365.     db 7
  10366. -   person_event SPRITE_FISHER, 7, 17, $6, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1a5570, -1
  10367. -   person_event SPRITE_YOUNGSTER, 5, 9, $2, 1, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a55ed, -1
  10368. -   person_event SPRITE_BUG_CATCHER, 13, 21, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 5, TrainerBug_catcherWade1, -1
  10369. -   person_event SPRITE_COOLTRAINER_M, 8, 33, $2, 1, 1, -1, -1, 0, 0, 0, CooltrainerMScript_0x1a55f6, -1
  10370. -   person_event SPRITE_FRUIT_TREE, 7, 16, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a55f9, -1
  10371. -   person_event SPRITE_POKE_BALL, 5, 29, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION
  10372. -   person_event SPRITE_POKE_BALL, 15, 19, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL
  10373. +   person_event SPRITE_FISHER, 7, 17, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1a5570, -1
  10374. +   person_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a55ed, -1
  10375. +   person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 5, TrainerBug_catcherWade1, -1
  10376. +   person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, CooltrainerMScript_0x1a55f6, -1
  10377. +   person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a55f9, -1
  10378. +   person_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION
  10379. +   person_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL
  10380. diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
  10381. index 83fd9ed..cf4ccf9 100644
  10382. --- a/maps/Route31VioletGate.asm
  10383. +++ b/maps/Route31VioletGate.asm
  10384. @@ -42,5 +42,5 @@ Route31VioletGate_MapEventHeader:
  10385.  
  10386.  .PersonEvents:
  10387.     db 2
  10388. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x197634, -1
  10389. -   person_event SPRITE_COOLTRAINER_F, 2, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerFScript_0x197637, -1
  10390. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x197634, -1
  10391. +   person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerFScript_0x197637, -1
  10392. diff --git a/maps/Route32.asm b/maps/Route32.asm
  10393. index 9b4bfe5..f988c16 100644
  10394. --- a/maps/Route32.asm
  10395. +++ b/maps/Route32.asm
  10396. @@ -3,9 +3,9 @@ Route32_MapScriptHeader:
  10397.     db 3
  10398.  
  10399.     ; triggers
  10400.     dw UnknownScript_0x190460, $0000
  10401.     dw UnknownScript_0x190461, $0000
  10402.     dw UnknownScript_0x190462, $0000
  10403.  
  10404.  .MapCallbacks:
  10405.     db 1
  10406. @@ -133,7 +133,7 @@ UnknownScript_0x190503:
  10407.     end
  10408.  
  10409.  TrainerCamperRoland:
  10410.     trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, $0000, CamperRolandScript
  10411.  
  10412.  CamperRolandScript:
  10413.     talkaftercancel
  10414. @@ -144,7 +144,7 @@ CamperRolandScript:
  10415.     end
  10416.  
  10417.  TrainerFisherJustin:
  10418.     trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, $0000, FisherJustinScript
  10419.  
  10420.  FisherJustinScript:
  10421.     talkaftercancel
  10422. @@ -155,7 +155,7 @@ FisherJustinScript:
  10423.     end
  10424.  
  10425.  TrainerFisherRalph1:
  10426.     trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, $0000, FisherRalph1Script
  10427.  
  10428.  FisherRalph1Script:
  10429.     writecode VAR_CALLERID, PHONE_FISHER_RALPH
  10430. @@ -187,7 +187,7 @@ UnknownScript_0x190569:
  10431.  
  10432.  UnknownScript_0x19057d:
  10433.     scall UnknownScript_0x19060f
  10434.     winlosstext FisherRalph1BeatenText, $0000
  10435.     copybytetovar wRalphFightCount
  10436.     if_equal 4, .Fight4
  10437.     if_equal 3, .Fight3
  10438. @@ -280,7 +280,7 @@ UnknownScript_0x19060f:
  10439.     end
  10440.  
  10441.  TrainerFisherHenry:
  10442.     trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, $0000, FisherHenryScript
  10443.  
  10444.  FisherHenryScript:
  10445.     talkaftercancel
  10446. @@ -291,7 +291,7 @@ FisherHenryScript:
  10447.     end
  10448.  
  10449.  TrainerPicnickerLiz1:
  10450.     trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, $0000, PicnickerLiz1Script
  10451.  
  10452.  PicnickerLiz1Script:
  10453.     writecode VAR_CALLERID, PHONE_PICNICKER_LIZ
  10454. @@ -321,7 +321,7 @@ UnknownScript_0x190659:
  10455.  
  10456.  UnknownScript_0x19066d:
  10457.     scall UnknownScript_0x1906f9
  10458.     winlosstext PicnickerLiz1BeatenText, $0000
  10459.     copybytetovar wLizFightCount
  10460.     if_equal 4, .Fight4
  10461.     if_equal 3, .Fight3
  10462. @@ -408,7 +408,7 @@ UnknownScript_0x1906f9:
  10463.     end
  10464.  
  10465.  TrainerYoungsterAlbert:
  10466.     trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, $0000, YoungsterAlbertScript
  10467.  
  10468.  YoungsterAlbertScript:
  10469.     talkaftercancel
  10470. @@ -419,7 +419,7 @@ YoungsterAlbertScript:
  10471.     end
  10472.  
  10473.  TrainerYoungsterGordon:
  10474.     trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, $0000, YoungsterGordonScript
  10475.  
  10476.  YoungsterGordonScript:
  10477.     talkaftercancel
  10478. @@ -430,7 +430,7 @@ YoungsterGordonScript:
  10479.     end
  10480.  
  10481.  TrainerBird_keeperPeter:
  10482.     trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, $0000, Bird_keeperPeterScript
  10483.  
  10484.  Bird_keeperPeterScript:
  10485.     talkaftercancel
  10486. @@ -946,17 +946,17 @@ Route32_MapEventHeader:
  10487.  
  10488.  .PersonEvents:
  10489.     db 14
  10490. -   person_event SPRITE_FISHER, 49, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherJustin, -1
  10491. -   person_event SPRITE_FISHER, 56, 12, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherRalph1, -1
  10492. -   person_event SPRITE_FISHER, 48, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherHenry, -1
  10493. -   person_event SPRITE_YOUNGSTER, 22, 12, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterAlbert, -1
  10494. -   person_event SPRITE_YOUNGSTER, 63, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterGordon, -1
  10495. -   person_event SPRITE_YOUNGSTER, 45, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperRoland, -1
  10496. -   person_event SPRITE_LASS, 30, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerLiz1, -1
  10497. -   person_event SPRITE_COOLTRAINER_M, 8, 19, $8, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x19046f, -1
  10498. -   person_event SPRITE_YOUNGSTER, 82, 11, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperPeter, -1
  10499. -   person_event SPRITE_FISHER, 70, 7, $6, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS
  10500. -   person_event SPRITE_POKE_BALL, 53, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x190773, EVENT_ROUTE_32_GREAT_BALL
  10501. -   person_event SPRITE_FISHER, 13, 15, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1904ce, -1
  10502. -   person_event SPRITE_LASS, 67, 12, $8, 0, 0, -1, -1, 0, 0, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
  10503. -   person_event SPRITE_POKE_BALL, 30, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL
  10504. +   person_event SPRITE_FISHER, 49, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherJustin, -1
  10505. +   person_event SPRITE_FISHER, 56, 12, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerFisherRalph1, -1
  10506. +   person_event SPRITE_FISHER, 48, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherHenry, -1
  10507. +   person_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterAlbert, -1
  10508. +   person_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterGordon, -1
  10509. +   person_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperRoland, -1
  10510. +   person_event SPRITE_LASS, 30, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerLiz1, -1
  10511. +   person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x19046f, -1
  10512. +   person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperPeter, -1
  10513. +   person_event SPRITE_FISHER, 70, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS
  10514. +   person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x190773, EVENT_ROUTE_32_GREAT_BALL
  10515. +   person_event SPRITE_FISHER, 13, 15, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1904ce, -1
  10516. +   person_event SPRITE_LASS, 67, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
  10517. +   person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL
  10518. diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm
  10519. index 2ef9c76..bdf99ed 100644
  10520. --- a/maps/Route32PokeCenter1F.asm
  10521. +++ b/maps/Route32PokeCenter1F.asm
  10522. @@ -107,6 +107,6 @@ Route32PokeCenter1F_MapEventHeader:
  10523.  
  10524.  .PersonEvents:
  10525.     db 3
  10526. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x69b52, -1
  10527. -   person_event SPRITE_FISHING_GURU, 4, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x69b55, -1
  10528. -   person_event SPRITE_COOLTRAINER_F, 2, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x69b80, -1
  10529. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x69b52, -1
  10530. +   person_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x69b55, -1
  10531. +   person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x69b80, -1
  10532. diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm
  10533. index 2c48582..c291148 100644
  10534. --- a/maps/Route32RuinsofAlphGate.asm
  10535. +++ b/maps/Route32RuinsofAlphGate.asm
  10536. @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader:
  10537.  
  10538.  .PersonEvents:
  10539.     db 3
  10540. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x69a2d, -1
  10541. -   person_event SPRITE_POKEFAN_M, 2, 8, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x69a30, -1
  10542. -   person_event SPRITE_YOUNGSTER, 6, 1, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x69a33, -1
  10543. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x69a2d, -1
  10544. +   person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x69a30, -1
  10545. +   person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x69a33, -1
  10546. diff --git a/maps/Route33.asm b/maps/Route33.asm
  10547. index e24e1a3..fc44601 100644
  10548. --- a/maps/Route33.asm
  10549. +++ b/maps/Route33.asm
  10550. @@ -9,7 +9,7 @@ LassScript_0x1ac002:
  10551.     jumptextfaceplayer UnknownText_0x1ac1e7
  10552.  
  10553.  TrainerHikerAnthony:
  10554.     trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, $0000, HikerAnthony2Script
  10555.  
  10556.  HikerAnthony2Script:
  10557.     writecode VAR_CALLERID, PHONE_HIKER_ANTHONY
  10558. @@ -41,7 +41,7 @@ UnknownScript_0x1ac03d:
  10559.  
  10560.  UnknownScript_0x1ac051:
  10561.     scall UnknownScript_0x1ac0e3
  10562.     winlosstext HikerAnthony2BeatenText, $0000
  10563.     copybytetovar wAnthonyFightCount
  10564.     if_equal 4, .Fight4
  10565.     if_equal 3, .Fight3
  10566. @@ -206,6 +206,6 @@ Route33_MapEventHeader:
  10567.  
  10568.  .PersonEvents:
  10569.     db 3
  10570. -   person_event SPRITE_POKEFAN_M, 13, 6, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerAnthony, -1
  10571. -   person_event SPRITE_LASS, 16, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1ac002, -1
  10572. -   person_event SPRITE_FRUIT_TREE, 16, 14, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac0ea, -1
  10573. +   person_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerAnthony, -1
  10574. +   person_event SPRITE_LASS, 16, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1ac002, -1
  10575. +   person_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1ac0ea, -1
  10576. diff --git a/maps/Route34.asm b/maps/Route34.asm
  10577. index 7a9bae1..1709734 100644
  10578. --- a/maps/Route34.asm
  10579. +++ b/maps/Route34.asm
  10580. @@ -76,7 +76,7 @@ DaycareMon2Script_0x7806b:
  10581.     end
  10582.  
  10583.  TrainerCamperTodd1:
  10584.     trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, $0000, CamperTodd1Script
  10585.  
  10586.  CamperTodd1Script:
  10587.     writecode VAR_CALLERID, PHONE_CAMPER_TODD
  10588. @@ -108,7 +108,7 @@ UnknownScript_0x780a9:
  10589.  
  10590.  UnknownScript_0x780bd:
  10591.     scall UnknownScript_0x7814f
  10592.     winlosstext CamperTodd1BeatenText, $0000
  10593.     copybytetovar wToddFightCount
  10594.     if_equal 4, .Fight4
  10595.     if_equal 3, .Fight3
  10596. @@ -201,7 +201,7 @@ UnknownScript_0x7814f:
  10597.     end
  10598.  
  10599.  TrainerPicnickerGina1:
  10600.     trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, $0000, PicnickerGina1Script
  10601.  
  10602.  PicnickerGina1Script:
  10603.     writecode VAR_CALLERID, PHONE_PICNICKER_GINA
  10604. @@ -233,7 +233,7 @@ UnknownScript_0x7818b:
  10605.  
  10606.  UnknownScript_0x7819f:
  10607.     scall UnknownScript_0x78240
  10608.     winlosstext PicnickerGina1BeatenText, $0000
  10609.     copybytetovar wGinaFightCount
  10610.     if_equal 4, .Fight4
  10611.     if_equal 3, .Fight3
  10612. @@ -349,7 +349,7 @@ OfficerScript_0x7824c:
  10613.     writetext UnknownText_0x785e4
  10614.     closetext
  10615.     loadmovesprites
  10616.     winlosstext UnknownText_0x78609, $0000
  10617.     loadtrainer OFFICER, KEITH
  10618.     startbattle
  10619.     returnafterbattle
  10620. @@ -370,7 +370,7 @@ UnknownScript_0x78276:
  10621.     end
  10622.  
  10623.  TrainerYoungsterSamuel:
  10624.     trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, $0000, YoungsterSamuelScript
  10625.  
  10626.  YoungsterSamuelScript:
  10627.     talkaftercancel
  10628. @@ -381,7 +381,7 @@ YoungsterSamuelScript:
  10629.     end
  10630.  
  10631.  TrainerYoungsterIan:
  10632.     trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, $0000, YoungsterIanScript
  10633.  
  10634.  YoungsterIanScript:
  10635.     talkaftercancel
  10636. @@ -392,7 +392,7 @@ YoungsterIanScript:
  10637.     end
  10638.  
  10639.  TrainerPokefanmBrandon:
  10640.     trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, $0000, PokefanmBrandonScript
  10641.  
  10642.  PokefanmBrandonScript:
  10643.     talkaftercancel
  10644. @@ -403,7 +403,7 @@ PokefanmBrandonScript:
  10645.     end
  10646.  
  10647.  TrainerCooltrainerfIrene:
  10648.     trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, $0000, CooltrainerfIreneScript
  10649.  
  10650.  CooltrainerfIreneScript:
  10651.     talkaftercancel
  10652. @@ -422,7 +422,7 @@ UnknownScript_0x782d2:
  10653.     end
  10654.  
  10655.  TrainerCooltrainerfJenn:
  10656.     trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, $0000, CooltrainerfJennScript
  10657.  
  10658.  CooltrainerfJennScript:
  10659.     talkaftercancel
  10660. @@ -441,7 +441,7 @@ UnknownScript_0x782f2:
  10661.     end
  10662.  
  10663.  TrainerCooltrainerfKate:
  10664.     trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, $0000, CooltrainerfKateScript
  10665.  
  10666.  CooltrainerfKateScript:
  10667.     talkaftercancel
  10668. @@ -775,16 +775,16 @@ Route34_MapEventHeader:
  10669.  
  10670.  .PersonEvents:
  10671.     db 13
  10672. -   person_event SPRITE_YOUNGSTER, 7, 13, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerCamperTodd1, -1
  10673. -   person_event SPRITE_YOUNGSTER, 32, 15, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterSamuel, -1
  10674. -   person_event SPRITE_YOUNGSTER, 20, 11, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterIan, -1
  10675. -   person_event SPRITE_LASS, 26, 10, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerGina1, -1
  10676. -   person_event SPRITE_OFFICER, 11, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7824c, -1
  10677. -   person_event SPRITE_POKEFAN_M, 28, 18, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmBrandon, -1
  10678. -   person_event SPRITE_GRAMPS, 16, 15, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x7803d, EVENT_DAYCARE_MAN_ON_ROUTE_34
  10679. -   person_event SPRITE_DAYCARE_MON_1, 18, 14, $16, 2, 2, -1, -1, 0, 0, 0, DaycareMon1Script_0x78065, EVENT_DAYCARE_MON_1
  10680. -   person_event SPRITE_DAYCARE_MON_2, 19, 17, $16, 2, 2, -1, -1, 0, 0, 0, DaycareMon2Script_0x7806b, EVENT_DAYCARE_MON_2
  10681. -   person_event SPRITE_COOLTRAINER_F, 48, 11, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainerfIrene, -1
  10682. -   person_event SPRITE_COOLTRAINER_F, 48, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfJenn, -1
  10683. -   person_event SPRITE_COOLTRAINER_F, 51, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfKate, -1
  10684. -   person_event SPRITE_POKE_BALL, 30, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET
  10685. +   person_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerCamperTodd1, -1
  10686. +   person_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterSamuel, -1
  10687. +   person_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerYoungsterIan, -1
  10688. +   person_event SPRITE_LASS, 26, 10, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerGina1, -1
  10689. +   person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7824c, -1
  10690. +   person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerPokefanmBrandon, -1
  10691. +   person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x7803d, EVENT_DAYCARE_MAN_ON_ROUTE_34
  10692. +   person_event SPRITE_DAYCARE_MON_1, 18, 14, SPRITEMOVEFN_16, 2, 2, -1, -1, 0, 0, 0, DaycareMon1Script_0x78065, EVENT_DAYCARE_MON_1
  10693. +   person_event SPRITE_DAYCARE_MON_2, 19, 17, SPRITEMOVEFN_16, 2, 2, -1, -1, 0, 0, 0, DaycareMon2Script_0x7806b, EVENT_DAYCARE_MON_2
  10694. +   person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainerfIrene, -1
  10695. +   person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfJenn, -1
  10696. +   person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerCooltrainerfKate, -1
  10697. +   person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET
  10698. diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
  10699. index 6f6cdd7..26d883b 100644
  10700. --- a/maps/Route34IlexForestGate.asm
  10701. +++ b/maps/Route34IlexForestGate.asm
  10702. @@ -152,7 +152,7 @@ Route34IlexForestGate_MapEventHeader:
  10703.  
  10704.  .PersonEvents:
  10705.     db 4
  10706. -   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
  10707. -   person_event SPRITE_BUTTERFREE, 4, 9, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ButterfreeScript_0x62d8a, -1
  10708. -   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
  10709. -   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
  10710. +   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
  10711. +   person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ButterfreeScript_0x62d8a, -1
  10712. +   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
  10713. +   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
  10714. diff --git a/maps/Route35.asm b/maps/Route35.asm
  10715. index 6d2c677..e4d0f22 100644
  10716. --- a/maps/Route35.asm
  10717. +++ b/maps/Route35.asm
  10718. @@ -6,7 +6,7 @@ Route35_MapScriptHeader:
  10719.     db 0
  10720.  
  10721.  TrainerBird_keeperBryan:
  10722.     trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, $0000, Bird_keeperBryanScript
  10723.  
  10724.  Bird_keeperBryanScript:
  10725.     talkaftercancel
  10726. @@ -17,7 +17,7 @@ Bird_keeperBryanScript:
  10727.     end
  10728.  
  10729.  TrainerJugglerIrwin:
  10730.     trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, $0000, JugglerIrwin1Script
  10731.  
  10732.  JugglerIrwin1Script:
  10733.     writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN
  10734. @@ -72,7 +72,7 @@ UnknownScript_0x19c91b:
  10735.     end
  10736.  
  10737.  TrainerCamperIvan:
  10738.     trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, $0000, CamperIvanScript
  10739.  
  10740.  CamperIvanScript:
  10741.     talkaftercancel
  10742. @@ -83,7 +83,7 @@ CamperIvanScript:
  10743.     end
  10744.  
  10745.  TrainerCamperElliot:
  10746.     trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, $0000, CamperElliotScript
  10747.  
  10748.  CamperElliotScript:
  10749.     talkaftercancel
  10750. @@ -94,7 +94,7 @@ CamperElliotScript:
  10751.     end
  10752.  
  10753.  TrainerPicnickerBrooke:
  10754.     trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, $0000, PicnickerBrookeScript
  10755.  
  10756.  PicnickerBrookeScript:
  10757.     talkaftercancel
  10758. @@ -105,7 +105,7 @@ PicnickerBrookeScript:
  10759.     end
  10760.  
  10761.  TrainerPicnickerKim:
  10762.     trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, $0000, PicnickerKimScript
  10763.  
  10764.  PicnickerKimScript:
  10765.     talkaftercancel
  10766. @@ -116,7 +116,7 @@ PicnickerKimScript:
  10767.     end
  10768.  
  10769.  TrainerBug_catcherArnie1:
  10770.     trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, $0000, Bug_catcherArnie1Script
  10771.  
  10772.  Bug_catcherArnie1Script:
  10773.     writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
  10774. @@ -148,7 +148,7 @@ UnknownScript_0x19c9a7:
  10775.  
  10776.  UnknownScript_0x19c9bb:
  10777.     scall UnknownScript_0x19c91b
  10778.     winlosstext Bug_catcherArnie1BeatenText, $0000
  10779.     copybytetovar wArnieFightCount
  10780.     if_equal 4, .Fight4
  10781.     if_equal 3, .Fight3
  10782. @@ -213,7 +213,7 @@ UnknownScript_0x19ca2f:
  10783.     end
  10784.  
  10785.  TrainerFirebreatherWalt:
  10786.     trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, $0000, FirebreatherWaltScript
  10787.  
  10788.  FirebreatherWaltScript:
  10789.     talkaftercancel
  10790. @@ -234,7 +234,7 @@ OfficerScript_0x19ca49:
  10791.     writetext UnknownText_0x19ceea
  10792.     closetext
  10793.     loadmovesprites
  10794.     winlosstext UnknownText_0x19cf06, $0000
  10795.     loadtrainer OFFICER, DIRK
  10796.     startbattle
  10797.     returnafterbattle
  10798. @@ -469,14 +469,14 @@ Route35_MapEventHeader:
  10799.  
  10800.  .PersonEvents:
  10801.     db 11
  10802. -   person_event SPRITE_YOUNGSTER, 19, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperIvan, -1
  10803. -   person_event SPRITE_YOUNGSTER, 20, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperElliot, -1
  10804. -   person_event SPRITE_LASS, 20, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerBrooke, -1
  10805. -   person_event SPRITE_LASS, 26, 10, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerKim, -1
  10806. -   person_event SPRITE_YOUNGSTER, 28, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerBird_keeperBryan, -1
  10807. -   person_event SPRITE_FISHER, 10, 2, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherWalt, -1
  10808. -   person_event SPRITE_BUG_CATCHER, 7, 16, $6, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherArnie1, -1
  10809. -   person_event SPRITE_SUPER_NERD, 10, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerJugglerIrwin, -1
  10810. -   person_event SPRITE_OFFICER, 6, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19ca49, -1
  10811. -   person_event SPRITE_FRUIT_TREE, 25, 2, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19ca7e, -1
  10812. -   person_event SPRITE_POKE_BALL, 16, 13, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT
  10813. +   person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperIvan, -1
  10814. +   person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperElliot, -1
  10815. +   person_event SPRITE_LASS, 20, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerBrooke, -1
  10816. +   person_event SPRITE_LASS, 26, 10, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerKim, -1
  10817. +   person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerBird_keeperBryan, -1
  10818. +   person_event SPRITE_FISHER, 10, 2, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherWalt, -1
  10819. +   person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEFN_06, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherArnie1, -1
  10820. +   person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerJugglerIrwin, -1
  10821. +   person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19ca49, -1
  10822. +   person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19ca7e, -1
  10823. +   person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT
  10824. diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm
  10825. index 5a0c370..1209e7d 100644
  10826. --- a/maps/Route35Goldenrodgate.asm
  10827. +++ b/maps/Route35Goldenrodgate.asm
  10828. @@ -209,6 +209,6 @@ Route35Goldenrodgate_MapEventHeader:
  10829.  
  10830.  .PersonEvents:
  10831.     db 3
  10832. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x69d37, -1
  10833. -   person_event SPRITE_POKEFAN_F, 4, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x69dc6, -1
  10834. -   person_event SPRITE_FISHER, 2, 3, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x69dda, -1
  10835. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x69d37, -1
  10836. +   person_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x69dc6, -1
  10837. +   person_event SPRITE_FISHER, 2, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x69dda, -1
  10838. diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
  10839. index b631517..41c11f8 100644
  10840. --- a/maps/Route35NationalParkgate.asm
  10841. +++ b/maps/Route35NationalParkgate.asm
  10842. @@ -3,9 +3,9 @@ Route35NationalParkgate_MapScriptHeader:
  10843.     db 3
  10844.  
  10845.     ; triggers
  10846.     dw Route35NationalParkgate_Trigger1, $0000
  10847.     dw Route35NationalParkgate_Trigger2, $0000
  10848.     dw Route35NationalParkgate_Trigger3, $0000
  10849.  
  10850.  .MapCallbacks:
  10851.     db 2
  10852. @@ -458,6 +458,6 @@ Route35NationalParkgate_MapEventHeader:
  10853.  
  10854.  .PersonEvents:
  10855.     db 3
  10856. -   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
  10857. -   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
  10858. -   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
  10859. +   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
  10860. +   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
  10861. +   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
  10862. diff --git a/maps/Route36.asm b/maps/Route36.asm
  10863. index ee24cb6..67ebd82 100644
  10864. --- a/maps/Route36.asm
  10865. +++ b/maps/Route36.asm
  10866. @@ -3,8 +3,8 @@ Route36_MapScriptHeader:
  10867.     db 2
  10868.  
  10869.     ; triggers
  10870.     dw UnknownScript_0x19400d, $0000
  10871.     dw UnknownScript_0x19400e, $0000
  10872.  
  10873.  .MapCallbacks:
  10874.     db 1
  10875. @@ -162,7 +162,7 @@ UnknownScript_0x1940ee:
  10876.     end
  10877.  
  10878.  TrainerSchoolboyAlan1:
  10879.     trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, $0000, SchoolboyAlan1Script
  10880.  
  10881.  SchoolboyAlan1Script:
  10882.     writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
  10883. @@ -194,7 +194,7 @@ UnknownScript_0x19412c:
  10884.  
  10885.  UnknownScript_0x194140:
  10886.     scall UnknownScript_0x1941e1
  10887.     winlosstext SchoolboyAlan1BeatenText, $0000
  10888.     copybytetovar wAlanFightCount
  10889.     if_equal 4, .Fight4
  10890.     if_equal 3, .Fight3
  10891. @@ -300,7 +300,7 @@ UnknownScript_0x1941e9:
  10892.     end
  10893.  
  10894.  TrainerPsychicMark:
  10895.     trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, $0000, PsychicMarkScript
  10896.  
  10897.  PsychicMarkScript:
  10898.     talkaftercancel
  10899. @@ -679,12 +679,12 @@ Route36_MapEventHeader:
  10900.  
  10901.  .PersonEvents:
  10902.     db 9
  10903. -   person_event SPRITE_YOUNGSTER, 13, 20, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicMark, -1
  10904. -   person_event SPRITE_YOUNGSTER, 14, 31, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSchoolboyAlan1, -1
  10905. -   person_event SPRITE_WEIRD_TREE, 9, 35, $17, 0, 0, -1, -1, 0, 0, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO
  10906. -   person_event SPRITE_LASS, 8, 51, $5, 0, 2, -1, -1, 0, 0, 0, LassScript_0x1940e0, -1
  10907. -   person_event SPRITE_FISHER, 9, 44, $8, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1940b9, -1
  10908. -   person_event SPRITE_FRUIT_TREE, 4, 21, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x194247, -1
  10909. -   person_event SPRITE_YOUNGSTER, 6, 46, $2, 1, 1, -1, -1, 0, 0, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
  10910. -   person_event SPRITE_LASS, 12, 33, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO
  10911. -   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
  10912. +   person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicMark, -1
  10913. +   person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSchoolboyAlan1, -1
  10914. +   person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEFN_17, 0, 0, -1, -1, 0, 0, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO
  10915. +   person_event SPRITE_LASS, 8, 51, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, LassScript_0x1940e0, -1
  10916. +   person_event SPRITE_FISHER, 9, 44, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x1940b9, -1
  10917. +   person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x194247, -1
  10918. +   person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
  10919. +   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
  10920. +   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
  10921. diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
  10922. index a157e00..f26e233 100644
  10923. --- a/maps/Route36NationalParkgate.asm
  10924. +++ b/maps/Route36NationalParkgate.asm
  10925. @@ -3,9 +3,9 @@ Route36NationalParkgate_MapScriptHeader:
  10926.     db 3
  10927.  
  10928.     ; triggers
  10929.     dw .Trigger1, $0000
  10930.     dw .Trigger2, $0000
  10931.     dw .Trigger3, $0000
  10932.  
  10933.  .MapCallbacks:
  10934.     db 2
  10935. @@ -862,15 +862,15 @@ Route36NationalParkgate_MapEventHeader:
  10936.  
  10937.  .PersonEvents:
  10938.     db 12
  10939. -   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
  10940. -   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
  10941. -   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
  10942. -   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
  10943. -   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
  10944. -   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
  10945. -   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
  10946. -   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
  10947. -   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
  10948. -   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
  10949. -   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
  10950. -   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
  10951. +   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
  10952. +   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
  10953. +   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
  10954. +   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
  10955. +   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
  10956. +   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
  10957. +   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
  10958. +   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
  10959. +   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
  10960. +   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
  10961. +   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
  10962. +   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
  10963. diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm
  10964. index 7d6dbbd..09e5cce 100644
  10965. --- a/maps/Route36RuinsofAlphgate.asm
  10966. +++ b/maps/Route36RuinsofAlphgate.asm
  10967. @@ -49,5 +49,5 @@ Route36RuinsofAlphgate_MapEventHeader:
  10968.  
  10969.  .PersonEvents:
  10970.     db 2
  10971. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x6aa1a, -1
  10972. -   person_event SPRITE_GRAMPS, 5, 7, $2, 2, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x6aa1d, -1
  10973. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x6aa1a, -1
  10974. +   person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEFN_02, 2, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x6aa1d, -1
  10975. diff --git a/maps/Route37.asm b/maps/Route37.asm
  10976. index a6e49b3..65f08f1 100644
  10977. --- a/maps/Route37.asm
  10978. +++ b/maps/Route37.asm
  10979. @@ -20,7 +20,7 @@ SunnyCallback:
  10980.     return
  10981.  
  10982.  TrainerTwinsAnnandanne1:
  10983.     trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, $0000, TwinsAnnandanne1Script
  10984.  
  10985.  TwinsAnnandanne1Script:
  10986.     talkaftercancel
  10987. @@ -31,7 +31,7 @@ TwinsAnnandanne1Script:
  10988.     end
  10989.  
  10990.  TrainerTwinsAnnandanne2:
  10991.     trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, $0000, TwinsAnnandanne2Script
  10992.  
  10993.  TwinsAnnandanne2Script:
  10994.     talkaftercancel
  10995. @@ -42,7 +42,7 @@ TwinsAnnandanne2Script:
  10996.     end
  10997.  
  10998.  TrainerPsychicGreg:
  10999.     trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, $0000, PsychicGregScript
  11000.  
  11001.  PsychicGregScript:
  11002.     talkaftercancel
  11003. @@ -249,10 +249,10 @@ Route37_MapEventHeader:
  11004.  
  11005.  .PersonEvents:
  11006.     db 7
  11007. -   person_event SPRITE_WEIRD_TREE, 12, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAnnandanne1, -1
  11008. -   person_event SPRITE_WEIRD_TREE, 12, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAnnandanne2, -1
  11009. -   person_event SPRITE_YOUNGSTER, 6, 6, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicGreg, -1
  11010. -   person_event SPRITE_FRUIT_TREE, 5, 13, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e09, -1
  11011. -   person_event SPRITE_BUG_CATCHER, 8, 16, $2, 1, 1, -1, -1, 0, 0, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
  11012. -   person_event SPRITE_FRUIT_TREE, 5, 16, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e0b, -1
  11013. -   person_event SPRITE_FRUIT_TREE, 7, 15, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e0d, -1
  11014. +   person_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAnnandanne1, -1
  11015. +   person_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAnnandanne2, -1
  11016. +   person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicGreg, -1
  11017. +   person_event SPRITE_FRUIT_TREE, 5, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e09, -1
  11018. +   person_event SPRITE_BUG_CATCHER, 8, 16, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
  11019. +   person_event SPRITE_FRUIT_TREE, 5, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e0b, -1
  11020. +   person_event SPRITE_FRUIT_TREE, 7, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8e0d, -1
  11021. diff --git a/maps/Route38.asm b/maps/Route38.asm
  11022. index 4c6ffa6..3f71576 100644
  11023. --- a/maps/Route38.asm
  11024. +++ b/maps/Route38.asm
  11025. @@ -6,7 +6,7 @@ Route38_MapScriptHeader:
  11026.     db 0
  11027.  
  11028.  TrainerBird_keeperToby:
  11029.     trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, $0000, Bird_keeperTobyScript
  11030.  
  11031.  Bird_keeperTobyScript:
  11032.     talkaftercancel
  11033. @@ -17,7 +17,7 @@ Bird_keeperTobyScript:
  11034.     end
  11035.  
  11036.  TrainerSailorHarry:
  11037.     trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, $0000, SailorHarryScript
  11038.  
  11039.  SailorHarryScript:
  11040.     talkaftercancel
  11041. @@ -28,7 +28,7 @@ SailorHarryScript:
  11042.     end
  11043.  
  11044.  TrainerLassDana1:
  11045.     trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, $0000, LassDana1Script
  11046.  
  11047.  LassDana1Script:
  11048.     writecode VAR_CALLERID, PHONE_LASS_DANA
  11049. @@ -60,7 +60,7 @@ UnknownScript_0x1a1d6e:
  11050.  
  11051.  UnknownScript_0x1a1d82:
  11052.     scall UnknownScript_0x1a1e23
  11053.     winlosstext LassDana1BeatenText, $0000
  11054.     copybytetovar wDanaFightCount
  11055.     if_equal 4, .Fight4
  11056.     if_equal 3, .Fight3
  11057. @@ -166,7 +166,7 @@ UnknownScript_0x1a1e2b:
  11058.     end
  11059.  
  11060.  TrainerSchoolboyChad1:
  11061.     trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, $0000, SchoolboyChad1Script
  11062.  
  11063.  SchoolboyChad1Script:
  11064.     writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
  11065. @@ -196,7 +196,7 @@ UnknownScript_0x1a1e61:
  11066.  
  11067.  UnknownScript_0x1a1e75:
  11068.     scall UnknownScript_0x1a1f01
  11069.     winlosstext SchoolboyChad1BeatenText, $0000
  11070.     copybytetovar wChadFightCount
  11071.     if_equal 4, .Fight4
  11072.     if_equal 3, .Fight3
  11073. @@ -283,7 +283,7 @@ UnknownScript_0x1a1f01:
  11074.     end
  11075.  
  11076.  TrainerBeautyValerie:
  11077.     trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, $0000, BeautyValerieScript
  11078.  
  11079.  BeautyValerieScript:
  11080.     talkaftercancel
  11081. @@ -294,7 +294,7 @@ BeautyValerieScript:
  11082.     end
  11083.  
  11084.  TrainerBeautyOlivia:
  11085.     trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, $0000, BeautyOliviaScript
  11086.  
  11087.  BeautyOliviaScript:
  11088.     talkaftercancel
  11089. @@ -482,10 +482,10 @@ Route38_MapEventHeader:
  11090.  
  11091.  .PersonEvents:
  11092.     db 7
  11093. -   person_event SPRITE_STANDING_YOUNGSTER, 1, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyChad1, -1
  11094. -   person_event SPRITE_LASS, 3, 15, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassDana1, -1
  11095. -   person_event SPRITE_STANDING_YOUNGSTER, 15, 12, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBird_keeperToby, -1
  11096. -   person_event SPRITE_BUENA, 9, 19, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBeautyValerie, -1
  11097. -   person_event SPRITE_SAILOR, 5, 24, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerSailorHarry, -1
  11098. -   person_event SPRITE_FRUIT_TREE, 10, 12, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a1f33, -1
  11099. -   person_event SPRITE_BUENA, 8, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBeautyOlivia, -1
  11100. +   person_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerSchoolboyChad1, -1
  11101. +   person_event SPRITE_LASS, 3, 15, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassDana1, -1
  11102. +   person_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBird_keeperToby, -1
  11103. +   person_event SPRITE_BUENA, 9, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBeautyValerie, -1
  11104. +   person_event SPRITE_SAILOR, 5, 24, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerSailorHarry, -1
  11105. +   person_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a1f33, -1
  11106. +   person_event SPRITE_BUENA, 8, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerBeautyOlivia, -1
  11107. diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
  11108. index 1be28e2..01e1028 100644
  11109. --- a/maps/Route38EcruteakGate.asm
  11110. +++ b/maps/Route38EcruteakGate.asm
  11111. @@ -40,4 +40,4 @@ Route38EcruteakGate_MapEventHeader:
  11112.  
  11113.  .PersonEvents:
  11114.     db 1
  11115. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x9cbd7, -1
  11116. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x9cbd7, -1
  11117. diff --git a/maps/Route39.asm b/maps/Route39.asm
  11118. index 2afc322..e526c56 100644
  11119. --- a/maps/Route39.asm
  11120. +++ b/maps/Route39.asm
  11121. @@ -14,7 +14,7 @@ TaurosScript_0x1a5af5:
  11122.     end
  11123.  
  11124.  TrainerPokefanmDerek1:
  11125.     trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, $0000, PokefanmDerek1Script
  11126.  
  11127.  PokefanmDerek1Script:
  11128.     writecode VAR_CALLERID, PHONE_POKEFANM_DEREK
  11129. @@ -93,7 +93,7 @@ UnknownScript_0x1a5b7e:
  11130.     end
  11131.  
  11132.  TrainerPokefanfRuth:
  11133.     trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, $0000, PokefanfRuthScript
  11134.  
  11135.  PokefanfRuthScript:
  11136.     talkaftercancel
  11137. @@ -104,7 +104,7 @@ PokefanfRuthScript:
  11138.     end
  11139.  
  11140.  TrainerSailorEugene:
  11141.     trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, $0000, SailorEugeneScript
  11142.  
  11143.  SailorEugeneScript:
  11144.     talkaftercancel
  11145. @@ -115,7 +115,7 @@ SailorEugeneScript:
  11146.     end
  11147.  
  11148.  TrainerPsychicNorman:
  11149.     trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, $0000, PsychicNormanScript
  11150.  
  11151.  PsychicNormanScript:
  11152.     talkaftercancel
  11153. @@ -135,7 +135,7 @@ PokefanFScript_0x1a5bbe:
  11154.     writetext UnknownText_0x1a5ee8
  11155.     closetext
  11156.     loadmovesprites
  11157.     winlosstext UnknownText_0x1a5f17, $0000
  11158.     loadtrainer POKEFANF, JAIME
  11159.     startbattle
  11160.     returnafterbattle
  11161. @@ -353,13 +353,13 @@ Route39_MapEventHeader:
  11162.  
  11163.  .PersonEvents:
  11164.     db 10
  11165. -   person_event SPRITE_SAILOR, 29, 13, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSailorEugene, -1
  11166. -   person_event SPRITE_POKEFAN_M, 22, 10, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanmDerek1, -1
  11167. -   person_event SPRITE_POKEFAN_F, 19, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanfRuth, -1
  11168. -   person_event SPRITE_TAUROS, 12, 3, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11169. -   person_event SPRITE_TAUROS, 11, 6, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11170. -   person_event SPRITE_TAUROS, 15, 4, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11171. -   person_event SPRITE_TAUROS, 13, 8, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11172. -   person_event SPRITE_STANDING_YOUNGSTER, 7, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicNorman, -1
  11173. -   person_event SPRITE_FRUIT_TREE, 3, 9, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a5bf4, -1
  11174. -   person_event SPRITE_POKEFAN_F, 22, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x1a5bbe, -1
  11175. +   person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSailorEugene, -1
  11176. +   person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanmDerek1, -1
  11177. +   person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerPokefanfRuth, -1
  11178. +   person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11179. +   person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11180. +   person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11181. +   person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x1a5af5, -1
  11182. +   person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 1, TrainerPsychicNorman, -1
  11183. +   person_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a5bf4, -1
  11184. +   person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanFScript_0x1a5bbe, -1
  11185. diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
  11186. index e2420e1..5dd4972 100644
  11187. --- a/maps/Route39Barn.asm
  11188. +++ b/maps/Route39Barn.asm
  11189. @@ -200,6 +200,6 @@ Route39Barn_MapEventHeader:
  11190.  
  11191.  .PersonEvents:
  11192.     db 3
  11193. -   person_event SPRITE_TWIN, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, TwinScript_0x9cc76, -1
  11194. -   person_event SPRITE_TWIN, 3, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x9cc90, -1
  11195. -   person_event SPRITE_TAUROS, 3, 3, $16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x9ccaa, -1
  11196. +   person_event SPRITE_TWIN, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, TwinScript_0x9cc76, -1
  11197. +   person_event SPRITE_TWIN, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x9cc90, -1
  11198. +   person_event SPRITE_TAUROS, 3, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, TaurosScript_0x9ccaa, -1
  11199. diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
  11200. index 16ad6ca..37b1d05 100644
  11201. --- a/maps/Route39Farmhouse.asm
  11202. +++ b/maps/Route39Farmhouse.asm
  11203. @@ -207,5 +207,5 @@ Route39Farmhouse_MapEventHeader:
  11204.  
  11205.  .PersonEvents:
  11206.     db 2
  11207. -   person_event SPRITE_POKEFAN_M, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanMScript_0x9ceb4, -1
  11208. -   person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanFScript_0x9cf0e, -1
  11209. +   person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanMScript_0x9ceb4, -1
  11210. +   person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanFScript_0x9cf0e, -1
  11211. diff --git a/maps/Route4.asm b/maps/Route4.asm
  11212. index d0d8704..00f53e3 100644
  11213. --- a/maps/Route4.asm
  11214. +++ b/maps/Route4.asm
  11215. @@ -6,7 +6,7 @@ Route4_MapScriptHeader:
  11216.     db 0
  11217.  
  11218.  TrainerBird_keeperHank:
  11219.     trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, $0000, Bird_keeperHankScript
  11220.  
  11221.  Bird_keeperHankScript:
  11222.     talkaftercancel
  11223. @@ -17,7 +17,7 @@ Bird_keeperHankScript:
  11224.     end
  11225.  
  11226.  TrainerPicnickerHope:
  11227.     trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, $0000, PicnickerHopeScript
  11228.  
  11229.  PicnickerHopeScript:
  11230.     talkaftercancel
  11231. @@ -28,7 +28,7 @@ PicnickerHopeScript:
  11232.     end
  11233.  
  11234.  TrainerPicnickerSharon:
  11235.     trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, $0000, PicnickerSharonScript
  11236.  
  11237.  PicnickerSharonScript:
  11238.     talkaftercancel
  11239. @@ -133,7 +133,7 @@ Route4_MapEventHeader:
  11240.  
  11241.  .PersonEvents:
  11242.     db 4
  11243. -   person_event SPRITE_YOUNGSTER, 9, 17, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperHank, -1
  11244. -   person_event SPRITE_LASS, 8, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerPicnickerHope, -1
  11245. -   person_event SPRITE_LASS, 6, 21, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerPicnickerSharon, -1
  11246. -   person_event SPRITE_POKE_BALL, 3, 26, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP
  11247. +   person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperHank, -1
  11248. +   person_event SPRITE_LASS, 8, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerPicnickerHope, -1
  11249. +   person_event SPRITE_LASS, 6, 21, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerPicnickerSharon, -1
  11250. +   person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP
  11251. diff --git a/maps/Route40.asm b/maps/Route40.asm
  11252. index 09f92f1..8fed30e 100644
  11253. --- a/maps/Route40.asm
  11254. +++ b/maps/Route40.asm
  11255. @@ -21,7 +21,7 @@ MonicaCallback:
  11256.     return
  11257.  
  11258.  TrainerSwimmerfElaine:
  11259.     trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, $0000, SwimmerfElaineScript
  11260.  
  11261.  SwimmerfElaineScript:
  11262.     talkaftercancel
  11263. @@ -32,7 +32,7 @@ SwimmerfElaineScript:
  11264.     end
  11265.  
  11266.  TrainerSwimmerfPaula:
  11267.     trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, $0000, SwimmerfPaulaScript
  11268.  
  11269.  SwimmerfPaulaScript:
  11270.     talkaftercancel
  11271. @@ -43,7 +43,7 @@ SwimmerfPaulaScript:
  11272.     end
  11273.  
  11274.  TrainerSwimmermSimon:
  11275.     trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, $0000, SwimmermSimonScript
  11276.  
  11277.  SwimmermSimonScript:
  11278.     talkaftercancel
  11279. @@ -54,7 +54,7 @@ SwimmermSimonScript:
  11280.     end
  11281.  
  11282.  TrainerSwimmermRandall:
  11283.     trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, $0000, SwimmermRandallScript
  11284.  
  11285.  SwimmermRandallScript:
  11286.     talkaftercancel
  11287. @@ -344,15 +344,15 @@ Route40_MapEventHeader:
  11288.  
  11289.  .PersonEvents:
  11290.     db 12
  11291. -   person_event SPRITE_OLIVINE_RIVAL, 15, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerSwimmermSimon, -1
  11292. -   person_event SPRITE_OLIVINE_RIVAL, 30, 18, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerSwimmermRandall, -1
  11293. -   person_event SPRITE_SWIMMER_GIRL, 19, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerSwimmerfElaine, -1
  11294. -   person_event SPRITE_SWIMMER_GIRL, 25, 10, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfPaula, -1
  11295. -   person_event SPRITE_ROCK, 11, 7, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11296. -   person_event SPRITE_ROCK, 9, 6, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11297. -   person_event SPRITE_ROCK, 8, 7, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11298. -   person_event SPRITE_LASS, 13, 11, $6, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a61c4, -1
  11299. -   person_event SPRITE_BUENA, 10, 8, $3, 0, 0, -1, -1, 0, 0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
  11300. -   person_event SPRITE_POKEFAN_M, 6, 7, $9, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1a61c7, -1
  11301. -   person_event SPRITE_LASS, 4, 13, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x1a61d3, -1
  11302. -   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
  11303. +   person_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerSwimmermSimon, -1
  11304. +   person_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerSwimmermRandall, -1
  11305. +   person_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerSwimmerfElaine, -1
  11306. +   person_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfPaula, -1
  11307. +   person_event SPRITE_ROCK, 11, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11308. +   person_event SPRITE_ROCK, 9, 6, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11309. +   person_event SPRITE_ROCK, 8, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
  11310. +   person_event SPRITE_LASS, 13, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a61c4, -1
  11311. +   person_event SPRITE_BUENA, 10, 8, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
  11312. +   person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1a61c7, -1
  11313. +   person_event SPRITE_LASS, 4, 13, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x1a61d3, -1
  11314. +   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
  11315. diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
  11316. index f99b652..0721b07 100644
  11317. --- a/maps/Route40BattleTowerGate.asm
  11318. +++ b/maps/Route40BattleTowerGate.asm
  11319. @@ -88,5 +88,5 @@ Route40BattleTowerGate_MapEventHeader:
  11320.  
  11321.  .PersonEvents:
  11322.     db 2
  11323. -   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
  11324. -   person_event SPRITE_TWIN, 5, 7, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TwinScript_0x9f66c, -1
  11325. +   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
  11326. +   person_event SPRITE_TWIN, 5, 7, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TwinScript_0x9f66c, -1
  11327. diff --git a/maps/Route41.asm b/maps/Route41.asm
  11328. index 872fb53..47cffc8 100644
  11329. --- a/maps/Route41.asm
  11330. +++ b/maps/Route41.asm
  11331. @@ -6,7 +6,7 @@ Route41_MapScriptHeader:
  11332.     db 0
  11333.  
  11334.  TrainerSwimmerfKaylee:
  11335.     trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, $0000, SwimmerfKayleeScript
  11336.  
  11337.  SwimmerfKayleeScript:
  11338.     talkaftercancel
  11339. @@ -17,7 +17,7 @@ SwimmerfKayleeScript:
  11340.     end
  11341.  
  11342.  TrainerSwimmerfSusie:
  11343.     trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, $0000, SwimmerfSusieScript
  11344.  
  11345.  SwimmerfSusieScript:
  11346.     talkaftercancel
  11347. @@ -28,7 +28,7 @@ SwimmerfSusieScript:
  11348.     end
  11349.  
  11350.  TrainerSwimmerfDenise:
  11351.     trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, $0000, SwimmerfDeniseScript
  11352.  
  11353.  SwimmerfDeniseScript:
  11354.     talkaftercancel
  11355. @@ -39,7 +39,7 @@ SwimmerfDeniseScript:
  11356.     end
  11357.  
  11358.  TrainerSwimmerfKara:
  11359.     trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, $0000, SwimmerfKaraScript
  11360.  
  11361.  SwimmerfKaraScript:
  11362.     talkaftercancel
  11363. @@ -50,7 +50,7 @@ SwimmerfKaraScript:
  11364.     end
  11365.  
  11366.  TrainerSwimmerfWendy:
  11367.     trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, $0000, SwimmerfWendyScript
  11368.  
  11369.  SwimmerfWendyScript:
  11370.     talkaftercancel
  11371. @@ -61,7 +61,7 @@ SwimmerfWendyScript:
  11372.     end
  11373.  
  11374.  TrainerSwimmermCharlie:
  11375.     trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, $0000, SwimmermCharlieScript
  11376.  
  11377.  SwimmermCharlieScript:
  11378.     talkaftercancel
  11379. @@ -72,7 +72,7 @@ SwimmermCharlieScript:
  11380.     end
  11381.  
  11382.  TrainerSwimmermGeorge:
  11383.     trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, $0000, SwimmermGeorgeScript
  11384.  
  11385.  SwimmermGeorgeScript:
  11386.     talkaftercancel
  11387. @@ -83,7 +83,7 @@ SwimmermGeorgeScript:
  11388.     end
  11389.  
  11390.  TrainerSwimmermBerke:
  11391.     trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, $0000, SwimmermBerkeScript
  11392.  
  11393.  SwimmermBerkeScript:
  11394.     talkaftercancel
  11395. @@ -94,7 +94,7 @@ SwimmermBerkeScript:
  11396.     end
  11397.  
  11398.  TrainerSwimmermKirk:
  11399.     trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, $0000, SwimmermKirkScript
  11400.  
  11401.  SwimmermKirkScript:
  11402.     talkaftercancel
  11403. @@ -105,7 +105,7 @@ SwimmermKirkScript:
  11404.     end
  11405.  
  11406.  TrainerSwimmermMathew:
  11407.     trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, $0000, SwimmermMathewScript
  11408.  
  11409.  SwimmermMathewScript:
  11410.     talkaftercancel
  11411. @@ -349,13 +349,13 @@ Route41_MapEventHeader:
  11412.  
  11413.  .PersonEvents:
  11414.     db 10
  11415. -   person_event SPRITE_OLIVINE_RIVAL, 6, 32, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermCharlie, -1
  11416. -   person_event SPRITE_OLIVINE_RIVAL, 8, 46, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermGeorge, -1
  11417. -   person_event SPRITE_OLIVINE_RIVAL, 26, 20, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermBerke, -1
  11418. -   person_event SPRITE_OLIVINE_RIVAL, 30, 32, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermKirk, -1
  11419. -   person_event SPRITE_OLIVINE_RIVAL, 46, 19, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermMathew, -1
  11420. -   person_event SPRITE_SWIMMER_GIRL, 4, 17, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfKaylee, -1
  11421. -   person_event SPRITE_SWIMMER_GIRL, 19, 23, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfSusie, -1
  11422. -   person_event SPRITE_SWIMMER_GIRL, 34, 27, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfDenise, -1
  11423. -   person_event SPRITE_SWIMMER_GIRL, 28, 44, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerSwimmerfKara, -1
  11424. -   person_event SPRITE_SWIMMER_GIRL, 50, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerSwimmerfWendy, -1
  11425. +   person_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermCharlie, -1
  11426. +   person_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermGeorge, -1
  11427. +   person_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermBerke, -1
  11428. +   person_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermKirk, -1
  11429. +   person_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermMathew, -1
  11430. +   person_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfKaylee, -1
  11431. +   person_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfSusie, -1
  11432. +   person_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfDenise, -1
  11433. +   person_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerSwimmerfKara, -1
  11434. +   person_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerSwimmerfWendy, -1
  11435. diff --git a/maps/Route42.asm b/maps/Route42.asm
  11436. index 04a5088..b427b3d 100644
  11437. --- a/maps/Route42.asm
  11438. +++ b/maps/Route42.asm
  11439. @@ -3,8 +3,8 @@ Route42_MapScriptHeader:
  11440.     db 2
  11441.  
  11442.     ; triggers
  11443.     dw UnknownScript_0x1a9216, $0000
  11444.     dw UnknownScript_0x1a9217, $0000
  11445.  
  11446.  .MapCallbacks:
  11447.     db 0
  11448. @@ -28,7 +28,7 @@ UnknownScript_0x1a9218:
  11449.     end
  11450.  
  11451.  TrainerFisherTully1:
  11452.     trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, $0000, FisherTully1Script
  11453.  
  11454.  FisherTully1Script:
  11455.     writecode VAR_CALLERID, PHONE_FISHER_TULLY
  11456. @@ -60,7 +60,7 @@ UnknownScript_0x1a926b:
  11457.  
  11458.  UnknownScript_0x1a927f:
  11459.     scall UnknownScript_0x1a9309
  11460.     winlosstext FisherTully1BeatenText, $0000
  11461.     copybytetovar wTullyFightCount
  11462.     if_equal 3, .Fight3
  11463.     if_equal 2, .Fight2
  11464. @@ -154,7 +154,7 @@ UnknownScript_0x1a9311:
  11465.     end
  11466.  
  11467.  TrainerPokemaniacShane:
  11468.     trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, $0000, PokemaniacShaneScript
  11469.  
  11470.  PokemaniacShaneScript:
  11471.     talkaftercancel
  11472. @@ -165,7 +165,7 @@ PokemaniacShaneScript:
  11473.     end
  11474.  
  11475.  TrainerHikerBenjamin:
  11476.     trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, $0000, HikerBenjaminScript
  11477.  
  11478.  HikerBenjaminScript:
  11479.     talkaftercancel
  11480. @@ -336,12 +336,12 @@ Route42_MapEventHeader:
  11481.  
  11482.  .PersonEvents:
  11483.     db 9
  11484. -   person_event SPRITE_FISHER, 10, 40, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherTully1, -1
  11485. -   person_event SPRITE_POKEFAN_M, 9, 51, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerBenjamin, -1
  11486. -   person_event SPRITE_SUPER_NERD, 8, 47, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacShane, -1
  11487. -   person_event SPRITE_FRUIT_TREE, 16, 27, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a934d, -1
  11488. -   person_event SPRITE_FRUIT_TREE, 16, 28, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a934f, -1
  11489. -   person_event SPRITE_FRUIT_TREE, 16, 29, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a9351, -1
  11490. -   person_event SPRITE_POKE_BALL, 4, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL
  11491. -   person_event SPRITE_POKE_BALL, 8, 33, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION
  11492. -   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
  11493. +   person_event SPRITE_FISHER, 10, 40, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherTully1, -1
  11494. +   person_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerBenjamin, -1
  11495. +   person_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacShane, -1
  11496. +   person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a934d, -1
  11497. +   person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a934f, -1
  11498. +   person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a9351, -1
  11499. +   person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL
  11500. +   person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION
  11501. +   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
  11502. diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
  11503. index e23810d..31a9735 100644
  11504. --- a/maps/Route42EcruteakGate.asm
  11505. +++ b/maps/Route42EcruteakGate.asm
  11506. @@ -35,4 +35,4 @@ Route42EcruteakGate_MapEventHeader:
  11507.  
  11508.  .PersonEvents:
  11509.     db 1
  11510. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19a4b5, -1
  11511. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19a4b5, -1
  11512. diff --git a/maps/Route43.asm b/maps/Route43.asm
  11513. index a4fb28f..4535911 100644
  11514. --- a/maps/Route43.asm
  11515. +++ b/maps/Route43.asm
  11516. @@ -20,7 +20,7 @@ UnknownScript_0x19d05c:
  11517.     return
  11518.  
  11519.  TrainerCamperSpencer:
  11520.     trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, $0000, CamperSpencerScript
  11521.  
  11522.  CamperSpencerScript:
  11523.     talkaftercancel
  11524. @@ -31,7 +31,7 @@ CamperSpencerScript:
  11525.     end
  11526.  
  11527.  TrainerPokemaniacBen:
  11528.     trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, $0000, PokemaniacBenScript
  11529.  
  11530.  PokemaniacBenScript:
  11531.     talkaftercancel
  11532. @@ -42,7 +42,7 @@ PokemaniacBenScript:
  11533.     end
  11534.  
  11535.  TrainerPokemaniacBrent1:
  11536.     trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, $0000, PokemaniacBrent1Script
  11537.  
  11538.  PokemaniacBrent1Script:
  11539.     writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT
  11540. @@ -72,7 +72,7 @@ UnknownScript_0x19d0bb:
  11541.  
  11542.  UnknownScript_0x19d0cf:
  11543.     scall UnknownScript_0x19d144
  11544.     winlosstext PokemaniacBrent1BeatenText, $0000
  11545.     copybytetovar wBrentFightCount
  11546.     if_equal 3, .Fight3
  11547.     if_equal 2, .Fight2
  11548. @@ -147,7 +147,7 @@ UnknownScript_0x19d144:
  11549.     end
  11550.  
  11551.  TrainerPokemaniacRon:
  11552.     trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, $0000, PokemaniacRonScript
  11553.  
  11554.  PokemaniacRonScript:
  11555.     talkaftercancel
  11556. @@ -158,7 +158,7 @@ PokemaniacRonScript:
  11557.     end
  11558.  
  11559.  TrainerFisherMarvin:
  11560.     trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, $0000, FisherMarvinScript
  11561.  
  11562.  FisherMarvinScript:
  11563.     talkaftercancel
  11564. @@ -169,7 +169,7 @@ FisherMarvinScript:
  11565.     end
  11566.  
  11567.  TrainerPicnickerTiffany3:
  11568.     trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, $0000, PicnickerTiffany3Script
  11569.  
  11570.  PicnickerTiffany3Script:
  11571.     writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY
  11572. @@ -203,7 +203,7 @@ UnknownScript_0x19d1ad:
  11573.  
  11574.  UnknownScript_0x19d1c1:
  11575.     scall UnknownScript_0x19d251
  11576.     winlosstext PicnickerTiffany3BeatenText, $0000
  11577.     copybytetovar wTiffanyFightCount
  11578.     if_equal 3, .Fight3
  11579.     if_equal 2, .Fight2
  11580. @@ -516,11 +516,11 @@ Route43_MapEventHeader:
  11581.  
  11582.  .PersonEvents:
  11583.     db 8
  11584. -   person_event SPRITE_SUPER_NERD, 5, 13, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacBen, -1
  11585. -   person_event SPRITE_SUPER_NERD, 20, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacBrent1, -1
  11586. -   person_event SPRITE_SUPER_NERD, 7, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacRon, -1
  11587. -   person_event SPRITE_FISHER, 16, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerFisherMarvin, -1
  11588. -   person_event SPRITE_LASS, 25, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTiffany3, -1
  11589. -   person_event SPRITE_YOUNGSTER, 40, 13, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperSpencer, -1
  11590. -   person_event SPRITE_FRUIT_TREE, 26, 1, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19d266, -1
  11591. -   person_event SPRITE_POKE_BALL, 32, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER
  11592. +   person_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacBen, -1
  11593. +   person_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacBrent1, -1
  11594. +   person_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacRon, -1
  11595. +   person_event SPRITE_FISHER, 16, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 4, TrainerFisherMarvin, -1
  11596. +   person_event SPRITE_LASS, 25, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTiffany3, -1
  11597. +   person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperSpencer, -1
  11598. +   person_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19d266, -1
  11599. +   person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER
  11600. diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
  11601. index 4fe15be..0ab9ba1 100644
  11602. --- a/maps/Route43Gate.asm
  11603. +++ b/maps/Route43Gate.asm
  11604. @@ -3,8 +3,8 @@ Route43Gate_MapScriptHeader:
  11605.     db 2
  11606.  
  11607.     ; triggers
  11608.     dw UnknownScript_0x19abc5, $0000
  11609.     dw UnknownScript_0x19abc9, $0000
  11610.  
  11611.  .MapCallbacks:
  11612.     db 1
  11613. @@ -264,6 +264,6 @@ Route43Gate_MapEventHeader:
  11614.  
  11615.  .PersonEvents:
  11616.     db 3
  11617. -   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
  11618. -   person_event SPRITE_ROCKET, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS
  11619. -   person_event SPRITE_ROCKET, 4, 7, $7, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS
  11620. +   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
  11621. +   person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS
  11622. +   person_event SPRITE_ROCKET, 4, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS
  11623. diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
  11624. index 588fa92..0f1354b 100644
  11625. --- a/maps/Route43MahoganyGate.asm
  11626. +++ b/maps/Route43MahoganyGate.asm
  11627. @@ -54,4 +54,4 @@ Route43MahoganyGate_MapEventHeader:
  11628.  
  11629.  .PersonEvents:
  11630.     db 1
  11631. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19ab0b, -1
  11632. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, OfficerScript_0x19ab0b, -1
  11633. diff --git a/maps/Route44.asm b/maps/Route44.asm
  11634. index b2a08a7..3911a9d 100644
  11635. --- a/maps/Route44.asm
  11636. +++ b/maps/Route44.asm
  11637. @@ -6,7 +6,7 @@ Route44_MapScriptHeader:
  11638.     db 0
  11639.  
  11640.  TrainerBird_keeperVance1:
  11641.     trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, $0000, Bird_keeperVance1Script
  11642.  
  11643.  Bird_keeperVance1Script:
  11644.     writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
  11645. @@ -36,7 +36,7 @@ UnknownScript_0x19d856:
  11646.  
  11647.  UnknownScript_0x19d86a:
  11648.     scall UnknownScript_0x19d8f7
  11649.     winlosstext Bird_keeperVance1BeatenText, $0000
  11650.     copybytetovar wVanceFightCount
  11651.     if_equal 2, .Fight2
  11652.     if_equal 1, .Fight1
  11653. @@ -137,7 +137,7 @@ UnknownScript_0x19d90a:
  11654.     end
  11655.  
  11656.  TrainerPsychicPhil:
  11657.     trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, $0000, PsychicPhilScript
  11658.  
  11659.  PsychicPhilScript:
  11660.     talkaftercancel
  11661. @@ -148,7 +148,7 @@ PsychicPhilScript:
  11662.     end
  11663.  
  11664.  TrainerFisherWilton1:
  11665.     trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, $0000, FisherWilton1Script
  11666.  
  11667.  FisherWilton1Script:
  11668.     writecode VAR_CALLERID, PHONE_FISHER_WILTON
  11669. @@ -180,7 +180,7 @@ UnknownScript_0x19d95a:
  11670.  
  11671.  UnknownScript_0x19d96e:
  11672.     scall UnknownScript_0x19d8f7
  11673.     winlosstext FisherWilton1BeatenText, $0000
  11674.     copybytetovar wWiltonFightCount
  11675.     if_equal 2, .Fight2
  11676.     if_equal 1, .Fight1
  11677. @@ -243,7 +243,7 @@ UnknownScript_0x19d9e7:
  11678.     jump UnknownScript_0x19d8ff
  11679.  
  11680.  TrainerFisherEdgar:
  11681.     trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, $0000, FisherEdgarScript
  11682.  
  11683.  FisherEdgarScript:
  11684.     talkaftercancel
  11685. @@ -254,7 +254,7 @@ FisherEdgarScript:
  11686.     end
  11687.  
  11688.  TrainerCooltrainerfCybil:
  11689.     trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, $0000, CooltrainerfCybilScript
  11690.  
  11691.  CooltrainerfCybilScript:
  11692.     talkaftercancel
  11693. @@ -265,7 +265,7 @@ CooltrainerfCybilScript:
  11694.     end
  11695.  
  11696.  TrainerPokemaniacZach:
  11697.     trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, $0000, PokemaniacZachScript
  11698.  
  11699.  PokemaniacZachScript:
  11700.     talkaftercancel
  11701. @@ -276,7 +276,7 @@ PokemaniacZachScript:
  11702.     end
  11703.  
  11704.  TrainerCooltrainermAllen:
  11705.     trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, $0000, CooltrainermAllenScript
  11706.  
  11707.  CooltrainermAllenScript:
  11708.     talkaftercancel
  11709. @@ -513,14 +513,14 @@ Route44_MapEventHeader:
  11710.  
  11711.  .PersonEvents:
  11712.     db 11
  11713. -   person_event SPRITE_FISHER, 3, 35, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherWilton1, -1
  11714. -   person_event SPRITE_FISHER, 13, 19, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherEdgar, -1
  11715. -   person_event SPRITE_YOUNGSTER, 9, 10, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicPhil, -1
  11716. -   person_event SPRITE_SUPER_NERD, 2, 43, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPokemaniacZach, -1
  11717. -   person_event SPRITE_YOUNGSTER, 5, 51, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBird_keeperVance1, -1
  11718. -   person_event SPRITE_COOLTRAINER_M, 15, 41, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainermAllen, -1
  11719. -   person_event SPRITE_COOLTRAINER_F, 14, 31, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainerfCybil, -1
  11720. -   person_event SPRITE_FRUIT_TREE, 5, 9, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19da40, -1
  11721. -   person_event SPRITE_POKE_BALL, 8, 30, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE
  11722. -   person_event SPRITE_POKE_BALL, 4, 45, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL
  11723. -   person_event SPRITE_POKE_BALL, 9, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL
  11724. +   person_event SPRITE_FISHER, 3, 35, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherWilton1, -1
  11725. +   person_event SPRITE_FISHER, 13, 19, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerFisherEdgar, -1
  11726. +   person_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicPhil, -1
  11727. +   person_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPokemaniacZach, -1
  11728. +   person_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBird_keeperVance1, -1
  11729. +   person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainermAllen, -1
  11730. +   person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerCooltrainerfCybil, -1
  11731. +   person_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19da40, -1
  11732. +   person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE
  11733. +   person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL
  11734. +   person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL
  11735. diff --git a/maps/Route45.asm b/maps/Route45.asm
  11736. index 19f4312..8832eb4 100644
  11737. --- a/maps/Route45.asm
  11738. +++ b/maps/Route45.asm
  11739. @@ -6,7 +6,7 @@ Route45_MapScriptHeader:
  11740.     db 0
  11741.  
  11742.  TrainerBlackbeltKenji:
  11743.     trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, $0000, BlackbeltKenji3Script
  11744.  
  11745.  BlackbeltKenji3Script:
  11746.     writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI
  11747. @@ -110,7 +110,7 @@ UnknownScript_0x19e146:
  11748.     end
  11749.  
  11750.  TrainerHikerErik:
  11751.     trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, $0000, HikerErikScript
  11752.  
  11753.  HikerErikScript:
  11754.     talkaftercancel
  11755. @@ -121,7 +121,7 @@ HikerErikScript:
  11756.     end
  11757.  
  11758.  TrainerHikerMichael:
  11759.     trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, $0000, HikerMichaelScript
  11760.  
  11761.  HikerMichaelScript:
  11762.     talkaftercancel
  11763. @@ -132,7 +132,7 @@ HikerMichaelScript:
  11764.     end
  11765.  
  11766.  TrainerHikerParry:
  11767.     trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, $0000, HikerParry3Script
  11768.  
  11769.  HikerParry3Script:
  11770.     writecode VAR_CALLERID, PHONE_HIKER_PARRY
  11771. @@ -162,7 +162,7 @@ UnknownScript_0x19e1a4:
  11772.  
  11773.  UnknownScript_0x19e1b8:
  11774.     scall UnknownScript_0x19e133
  11775.     winlosstext HikerParry3BeatenText, $0000
  11776.     copybytetovar wParryFightCount
  11777.     if_equal 2, .Fight2
  11778.     if_equal 1, .Fight1
  11779. @@ -218,7 +218,7 @@ UnknownScript_0x19e219:
  11780.     jump UnknownScript_0x19e127
  11781.  
  11782.  TrainerHikerTimothy:
  11783.     trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, $0000, HikerTimothyScript
  11784.  
  11785.  HikerTimothyScript:
  11786.     talkaftercancel
  11787. @@ -229,7 +229,7 @@ HikerTimothyScript:
  11788.     end
  11789.  
  11790.  TrainerCooltrainermRyan:
  11791.     trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, $0000, CooltrainermRyanScript
  11792.  
  11793.  CooltrainermRyanScript:
  11794.     talkaftercancel
  11795. @@ -240,7 +240,7 @@ CooltrainermRyanScript:
  11796.     end
  11797.  
  11798.  TrainerCooltrainerfKelly:
  11799.     trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, $0000, CooltrainerfKellyScript
  11800.  
  11801.  CooltrainerfKellyScript:
  11802.     talkaftercancel
  11803. @@ -258,7 +258,7 @@ YoungsterScript_0x19e269:
  11804.     writetext UnknownText_0x19e87f
  11805.     closetext
  11806.     loadmovesprites
  11807.     winlosstext UnknownText_0x19e899, $0000
  11808.     loadtrainer CAMPER, QUENTIN
  11809.     startbattle
  11810.     returnafterbattle
  11811. @@ -535,16 +535,16 @@ Route45_MapEventHeader:
  11812.  
  11813.  .PersonEvents:
  11814.     db 13
  11815. -   person_event SPRITE_POKEFAN_M, 16, 10, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerErik, -1
  11816. -   person_event SPRITE_POKEFAN_M, 65, 15, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerMichael, -1
  11817. -   person_event SPRITE_POKEFAN_M, 28, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerParry, -1
  11818. -   person_event SPRITE_POKEFAN_M, 65, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerTimothy, -1
  11819. -   person_event SPRITE_BLACK_BELT, 50, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltKenji, -1
  11820. -   person_event SPRITE_COOLTRAINER_M, 18, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermRyan, -1
  11821. -   person_event SPRITE_COOLTRAINER_F, 36, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfKelly, -1
  11822. -   person_event SPRITE_FRUIT_TREE, 82, 16, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19e294, -1
  11823. -   person_event SPRITE_POKE_BALL, 51, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET
  11824. -   person_event SPRITE_POKE_BALL, 66, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE
  11825. -   person_event SPRITE_POKE_BALL, 20, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER
  11826. -   person_event SPRITE_POKE_BALL, 33, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION
  11827. -   person_event SPRITE_YOUNGSTER, 70, 4, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x19e269, -1
  11828. +   person_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerErik, -1
  11829. +   person_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerMichael, -1
  11830. +   person_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerParry, -1
  11831. +   person_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerTimothy, -1
  11832. +   person_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltKenji, -1
  11833. +   person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermRyan, -1
  11834. +   person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfKelly, -1
  11835. +   person_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19e294, -1
  11836. +   person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET
  11837. +   person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE
  11838. +   person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER
  11839. +   person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION
  11840. +   person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x19e269, -1
  11841. diff --git a/maps/Route46.asm b/maps/Route46.asm
  11842. index bda4cc9..aeb6f74 100644
  11843. --- a/maps/Route46.asm
  11844. +++ b/maps/Route46.asm
  11845. @@ -6,7 +6,7 @@ Route46_MapScriptHeader:
  11846.     db 0
  11847.  
  11848.  TrainerCamperTed:
  11849.     trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, $0000, CamperTedScript
  11850.  
  11851.  CamperTedScript:
  11852.     talkaftercancel
  11853. @@ -17,7 +17,7 @@ CamperTedScript:
  11854.     end
  11855.  
  11856.  TrainerPicnickerErin1:
  11857.     trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, $0000, PicnickerErin1Script
  11858.  
  11859.  PicnickerErin1Script:
  11860.     writecode VAR_CALLERID, PHONE_PICNICKER_ERIN
  11861. @@ -47,7 +47,7 @@ UnknownScript_0x1a96c6:
  11862.  
  11863.  UnknownScript_0x1a96da:
  11864.     scall UnknownScript_0x1a9767
  11865.     winlosstext PicnickerErin1BeatenText, $0000
  11866.     copybytetovar wErinFightCount
  11867.     if_equal 2, .Fight2
  11868.     if_equal 1, .Fight1
  11869. @@ -140,7 +140,7 @@ UnknownScript_0x1a9772:
  11870.     end
  11871.  
  11872.  TrainerHikerBailey:
  11873.     trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, $0000, HikerBaileyScript
  11874.  
  11875.  HikerBaileyScript:
  11876.     talkaftercancel
  11877. @@ -261,9 +261,9 @@ Route46_MapEventHeader:
  11878.  
  11879.  .PersonEvents:
  11880.     db 6
  11881. -   person_event SPRITE_POKEFAN_M, 19, 12, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerBailey, -1
  11882. -   person_event SPRITE_YOUNGSTER, 14, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperTed, -1
  11883. -   person_event SPRITE_LASS, 13, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerErin1, -1
  11884. -   person_event SPRITE_FRUIT_TREE, 5, 7, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a978f, -1
  11885. -   person_event SPRITE_FRUIT_TREE, 6, 8, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a9791, -1
  11886. -   person_event SPRITE_POKE_BALL, 15, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED
  11887. +   person_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerBailey, -1
  11888. +   person_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperTed, -1
  11889. +   person_event SPRITE_LASS, 13, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerErin1, -1
  11890. +   person_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a978f, -1
  11891. +   person_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a9791, -1
  11892. +   person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED
  11893. diff --git a/maps/Route5.asm b/maps/Route5.asm
  11894. index 2335dd3..96c3325 100644
  11895. --- a/maps/Route5.asm
  11896. +++ b/maps/Route5.asm
  11897. @@ -57,4 +57,4 @@ Route5_MapEventHeader:
  11898.  
  11899.  .PersonEvents:
  11900.     db 1
  11901. -   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
  11902. +   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
  11903. diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm
  11904. index 200e4ec..855029c 100644
  11905. --- a/maps/Route5CleanseTagSpeechHouse.asm
  11906. +++ b/maps/Route5CleanseTagSpeechHouse.asm
  11907. @@ -75,5 +75,5 @@ Route5CleanseTagSpeechHouse_MapEventHeader:
  11908.  
  11909.  .PersonEvents:
  11910.     db 2
  11911. -   person_event SPRITE_GRANNY, 5, 2, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x18b634, -1
  11912. -   person_event SPRITE_TEACHER, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x18b64f, -1
  11913. +   person_event SPRITE_GRANNY, 5, 2, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x18b634, -1
  11914. +   person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x18b64f, -1
  11915. diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm
  11916. index ee40d6d..1ce6d05 100644
  11917. --- a/maps/Route5SaffronCityGate.asm
  11918. +++ b/maps/Route5SaffronCityGate.asm
  11919. @@ -36,4 +36,4 @@ Route5SaffronCityGate_MapEventHeader:
  11920.  
  11921.  .PersonEvents:
  11922.     db 1
  11923. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x18b5b9, -1
  11924. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x18b5b9, -1
  11925. diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm
  11926. index 5029df0..d3c93cd 100644
  11927. --- a/maps/Route5UndergroundEntrance.asm
  11928. +++ b/maps/Route5UndergroundEntrance.asm
  11929. @@ -34,4 +34,4 @@ Route5UndergroundEntrance_MapEventHeader:
  11930.  
  11931.  .PersonEvents:
  11932.     db 1
  11933. -   person_event SPRITE_TEACHER, 2, 2, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x18b555, -1
  11934. +   person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x18b555, -1
  11935. diff --git a/maps/Route6.asm b/maps/Route6.asm
  11936. index 50b8990..de2a5c4 100644
  11937. --- a/maps/Route6.asm
  11938. +++ b/maps/Route6.asm
  11939. @@ -6,7 +6,7 @@ Route6_MapScriptHeader:
  11940.     db 0
  11941.  
  11942.  TrainerPokefanmRex:
  11943.     trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, $0000, PokefanmRexScript
  11944.  
  11945.  PokefanmRexScript:
  11946.     talkaftercancel
  11947. @@ -17,7 +17,7 @@ PokefanmRexScript:
  11948.     end
  11949.  
  11950.  TrainerPokefanmAllan:
  11951.     trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, $0000, PokefanmAllanScript
  11952.  
  11953.  PokefanmAllanScript:
  11954.     talkaftercancel
  11955. @@ -104,6 +104,6 @@ Route6_MapEventHeader:
  11956.  
  11957.  .PersonEvents:
  11958.     db 3
  11959. -   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
  11960. -   person_event SPRITE_POKEFAN_M, 12, 9, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerPokefanmRex, -1
  11961. -   person_event SPRITE_POKEFAN_M, 12, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerPokefanmAllan, -1
  11962. +   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
  11963. +   person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerPokefanmRex, -1
  11964. +   person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerPokefanmAllan, -1
  11965. diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
  11966. index ab457f5..070f0be 100644
  11967. --- a/maps/Route6SaffronGate.asm
  11968. +++ b/maps/Route6SaffronGate.asm
  11969. @@ -3,7 +3,7 @@ Route6SaffronGate_MapScriptHeader:
  11970.     db 1
  11971.  
  11972.     ; triggers
  11973.     dw UnknownScript_0x1926e9, $0000
  11974.  
  11975.  .MapCallbacks:
  11976.     db 0
  11977. @@ -75,4 +75,4 @@ Route6SaffronGate_MapEventHeader:
  11978.  
  11979.  .PersonEvents:
  11980.     db 1
  11981. -   person_event SPRITE_OFFICER, 4, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x1926ea, -1
  11982. +   person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x1926ea, -1
  11983. diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
  11984. index 05b09f0..c3e268d 100644
  11985. --- a/maps/Route7SaffronGate.asm
  11986. +++ b/maps/Route7SaffronGate.asm
  11987. @@ -61,4 +61,4 @@ Route7SaffronGate_MapEventHeader:
  11988.  
  11989.  .PersonEvents:
  11990.     db 1
  11991. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x73518, -1
  11992. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x73518, -1
  11993. diff --git a/maps/Route8.asm b/maps/Route8.asm
  11994. index c8dab80..cad14ef 100644
  11995. --- a/maps/Route8.asm
  11996. +++ b/maps/Route8.asm
  11997. @@ -6,7 +6,7 @@ Route8_MapScriptHeader:
  11998.     db 0
  11999.  
  12000.  TrainerBikerDwayne:
  12001.     trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, $0000, BikerDwayneScript
  12002.  
  12003.  BikerDwayneScript:
  12004.     talkaftercancel
  12005. @@ -17,7 +17,7 @@ BikerDwayneScript:
  12006.     end
  12007.  
  12008.  TrainerBikerHarris:
  12009.     trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, $0000, BikerHarrisScript
  12010.  
  12011.  BikerHarrisScript:
  12012.     talkaftercancel
  12013. @@ -28,7 +28,7 @@ BikerHarrisScript:
  12014.     end
  12015.  
  12016.  TrainerBikerZeke:
  12017.     trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, $0000, BikerZekeScript
  12018.  
  12019.  BikerZekeScript:
  12020.     talkaftercancel
  12021. @@ -39,7 +39,7 @@ BikerZekeScript:
  12022.     end
  12023.  
  12024.  TrainerSupernerdSam:
  12025.     trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, $0000, SupernerdSamScript
  12026.  
  12027.  SupernerdSamScript:
  12028.     talkaftercancel
  12029. @@ -50,7 +50,7 @@ SupernerdSamScript:
  12030.     end
  12031.  
  12032.  TrainerSupernerdTom:
  12033.     trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, $0000, SupernerdTomScript
  12034.  
  12035.  SupernerdTomScript:
  12036.     talkaftercancel
  12037. @@ -183,9 +183,9 @@ Route8_MapEventHeader:
  12038.  
  12039.  .PersonEvents:
  12040.     db 6
  12041. -   person_event SPRITE_BIKER, 8, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerBikerDwayne, -1
  12042. -   person_event SPRITE_BIKER, 9, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerBikerHarris, -1
  12043. -   person_event SPRITE_BIKER, 10, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerBikerZeke, -1
  12044. -   person_event SPRITE_SUPER_NERD, 2, 23, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdSam, -1
  12045. -   person_event SPRITE_SUPER_NERD, 12, 31, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerSupernerdTom, -1
  12046. -   person_event SPRITE_FRUIT_TREE, 5, 33, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x6c06c, -1
  12047. +   person_event SPRITE_BIKER, 8, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 5, TrainerBikerDwayne, -1
  12048. +   person_event SPRITE_BIKER, 9, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerBikerHarris, -1
  12049. +   person_event SPRITE_BIKER, 10, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerBikerZeke, -1
  12050. +   person_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdSam, -1
  12051. +   person_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerSupernerdTom, -1
  12052. +   person_event SPRITE_FRUIT_TREE, 5, 33, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x6c06c, -1
  12053. diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
  12054. index 607909e..deb58b6 100644
  12055. --- a/maps/Route8SaffronGate.asm
  12056. +++ b/maps/Route8SaffronGate.asm
  12057. @@ -35,4 +35,4 @@ Route8SaffronGate_MapEventHeader:
  12058.  
  12059.  .PersonEvents:
  12060.     db 1
  12061. -   person_event SPRITE_OFFICER, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7f416, -1
  12062. +   person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x7f416, -1
  12063. diff --git a/maps/Route9.asm b/maps/Route9.asm
  12064. index 6f760ff..576e410 100644
  12065. --- a/maps/Route9.asm
  12066. +++ b/maps/Route9.asm
  12067. @@ -6,7 +6,7 @@ Route9_MapScriptHeader:
  12068.     db 0
  12069.  
  12070.  TrainerCamperDean:
  12071.     trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, $0000, CamperDeanScript
  12072.  
  12073.  CamperDeanScript:
  12074.     talkaftercancel
  12075. @@ -17,7 +17,7 @@ CamperDeanScript:
  12076.     end
  12077.  
  12078.  TrainerPicnickerHeidi:
  12079.     trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, $0000, PicnickerHeidiScript
  12080.  
  12081.  PicnickerHeidiScript:
  12082.     talkaftercancel
  12083. @@ -28,7 +28,7 @@ PicnickerHeidiScript:
  12084.     end
  12085.  
  12086.  TrainerCamperSid:
  12087.     trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, $0000, CamperSidScript
  12088.  
  12089.  CamperSidScript:
  12090.     talkaftercancel
  12091. @@ -39,7 +39,7 @@ CamperSidScript:
  12092.     end
  12093.  
  12094.  TrainerPicnickerEdna:
  12095.     trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, $0000, PicnickerEdnaScript
  12096.  
  12097.  PicnickerEdnaScript:
  12098.     talkaftercancel
  12099. @@ -50,7 +50,7 @@ PicnickerEdnaScript:
  12100.     end
  12101.  
  12102.  TrainerHikerTim:
  12103.     trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, $0000, HikerTimScript
  12104.  
  12105.  HikerTimScript:
  12106.     talkaftercancel
  12107. @@ -61,7 +61,7 @@ HikerTimScript:
  12108.     end
  12109.  
  12110.  TrainerHikerSidney:
  12111.     trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, $0000, HikerSidneyScript
  12112.  
  12113.  HikerSidneyScript:
  12114.     talkaftercancel
  12115. @@ -216,9 +216,9 @@ Route9_MapEventHeader:
  12116.  
  12117.  .PersonEvents:
  12118.     db 6
  12119. -   person_event SPRITE_YOUNGSTER, 11, 23, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperDean, -1
  12120. -   person_event SPRITE_LASS, 8, 39, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerHeidi, -1
  12121. -   person_event SPRITE_YOUNGSTER, 4, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerCamperSid, -1
  12122. -   person_event SPRITE_LASS, 15, 12, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerEdna, -1
  12123. -   person_event SPRITE_POKEFAN_M, 3, 28, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerTim, -1
  12124. -   person_event SPRITE_POKEFAN_M, 15, 36, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerHikerSidney, -1
  12125. +   person_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperDean, -1
  12126. +   person_event SPRITE_LASS, 8, 39, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerHeidi, -1
  12127. +   person_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 5, TrainerCamperSid, -1
  12128. +   person_event SPRITE_LASS, 15, 12, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerEdna, -1
  12129. +   person_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerTim, -1
  12130. +   person_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 4, TrainerHikerSidney, -1
  12131. diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm
  12132. index f8ce706..397ef58 100644
  12133. --- a/maps/RuinsofAlphAerodactylChamber.asm
  12134. +++ b/maps/RuinsofAlphAerodactylChamber.asm
  12135. @@ -3,8 +3,8 @@ RuinsofAlphAerodactylChamber_MapScriptHeader:
  12136.     db 2
  12137.  
  12138.     ; triggers
  12139.     dw UnknownScript_0x58dad, $0000
  12140.     dw UnknownScript_0x58db8, $0000
  12141.  
  12142.  .MapCallbacks:
  12143.     db 1
  12144. diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm
  12145. index 2ddcd70..abacc6e 100644
  12146. --- a/maps/RuinsofAlphAerodactylItemRoom.asm
  12147. +++ b/maps/RuinsofAlphAerodactylItemRoom.asm
  12148. @@ -47,7 +47,7 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader:
  12149.  
  12150.  .PersonEvents:
  12151.     db 4
  12152. -   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
  12153. -   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
  12154. -   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
  12155. -   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
  12156. +   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
  12157. +   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
  12158. +   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
  12159. +   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
  12160. diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm
  12161. index 2007107..dccd966 100644
  12162. --- a/maps/RuinsofAlphHoOhChamber.asm
  12163. +++ b/maps/RuinsofAlphHoOhChamber.asm
  12164. @@ -3,8 +3,8 @@ RuinsofAlphHoOhChamber_MapScriptHeader:
  12165.     db 2
  12166.  
  12167.     ; triggers
  12168.     dw UnknownScript_0x5856d, $0000
  12169.     dw UnknownScript_0x5857b, $0000
  12170.  
  12171.  .MapCallbacks:
  12172.     db 1
  12173. diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm
  12174. index c3af94b..25c86aa 100644
  12175. --- a/maps/RuinsofAlphHoOhItemRoom.asm
  12176. +++ b/maps/RuinsofAlphHoOhItemRoom.asm
  12177. @@ -47,7 +47,7 @@ RuinsofAlphHoOhItemRoom_MapEventHeader:
  12178.  
  12179.  .PersonEvents:
  12180.     db 4
  12181. -   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
  12182. -   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
  12183. -   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
  12184. -   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
  12185. +   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
  12186. +   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
  12187. +   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
  12188. +   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
  12189. diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm
  12190. index ae8bed5..2d36abb 100644
  12191. --- a/maps/RuinsofAlphInnerChamber.asm
  12192. +++ b/maps/RuinsofAlphInnerChamber.asm
  12193. @@ -3,8 +3,8 @@ RuinsofAlphInnerChamber_MapScriptHeader:
  12194.     db 2
  12195.  
  12196.     ; triggers
  12197.     dw UnknownScript_0x58f69, $0000
  12198.     dw UnknownScript_0x58f6a, $0000
  12199.  
  12200.  .MapCallbacks:
  12201.     db 0
  12202. @@ -125,6 +125,6 @@ RuinsofAlphInnerChamber_MapEventHeader:
  12203.  
  12204.  .PersonEvents:
  12205.     db 3
  12206. -   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
  12207. -   person_event SPRITE_TEACHER, 13, 14, $2, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
  12208. -   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
  12209. +   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
  12210. +   person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
  12211. +   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
  12212. diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm
  12213. index e20eaf7..d48cfb1 100644
  12214. --- a/maps/RuinsofAlphKabutoChamber.asm
  12215. +++ b/maps/RuinsofAlphKabutoChamber.asm
  12216. @@ -3,8 +3,8 @@ RuinsofAlphKabutoChamber_MapScriptHeader:
  12217.     db 2
  12218.  
  12219.     ; triggers
  12220.     dw UnknownScript_0x5872b, $0000
  12221.     dw UnknownScript_0x58736, $0000
  12222.  
  12223.  .MapCallbacks:
  12224.     db 1
  12225. @@ -284,5 +284,5 @@ RuinsofAlphKabutoChamber_MapEventHeader:
  12226.  
  12227.  .PersonEvents:
  12228.     db 2
  12229. -   person_event SPRITE_RECEPTIONIST, 5, 5, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
  12230. -   person_event SPRITE_SCIENTIST, 1, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x587a8, -1
  12231. +   person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
  12232. +   person_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x587a8, -1
  12233. diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm
  12234. index 02f9242..d27f5a8 100644
  12235. --- a/maps/RuinsofAlphKabutoItemRoom.asm
  12236. +++ b/maps/RuinsofAlphKabutoItemRoom.asm
  12237. @@ -47,7 +47,7 @@ RuinsofAlphKabutoItemRoom_MapEventHeader:
  12238.  
  12239.  .PersonEvents:
  12240.     db 4
  12241. -   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
  12242. -   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
  12243. -   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
  12244. -   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
  12245. +   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
  12246. +   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
  12247. +   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
  12248. +   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
  12249. diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm
  12250. index 3c0642a..4805ba9 100644
  12251. --- a/maps/RuinsofAlphOmanyteChamber.asm
  12252. +++ b/maps/RuinsofAlphOmanyteChamber.asm
  12253. @@ -3,8 +3,8 @@ RuinsofAlphOmanyteChamber_MapScriptHeader:
  12254.     db 2
  12255.  
  12256.     ; triggers
  12257.     dw UnknownScript_0x58be9, $0000
  12258.     dw UnknownScript_0x58bf7, $0000
  12259.  
  12260.  .MapCallbacks:
  12261.     db 1
  12262. diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm
  12263. index 5fb6227..5a37501 100644
  12264. --- a/maps/RuinsofAlphOmanyteItemRoom.asm
  12265. +++ b/maps/RuinsofAlphOmanyteItemRoom.asm
  12266. @@ -47,7 +47,7 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader:
  12267.  
  12268.  .PersonEvents:
  12269.     db 4
  12270. -   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
  12271. -   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
  12272. -   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
  12273. -   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
  12274. +   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
  12275. +   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
  12276. +   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
  12277. +   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
  12278. diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm
  12279. index e4748d9..3ac707d 100644
  12280. --- a/maps/RuinsofAlphOutside.asm
  12281. +++ b/maps/RuinsofAlphOutside.asm
  12282. @@ -3,8 +3,8 @@ RuinsofAlphOutside_MapScriptHeader:
  12283.     db 2
  12284.  
  12285.     ; triggers
  12286.     dw UnknownScript_0x5800d, $0000
  12287.     dw UnknownScript_0x5800e, $0000
  12288.  
  12289.  .MapCallbacks:
  12290.     db 1
  12291. @@ -100,7 +100,7 @@ YoungsterScript_0x5807e:
  12292.     end
  12293.  
  12294.  TrainerPsychicNathan:
  12295.     trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, $0000, PsychicNathanScript
  12296.  
  12297.  PsychicNathanScript:
  12298.     talkaftercancel
  12299. @@ -112,7 +112,7 @@ PsychicNathanScript:
  12300.  
  12301.  
  12302.  TrainerSuperNerdStan:
  12303.     trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, $0000, UnknownScript_0x580a9
  12304.  
  12305.  UnknownScript_0x580a9:
  12306.     talkaftercancel
  12307. @@ -311,8 +311,8 @@ RuinsofAlphOutside_MapEventHeader:
  12308.  
  12309.  .PersonEvents:
  12310.     db 5
  12311. -   person_event SPRITE_YOUNGSTER, 20, 4, $6, 0, 0, -1, -1, 0, 2, 1, TrainerPsychicNathan, -1
  12312. -   person_event SPRITE_SCIENTIST, 15, 11, $7, 0, 0, -1, -1, 0, 0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
  12313. -   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
  12314. -   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
  12315. -   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
  12316. +   person_event SPRITE_YOUNGSTER, 20, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 1, TrainerPsychicNathan, -1
  12317. +   person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
  12318. +   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
  12319. +   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
  12320. +   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
  12321. diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm
  12322. index 47aa063..205185d 100644
  12323. --- a/maps/RuinsofAlphResearchCenter.asm
  12324. +++ b/maps/RuinsofAlphResearchCenter.asm
  12325. @@ -3,8 +3,8 @@ RuinsofAlphResearchCenter_MapScriptHeader:
  12326.     db 2
  12327.  
  12328.     ; triggers
  12329.     dw UnknownScript_0x59180, $0000
  12330.     dw UnknownScript_0x59181, $0000
  12331.  
  12332.  .MapCallbacks:
  12333.     db 1
  12334. @@ -412,6 +412,6 @@ RuinsofAlphResearchCenter_MapEventHeader:
  12335.  
  12336.  .PersonEvents:
  12337.     db 3
  12338. -   person_event SPRITE_SCIENTIST, 5, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x591e5, -1
  12339. -   person_event SPRITE_SCIENTIST, 2, 5, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x59214, -1
  12340. -   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
  12341. +   person_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x591e5, -1
  12342. +   person_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEFN_02, 1, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x59214, -1
  12343. +   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
  12344. diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
  12345. index 911da54..396aa31 100644
  12346. --- a/maps/SafariZoneWardensHome.asm
  12347. +++ b/maps/SafariZoneWardensHome.asm
  12348. @@ -94,4 +94,4 @@ SafariZoneWardensHome_MapEventHeader:
  12349.  
  12350.  .PersonEvents:
  12351.     db 1
  12352. -   person_event SPRITE_LASS, 4, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, WardensGranddaughter, -1
  12353. +   person_event SPRITE_LASS, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, WardensGranddaughter, -1
  12354. diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
  12355. index 363f930..a5fa856 100644
  12356. --- a/maps/SaffronCity.asm
  12357. +++ b/maps/SaffronCity.asm
  12358. @@ -295,11 +295,11 @@ SaffronCity_MapEventHeader:
  12359.  
  12360.  .PersonEvents:
  12361.     db 8
  12362. -   person_event SPRITE_LASS, 14, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x19932a, -1
  12363. -   person_event SPRITE_POKEFAN_M, 30, 19, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x19933e, -1
  12364. -   person_event SPRITE_COOLTRAINER_M, 7, 32, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x199352, -1
  12365. -   person_event SPRITE_COOLTRAINER_F, 24, 20, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x199355, -1
  12366. -   person_event SPRITE_FISHER, 12, 27, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x199358, -1
  12367. -   person_event SPRITE_YOUNGSTER, 19, 15, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x19936c, -1
  12368. -   person_event SPRITE_YOUNGSTER, 22, 35, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19936f, -1
  12369. -   person_event SPRITE_LASS, 8, 19, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x199372, -1
  12370. +   person_event SPRITE_LASS, 14, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x19932a, -1
  12371. +   person_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, PokefanMScript_0x19933e, -1
  12372. +   person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x199352, -1
  12373. +   person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x199355, -1
  12374. +   person_event SPRITE_FISHER, 12, 27, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x199358, -1
  12375. +   person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x19936c, -1
  12376. +   person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19936f, -1
  12377. +   person_event SPRITE_LASS, 8, 19, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x199372, -1
  12378. diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
  12379. index 8e7bb10..dfd476b 100644
  12380. --- a/maps/SaffronGym.asm
  12381. +++ b/maps/SaffronGym.asm
  12382. @@ -13,7 +13,7 @@ SabrinaScript_0x189c2e:
  12383.     writetext UnknownText_0x189cdf
  12384.     closetext
  12385.     loadmovesprites
  12386.     winlosstext UnknownText_0x189df4, $0000
  12387.     loadtrainer SABRINA, 1
  12388.     startbattle
  12389.     returnafterbattle
  12390. @@ -39,7 +39,7 @@ SabrinaScript_0x189c2e:
  12391.     end
  12392.  
  12393.  TrainerMediumRebecca:
  12394.     trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, $0000, MediumRebeccaScript
  12395.  
  12396.  MediumRebeccaScript:
  12397.     talkaftercancel
  12398. @@ -50,7 +50,7 @@ MediumRebeccaScript:
  12399.     end
  12400.  
  12401.  TrainerPsychicFranklin:
  12402.     trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, $0000, PsychicFranklinScript
  12403.  
  12404.  PsychicFranklinScript:
  12405.     talkaftercancel
  12406. @@ -61,7 +61,7 @@ PsychicFranklinScript:
  12407.     end
  12408.  
  12409.  TrainerMediumDoris:
  12410.     trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, $0000, MediumDorisScript
  12411.  
  12412.  MediumDorisScript:
  12413.     talkaftercancel
  12414. @@ -72,7 +72,7 @@ MediumDorisScript:
  12415.     end
  12416.  
  12417.  TrainerPsychicJared:
  12418.     trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, $0000, PsychicJaredScript
  12419.  
  12420.  PsychicJaredScript:
  12421.     talkaftercancel
  12422. @@ -330,9 +330,9 @@ SaffronGym_MapEventHeader:
  12423.  
  12424.  .PersonEvents:
  12425.     db 6
  12426. -   person_event SPRITE_SABRINA, 8, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SabrinaScript_0x189c2e, -1
  12427. -   person_event SPRITE_GRANNY, 16, 17, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerMediumRebecca, -1
  12428. -   person_event SPRITE_YOUNGSTER, 16, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicFranklin, -1
  12429. -   person_event SPRITE_GRANNY, 4, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerMediumDoris, -1
  12430. -   person_event SPRITE_YOUNGSTER, 4, 17, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPsychicJared, -1
  12431. -   person_event SPRITE_GYM_GUY, 14, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SaffronGymGuyScript, -1
  12432. +   person_event SPRITE_SABRINA, 8, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SabrinaScript_0x189c2e, -1
  12433. +   person_event SPRITE_GRANNY, 16, 17, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerMediumRebecca, -1
  12434. +   person_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPsychicFranklin, -1
  12435. +   person_event SPRITE_GRANNY, 4, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerMediumDoris, -1
  12436. +   person_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPsychicJared, -1
  12437. +   person_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SaffronGymGuyScript, -1
  12438. diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
  12439. index 6a68113..63d0f24 100644
  12440. --- a/maps/SaffronMart.asm
  12441. +++ b/maps/SaffronMart.asm
  12442. @@ -49,6 +49,6 @@ SaffronMart_MapEventHeader:
  12443.  
  12444.  .PersonEvents:
  12445.     db 3
  12446. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18a3bf, -1
  12447. -   person_event SPRITE_COOLTRAINER_M, 2, 7, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CooltrainerMScript_0x18a3c6, -1
  12448. -   person_event SPRITE_COOLTRAINER_F, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18a3c9, -1
  12449. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18a3bf, -1
  12450. +   person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CooltrainerMScript_0x18a3c6, -1
  12451. +   person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18a3c9, -1
  12452. diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm
  12453. index 125e796..4b957a3 100644
  12454. --- a/maps/SaffronPokeCenter1F.asm
  12455. +++ b/maps/SaffronPokeCenter1F.asm
  12456. @@ -123,7 +123,7 @@ SaffronPokeCenter1F_MapEventHeader:
  12457.  
  12458.  .PersonEvents:
  12459.     db 4
  12460. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18a47d, -1
  12461. -   person_event SPRITE_TEACHER, 2, 7, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x18a480, -1
  12462. -   person_event SPRITE_FISHER, 6, 8, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18a48c, -1
  12463. -   person_event SPRITE_YOUNGSTER, 4, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x18a4a0, -1
  12464. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18a47d, -1
  12465. +   person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x18a480, -1
  12466. +   person_event SPRITE_FISHER, 6, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18a48c, -1
  12467. +   person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x18a4a0, -1
  12468. diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm
  12469. index 55587b1..06306c6 100644
  12470. --- a/maps/SaffronTrainStation.asm
  12471. +++ b/maps/SaffronTrainStation.asm
  12472. @@ -3,7 +3,7 @@ SaffronTrainStation_MapScriptHeader:
  12473.     db 1
  12474.  
  12475.     ; triggers
  12476.     dw .Trigger1, $0000
  12477.  
  12478.  .MapCallbacks:
  12479.     db 0
  12480. @@ -231,7 +231,7 @@ SaffronTrainStation_MapEventHeader:
  12481.  
  12482.  .PersonEvents:
  12483.     db 4
  12484. -   person_event SPRITE_OFFICER, 9, 9, $6, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x18a81e, -1
  12485. -   person_event SPRITE_GYM_GUY, 14, 10, $2, 1, 1, -1, -1, 0, 0, 0, GymGuyScript_0x18a875, -1
  12486. -   person_event SPRITE_TEACHER, 11, 6, $9, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION
  12487. -   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
  12488. +   person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x18a81e, -1
  12489. +   person_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GymGuyScript_0x18a875, -1
  12490. +   person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION
  12491. +   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
  12492. diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
  12493. index 558a979..1e556ee 100644
  12494. --- a/maps/SeafoamGym.asm
  12495. +++ b/maps/SeafoamGym.asm
  12496. @@ -3,7 +3,7 @@ SeafoamGym_MapScriptHeader:
  12497.     db 1
  12498.  
  12499.     ; triggers
  12500.     dw UnknownScript_0x1ab4fa, $0000
  12501.  
  12502.  .MapCallbacks:
  12503.     db 0
  12504. @@ -19,7 +19,7 @@ BlaineScript_0x1ab4fb:
  12505.     writetext UnknownText_0x1ab548
  12506.     closetext
  12507.     loadmovesprites
  12508.     winlosstext UnknownText_0x1ab646, $0000
  12509.     loadtrainer BLAINE, 1
  12510.     startbattle
  12511.     iftrue .ReturnAfterBattle
  12512. @@ -171,5 +171,5 @@ SeafoamGym_MapEventHeader:
  12513.  
  12514.  .PersonEvents:
  12515.     db 2
  12516. -   person_event SPRITE_BLAINE, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BlaineScript_0x1ab4fb, -1
  12517. -   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
  12518. +   person_event SPRITE_BLAINE, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BlaineScript_0x1ab4fb, -1
  12519. +   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
  12520. diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
  12521. index 0acff40..e3fa187 100644
  12522. --- a/maps/SilphCo1F.asm
  12523. +++ b/maps/SilphCo1F.asm
  12524. @@ -68,5 +68,5 @@ SilphCo1F_MapEventHeader:
  12525.  
  12526.  .PersonEvents:
  12527.     db 2
  12528. -   person_event SPRITE_RECEPTIONIST, 2, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ReceptionistScript_0x18abe5, -1
  12529. -   person_event SPRITE_OFFICER, 1, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x18abe8, -1
  12530. +   person_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ReceptionistScript_0x18abe5, -1
  12531. +   person_event SPRITE_OFFICER, 1, 13, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x18abe8, -1
  12532. diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
  12533. index e421dd7..1b63a1b 100644
  12534. --- a/maps/SilverCaveItemRooms.asm
  12535. +++ b/maps/SilverCaveItemRooms.asm
  12536. @@ -28,5 +28,5 @@ SilverCaveItemRooms_MapEventHeader:
  12537.  
  12538.  .PersonEvents:
  12539.     db 2
  12540. -   person_event SPRITE_POKE_BALL, 3, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
  12541. -   person_event SPRITE_POKE_BALL, 11, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
  12542. +   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
  12543. +   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
  12544. diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm
  12545. index 1b53d49..2557e12 100644
  12546. --- a/maps/SilverCavePokeCenter1F.asm
  12547. +++ b/maps/SilverCavePokeCenter1F.asm
  12548. @@ -43,5 +43,5 @@ SilverCavePokeCenter1F_MapEventHeader:
  12549.  
  12550.  .PersonEvents:
  12551.     db 2
  12552. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ae59a, -1
  12553. -   person_event SPRITE_GRANNY, 5, 1, $8, 1, 2, -1, -1, 0, 0, 0, GrannyScript_0x1ae59d, -1
  12554. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ae59a, -1
  12555. +   person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEFN_08, 1, 2, -1, -1, 0, 0, 0, GrannyScript_0x1ae59d, -1
  12556. diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
  12557. index 97546a7..bc012df 100644
  12558. --- a/maps/SilverCaveRoom1.asm
  12559. +++ b/maps/SilverCaveRoom1.asm
  12560. @@ -44,7 +44,7 @@ SilverCaveRoom1_MapEventHeader:
  12561.  
  12562.  .PersonEvents:
  12563.     db 4
  12564. -   person_event SPRITE_POKE_BALL, 9, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
  12565. -   person_event SPRITE_POKE_BALL, 29, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
  12566. -   person_event SPRITE_POKE_BALL, 30, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
  12567. -   person_event SPRITE_POKE_BALL, 18, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
  12568. +   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
  12569. +   person_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
  12570. +   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
  12571. +   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
  12572. diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
  12573. index ff0e18d..5bb9ef9 100644
  12574. --- a/maps/SilverCaveRoom2.asm
  12575. +++ b/maps/SilverCaveRoom2.asm
  12576. @@ -38,6 +38,6 @@ SilverCaveRoom2_MapEventHeader:
  12577.  
  12578.  .PersonEvents:
  12579.     db 3
  12580. -   person_event SPRITE_POKE_BALL, 10, 24, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
  12581. -   person_event SPRITE_POKE_BALL, 24, 22, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
  12582. -   person_event SPRITE_POKE_BALL, 20, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP
  12583. +   person_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
  12584. +   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
  12585. +   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
  12586. diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
  12587. index 4b61090..2b0b11b 100644
  12588. --- a/maps/SilverCaveRoom3.asm
  12589. +++ b/maps/SilverCaveRoom3.asm
  12590. @@ -63,4 +63,4 @@ SilverCaveRoom3_MapEventHeader:
  12591.  
  12592.  .PersonEvents:
  12593.     db 1
  12594. -   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
  12595. +   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
  12596. diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
  12597. index 9ace60a..c62c9ca 100644
  12598. --- a/maps/SlowpokeWellB1F.asm
  12599. +++ b/maps/SlowpokeWellB1F.asm
  12600. @@ -9,7 +9,7 @@ KurtScript_0x5a5d5:
  12601.     jumptextfaceplayer UnknownText_0x5a6b5
  12602.  
  12603.  TrainerGruntM29:
  12604.     trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, $0000, GruntM29Script
  12605.  
  12606.  GruntM29Script:
  12607.     talkaftercancel
  12608. @@ -20,7 +20,7 @@ GruntM29Script:
  12609.     end
  12610.  
  12611.  TrainerGruntM1:
  12612.     trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, $0000, GruntM1Script
  12613.  
  12614.  GruntM1Script:
  12615.     loadfont
  12616. @@ -63,7 +63,7 @@ GruntM1Script:
  12617.     end
  12618.  
  12619.  TrainerGruntM2:
  12620.     trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, $0000, GruntM2Script
  12621.  
  12622.  GruntM2Script:
  12623.     talkaftercancel
  12624. @@ -74,7 +74,7 @@ GruntM2Script:
  12625.     end
  12626.  
  12627.  TrainerGruntF1:
  12628.     trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, $0000, GruntF1Script
  12629.  
  12630.  GruntF1Script:
  12631.     talkaftercancel
  12632. @@ -326,12 +326,12 @@ SlowpokeWellB1F_MapEventHeader:
  12633.  
  12634.  .PersonEvents:
  12635.     db 9
  12636. -   person_event SPRITE_ROCKET, 7, 15, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
  12637. -   person_event SPRITE_ROCKET, 2, 5, $6, 0, 0, -1, -1, 0, 2, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
  12638. -   person_event SPRITE_ROCKET, 6, 5, $9, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
  12639. -   person_event SPRITE_ROCKET_GIRL, 4, 10, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
  12640. -   person_event SPRITE_SLOWPOKE, 4, 7, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES
  12641. -   person_event SPRITE_SLOWPOKE, 2, 6, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES
  12642. -   person_event SPRITE_KURT, 14, 16, $7, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT
  12643. -   person_event SPRITE_BOULDER, 2, 3, $19, 0, 0, -1, -1, 0, 0, 0, SlowpokeWellB1FBoulder, -1
  12644. -   person_event SPRITE_POKE_BALL, 3, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
  12645. +   person_event SPRITE_ROCKET, 7, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
  12646. +   person_event SPRITE_ROCKET, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
  12647. +   person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 2, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
  12648. +   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
  12649. +   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
  12650. +   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
  12651. +   person_event SPRITE_KURT, 14, 16, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT
  12652. +   person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, SlowpokeWellB1FBoulder, -1
  12653. +   person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
  12654. diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
  12655. index fcf207b..d23b0c9 100644
  12656. --- a/maps/SlowpokeWellB2F.asm
  12657. +++ b/maps/SlowpokeWellB2F.asm
  12658. @@ -73,5 +73,5 @@ SlowpokeWellB2F_MapEventHeader:
  12659.  
  12660.  .PersonEvents:
  12661.     db 2
  12662. -   person_event SPRITE_GYM_GUY, 4, 5, $2, 2, 1, -1, -1, 0, 0, 1, GymGuyScript_0x5ad0b, -1
  12663. -   person_event SPRITE_POKE_BALL, 5, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
  12664. +   person_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 1, GymGuyScript_0x5ad0b, -1
  12665. +   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
  12666. diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
  12667. index f315a3b..6462f8b 100644
  12668. --- a/maps/SoulHouse.asm
  12669. +++ b/maps/SoulHouse.asm
  12670. @@ -83,7 +83,7 @@ SoulHouse_MapEventHeader:
  12671.  
  12672.  .PersonEvents:
  12673.     db 4
  12674. -   person_event SPRITE_GRAMPS, 2, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x7ec47, -1
  12675. -   person_event SPRITE_TEACHER, 3, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7ec4a, -1
  12676. -   person_event SPRITE_LASS, 5, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x7ec4d, -1
  12677. -   person_event SPRITE_GRANNY, 3, 1, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x7ec50, -1
  12678. +   person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x7ec47, -1
  12679. +   person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7ec4a, -1
  12680. +   person_event SPRITE_LASS, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x7ec4d, -1
  12681. +   person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x7ec50, -1
  12682. diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
  12683. index ee4eef4..ab460c3 100644
  12684. --- a/maps/SproutTower1F.asm
  12685. +++ b/maps/SproutTower1F.asm
  12686. @@ -18,7 +18,7 @@ TeacherScript_0x184507:
  12687.     jumptextfaceplayer UnknownText_0x18469d
  12688.  
  12689.  TrainerSageChow:
  12690.     trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, $0000, SageChowScript
  12691.  
  12692.  SageChowScript:
  12693.     talkaftercancel
  12694. @@ -116,9 +116,9 @@ SproutTower1F_MapEventHeader:
  12695.  
  12696.  .PersonEvents:
  12697.     db 6
  12698. -   person_event SPRITE_SAGE, 4, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageScript_0x1844fe, -1
  12699. -   person_event SPRITE_SAGE, 7, 6, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageScript_0x184501, -1
  12700. -   person_event SPRITE_GRANNY, 12, 11, $8, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x184504, -1
  12701. -   person_event SPRITE_TEACHER, 9, 9, $7, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x184507, -1
  12702. -   person_event SPRITE_SAGE, 5, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSageChow, -1
  12703. -   person_event SPRITE_POKE_BALL, 7, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
  12704. +   person_event SPRITE_SAGE, 4, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageScript_0x1844fe, -1
  12705. +   person_event SPRITE_SAGE, 7, 6, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageScript_0x184501, -1
  12706. +   person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x184504, -1
  12707. +   person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x184507, -1
  12708. +   person_event SPRITE_SAGE, 5, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSageChow, -1
  12709. +   person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
  12710. diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
  12711. index 946f57d..3fef9b0 100644
  12712. --- a/maps/SproutTower2F.asm
  12713. +++ b/maps/SproutTower2F.asm
  12714. @@ -6,7 +6,7 @@ SproutTower2F_MapScriptHeader:
  12715.     db 0
  12716.  
  12717.  TrainerSageNico:
  12718.     trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, $0000, SageNicoScript
  12719.  
  12720.  SageNicoScript:
  12721.     talkaftercancel
  12722. @@ -17,7 +17,7 @@ SageNicoScript:
  12723.     end
  12724.  
  12725.  TrainerSageEdmond:
  12726.     trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, $0000, SageEdmondScript
  12727.  
  12728.  SageEdmondScript:
  12729.     talkaftercancel
  12730. @@ -99,6 +99,6 @@ SproutTower2F_MapEventHeader:
  12731.  
  12732.  .PersonEvents:
  12733.     db 3
  12734. -   person_event SPRITE_SAGE, 3, 12, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSageNico, -1
  12735. -   person_event SPRITE_SAGE, 14, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSageEdmond, -1
  12736. -   person_event SPRITE_POKE_BALL, 1, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY
  12737. +   person_event SPRITE_SAGE, 3, 12, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerSageNico, -1
  12738. +   person_event SPRITE_SAGE, 14, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 5, TrainerSageEdmond, -1
  12739. +   person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY
  12740. diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
  12741. index 7656bde..165f31e 100644
  12742. --- a/maps/SproutTower3F.asm
  12743. +++ b/maps/SproutTower3F.asm
  12744. @@ -3,8 +3,8 @@ SproutTower3F_MapScriptHeader:
  12745.     db 2
  12746.  
  12747.     ; triggers
  12748.     dw UnknownScript_0x184945, $0000
  12749.     dw UnknownScript_0x184946, $0000
  12750.  
  12751.  .MapCallbacks:
  12752.     db 0
  12753. @@ -64,7 +64,7 @@ SageLiScript:
  12754.     writetext SageLiSeenText
  12755.     closetext
  12756.     loadmovesprites
  12757.     winlosstext SageLiBeatenText, $0000
  12758.     loadtrainer SAGE, LI
  12759.     startbattle
  12760.     returnafterbattle
  12761. @@ -86,7 +86,7 @@ UnknownScript_0x1849d1:
  12762.     end
  12763.  
  12764.  TrainerSageJin:
  12765.     trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, $0000, SageJinScript
  12766.  
  12767.  SageJinScript:
  12768.     talkaftercancel
  12769. @@ -97,7 +97,7 @@ SageJinScript:
  12770.     end
  12771.  
  12772.  TrainerSageTroy:
  12773.     trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, $0000, SageTroyScript
  12774.  
  12775.  SageTroyScript:
  12776.     talkaftercancel
  12777. @@ -108,7 +108,7 @@ SageTroyScript:
  12778.     end
  12779.  
  12780.  TrainerSageNeal:
  12781.     trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, $0000, SageNealScript
  12782.  
  12783.  SageNealScript:
  12784.     talkaftercancel
  12785. @@ -345,10 +345,10 @@ SproutTower3F_MapEventHeader:
  12786.  
  12787.  .PersonEvents:
  12788.     db 7
  12789. -   person_event SPRITE_SAGE, 13, 8, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSageJin, -1
  12790. -   person_event SPRITE_SAGE, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerSageTroy, -1
  12791. -   person_event SPRITE_SAGE, 2, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageLiScript, -1
  12792. -   person_event SPRITE_SAGE, 11, 11, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSageNeal, -1
  12793. -   person_event SPRITE_POKE_BALL, 14, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION
  12794. -   person_event SPRITE_POKE_BALL, 1, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
  12795. -   person_event SPRITE_SILVER, 4, 10, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
  12796. +   person_event SPRITE_SAGE, 13, 8, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSageJin, -1
  12797. +   person_event SPRITE_SAGE, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerSageTroy, -1
  12798. +   person_event SPRITE_SAGE, 2, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SageLiScript, -1
  12799. +   person_event SPRITE_SAGE, 11, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerSageNeal, -1
  12800. +   person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION
  12801. +   person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
  12802. +   person_event SPRITE_SILVER, 4, 10, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
  12803. diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
  12804. index 3f7f1f3..ed4f4d0 100644
  12805. --- a/maps/TeamRocketBaseB1F.asm
  12806. +++ b/maps/TeamRocketBaseB1F.asm
  12807. @@ -3,7 +3,7 @@ TeamRocketBaseB1F_MapScriptHeader:
  12808.     db 1
  12809.  
  12810.     ; triggers
  12811.     dw UnknownScript_0x6c65a, $0000
  12812.  
  12813.  .MapCallbacks:
  12814.     db 1
  12815. @@ -233,7 +233,7 @@ TrainerCameraGrunt1:
  12816.     writetext CameraGrunt1SeenText
  12817.     closetext
  12818.     loadmovesprites
  12819.     winlosstext CameraGrunt1BeatenText, $0000
  12820.     setlasttalked $2
  12821.     loadtrainer GRUNTM, 20
  12822.     startbattle
  12823. @@ -246,7 +246,7 @@ TrainerCameraGrunt2:
  12824.     writetext CameraGrunt2SeenText
  12825.     closetext
  12826.     loadmovesprites
  12827.     winlosstext CameraGrunt2BeatenText, $0000
  12828.     setlasttalked $2
  12829.     loadtrainer GRUNTM, 21
  12830.     startbattle
  12831. @@ -478,7 +478,7 @@ NoExplodingTrap:
  12832.     end
  12833.  
  12834.  TrainerScientistJed:
  12835.     trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, $0000, ScientistJedScript
  12836.  
  12837.  ScientistJedScript:
  12838.     talkaftercancel
  12839. @@ -489,7 +489,7 @@ ScientistJedScript:
  12840.     end
  12841.  
  12842.  TrainerGruntM16:
  12843.     trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, $0000, GruntM16Script
  12844.  
  12845.  GruntM16Script:
  12846.     talkaftercancel
  12847. @@ -786,9 +786,9 @@ TeamRocketBaseB1F_MapEventHeader:
  12848.  
  12849.  .PersonEvents:
  12850.     db 6
  12851. -   person_event SPRITE_ROCKET, 0, 0, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
  12852. -   person_event SPRITE_ROCKET, 4, 2, $9, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
  12853. -   person_event SPRITE_SCIENTIST, 12, 18, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
  12854. -   person_event SPRITE_POKE_BALL, 6, 27, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
  12855. -   person_event SPRITE_POKE_BALL, 15, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
  12856. -   person_event SPRITE_POKE_BALL, 12, 21, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
  12857. +   person_event SPRITE_ROCKET, 0, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
  12858. +   person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
  12859. +   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
  12860. +   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
  12861. +   person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
  12862. +   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
  12863. diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
  12864. index b6363cb..5cb4c58 100644
  12865. --- a/maps/TeamRocketBaseB2F.asm
  12866. +++ b/maps/TeamRocketBaseB2F.asm
  12867. @@ -3,10 +3,10 @@ TeamRocketBaseB2F_MapScriptHeader:
  12868.     db 4
  12869.  
  12870.     ; triggers
  12871.     dw UnknownScript_0x6cf85, $0000
  12872.     dw UnknownScript_0x6cf86, $0000
  12873.     dw UnknownScript_0x6cf87, $0000
  12874.     dw UnknownScript_0x6cf88, $0000
  12875.  
  12876.  .MapCallbacks:
  12877.     db 1
  12878. @@ -84,7 +84,7 @@ UnknownScript_0x6cfac:
  12879.     loadmovesprites
  12880.     applymovement $2, MovementData_0x6d24a
  12881.     applymovement $3, MovementData_0x6d248
  12882.     winlosstext UnknownText_0x6d45c, $0000
  12883.     setlasttalked $3
  12884.     loadtrainer EXECUTIVEF, 2
  12885.     startbattle
  12886. @@ -178,7 +178,7 @@ UnknownScript_0x6d0be:
  12887.     end
  12888.  
  12889.  TrainerGruntM17:
  12890.     trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, $0000, GruntM17Script
  12891.  
  12892.  GruntM17Script:
  12893.     talkaftercancel
  12894. @@ -189,7 +189,7 @@ GruntM17Script:
  12895.     end
  12896.  
  12897.  TrainerGruntM18:
  12898.     trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, $0000, GruntM18Script
  12899.  
  12900.  GruntM18Script:
  12901.     talkaftercancel
  12902. @@ -200,7 +200,7 @@ GruntM18Script:
  12903.     end
  12904.  
  12905.  TrainerGruntM19:
  12906.     trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, $0000, GruntM19Script
  12907.  
  12908.  GruntM19Script:
  12909.     talkaftercancel
  12910. @@ -952,17 +952,17 @@ TeamRocketBaseB2F_MapEventHeader:
  12911.  
  12912.  .PersonEvents:
  12913.     db 14
  12914. -   person_event SPRITE_ROCKET, 16, 20, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
  12915. -   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
  12916. -   person_event SPRITE_LANCE, 13, 5, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
  12917. -   person_event SPRITE_DRAGON, 13, 9, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
  12918. -   person_event SPRITE_VOLTORB, 5, 7, $16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d101, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
  12919. -   person_event SPRITE_VOLTORB, 7, 7, $16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d12c, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
  12920. -   person_event SPRITE_VOLTORB, 9, 7, $16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d157, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
  12921. -   person_event SPRITE_VOLTORB, 5, 22, $16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
  12922. -   person_event SPRITE_VOLTORB, 7, 22, $16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
  12923. -   person_event SPRITE_VOLTORB, 9, 22, $16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
  12924. -   person_event SPRITE_ROCKET, 13, 25, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
  12925. -   person_event SPRITE_ROCKET, 1, 4, $a, 0, 0, -1, -1, 0, 2, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
  12926. -   person_event SPRITE_ROCKET, 14, 21, $8, 0, 0, -1, -1, 0, 2, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
  12927. -   person_event SPRITE_POKE_BALL, 10, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6d20d, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
  12928. +   person_event SPRITE_ROCKET, 16, 20, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
  12929. +   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
  12930. +   person_event SPRITE_LANCE, 13, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
  12931. +   person_event SPRITE_DRAGON, 13, 9, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
  12932. +   person_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d101, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
  12933. +   person_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d12c, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
  12934. +   person_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, VoltorbScript_0x6d157, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
  12935. +   person_event SPRITE_VOLTORB, 5, 22, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
  12936. +   person_event SPRITE_VOLTORB, 7, 22, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
  12937. +   person_event SPRITE_VOLTORB, 9, 22, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
  12938. +   person_event SPRITE_ROCKET, 13, 25, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
  12939. +   person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, 0, 2, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
  12940. +   person_event SPRITE_ROCKET, 14, 21, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 2, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
  12941. +   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
  12942. diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
  12943. index 91b2a83..aed71a2 100644
  12944. --- a/maps/TeamRocketBaseB3F.asm
  12945. +++ b/maps/TeamRocketBaseB3F.asm
  12946. @@ -3,10 +3,10 @@ TeamRocketBaseB3F_MapScriptHeader:
  12947.     db 4
  12948.  
  12949.     ; triggers
  12950.     dw .Trigger1, $0000
  12951.     dw .Trigger2, $0000
  12952.     dw .Trigger3, $0000
  12953.     dw .Trigger4, $0000
  12954.  
  12955.  .MapCallbacks:
  12956.     db 1
  12957. @@ -91,7 +91,7 @@ UnknownScript_0x6e056:
  12958.     closetext
  12959.     loadmovesprites
  12960.     applymovement $3, MovementData_0x6e142
  12961.     winlosstext UnknownText_0x6e511, $0000
  12962.     setlasttalked $3
  12963.     loadtrainer EXECUTIVEM, 4
  12964.     startbattle
  12965. @@ -117,7 +117,7 @@ MoltresScript_0x6e091:
  12966.     end
  12967.  
  12968.  TrainerGruntF5:
  12969.     trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, $0000, GruntF5Script
  12970.  
  12971.  GruntF5Script:
  12972.     talkaftercancel
  12973. @@ -129,7 +129,7 @@ GruntF5Script:
  12974.     end
  12975.  
  12976.  TrainerGruntM28:
  12977.     trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, $0000, GruntM28Script
  12978.  
  12979.  GruntM28Script:
  12980.     talkaftercancel
  12981. @@ -141,7 +141,7 @@ GruntM28Script:
  12982.     end
  12983.  
  12984.  TrainerScientistRoss:
  12985.     trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, $0000, ScientistRossScript
  12986.  
  12987.  ScientistRossScript:
  12988.     talkaftercancel
  12989. @@ -152,7 +152,7 @@ ScientistRossScript:
  12990.     end
  12991.  
  12992.  TrainerScientistMitch:
  12993.     trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, $0000, ScientistMitchScript
  12994.  
  12995.  ScientistMitchScript:
  12996.     talkaftercancel
  12997. @@ -587,17 +587,17 @@ TeamRocketBaseB3F_MapEventHeader:
  12998.  
  12999.  .PersonEvents:
  13000.     db 14
  13001. -   person_event SPRITE_LANCE, 14, 25, $6, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
  13002. -   person_event SPRITE_ROCKET, 3, 8, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
  13003. -   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
  13004. -   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
  13005. -   person_event SPRITE_ROCKET, 14, 5, $a, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM28, EVENT_TEAM_ROCKET_BASE_POPULATION
  13006. -   person_event SPRITE_SCIENTIST, 11, 23, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION
  13007. -   person_event SPRITE_SCIENTIST, 15, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
  13008. -   person_event SPRITE_ROCKET, 14, 24, $6, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION
  13009. -   person_event SPRITE_SILVER, 5, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
  13010. -   person_event SPRITE_POKE_BALL, 12, 1, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
  13011. -   person_event SPRITE_POKE_BALL, 12, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e122, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
  13012. -   person_event SPRITE_POKE_BALL, 9, 28, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e124, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
  13013. -   person_event SPRITE_POKE_BALL, 2, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e126, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
  13014. -   person_event SPRITE_POKE_BALL, 10, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e128, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
  13015. +   person_event SPRITE_LANCE, 14, 25, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
  13016. +   person_event SPRITE_ROCKET, 3, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
  13017. +   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
  13018. +   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
  13019. +   person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM28, EVENT_TEAM_ROCKET_BASE_POPULATION
  13020. +   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
  13021. +   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
  13022. +   person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION
  13023. +   person_event SPRITE_SILVER, 5, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
  13024. +   person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
  13025. +   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
  13026. +   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
  13027. +   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
  13028. +   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
  13029. diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
  13030. index c568f3f..3231514 100644
  13031. --- a/maps/TimeCapsule.asm
  13032. +++ b/maps/TimeCapsule.asm
  13033. @@ -3,8 +3,8 @@ TimeCapsule_MapScriptHeader:
  13034.     db 2
  13035.  
  13036.     ; triggers
  13037.     dw .Trigger1, $0000
  13038.     dw .Trigger2, $0000
  13039.  
  13040.  .MapCallbacks:
  13041.     db 1
  13042. @@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader:
  13043.  
  13044.  .PersonEvents:
  13045.     db 2
  13046. -   person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
  13047. -   person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT
  13048. +   person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
  13049. +   person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT
  13050. diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
  13051. index f9bd586..a8b8e2b 100644
  13052. --- a/maps/TinTower1F.asm
  13053. +++ b/maps/TinTower1F.asm
  13054. @@ -3,8 +3,8 @@ TinTower1F_MapScriptHeader:
  13055.     db 2
  13056.  
  13057.     ; triggers
  13058.     dw UnknownScript_0x18502a, $0000
  13059.     dw UnknownScript_0x18502e, $0000
  13060.  
  13061.  .MapCallbacks:
  13062.     db 2
  13063. @@ -534,13 +534,13 @@ TinTower1F_MapEventHeader:
  13064.  
  13065.  .PersonEvents:
  13066.     db 10
  13067. -   person_event SPRITE_SUICUNE, 9, 9, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
  13068. -   person_event SPRITE_RAIKOU, 9, 7, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
  13069. -   person_event SPRITE_ENTEI, 9, 12, $1, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
  13070. -   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
  13071. -   person_event SPRITE_SAGE, 9, 5, $3, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13072. -   person_event SPRITE_SAGE, 11, 11, $3, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13073. -   person_event SPRITE_SAGE, 6, 14, $3, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13074. -   person_event SPRITE_SAGE, 2, 4, $4, 1, 0, -1, -1, 0, 0, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13075. -   person_event SPRITE_SAGE, 1, 9, $6, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13076. -   person_event SPRITE_SAGE, 2, 14, $5, 0, 1, -1, -1, 0, 0, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13077. +   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
  13078. +   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
  13079. +   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
  13080. +   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
  13081. +   person_event SPRITE_SAGE, 9, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13082. +   person_event SPRITE_SAGE, 11, 11, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13083. +   person_event SPRITE_SAGE, 6, 14, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1
  13084. +   person_event SPRITE_SAGE, 2, 4, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13085. +   person_event SPRITE_SAGE, 1, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13086. +   person_event SPRITE_SAGE, 2, 14, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2
  13087. diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
  13088. index 308dac3..5644439 100644
  13089. --- a/maps/TinTower3F.asm
  13090. +++ b/maps/TinTower3F.asm
  13091. @@ -25,4 +25,4 @@ TinTower3F_MapEventHeader:
  13092.  
  13093.  .PersonEvents:
  13094.     db 1
  13095. -   person_event SPRITE_POKE_BALL, 14, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL
  13096. +   person_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL
  13097. diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
  13098. index 9532ad7..ccecac1 100644
  13099. --- a/maps/TinTower4F.asm
  13100. +++ b/maps/TinTower4F.asm
  13101. @@ -38,6 +38,6 @@ TinTower4F_MapEventHeader:
  13102.  
  13103.  .PersonEvents:
  13104.     db 3
  13105. -   person_event SPRITE_POKE_BALL, 10, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL
  13106. -   person_event SPRITE_POKE_BALL, 14, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP
  13107. -   person_event SPRITE_POKE_BALL, 12, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
  13108. +   person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL
  13109. +   person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP
  13110. +   person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
  13111. diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
  13112. index 1425010..ea77e81 100644
  13113. --- a/maps/TinTower5F.asm
  13114. +++ b/maps/TinTower5F.asm
  13115. @@ -37,4 +37,4 @@ TinTower5F_MapEventHeader:
  13116.  
  13117.  .PersonEvents:
  13118.     db 1
  13119. -   person_event SPRITE_POKE_BALL, 9, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY
  13120. +   person_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY
  13121. diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
  13122. index 3084eea..6ba2c0e 100644
  13123. --- a/maps/TinTower6F.asm
  13124. +++ b/maps/TinTower6F.asm
  13125. @@ -25,4 +25,4 @@ TinTower6F_MapEventHeader:
  13126.  
  13127.  .PersonEvents:
  13128.     db 1
  13129. -   person_event SPRITE_POKE_BALL, 8, 8, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION
  13130. +   person_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION
  13131. diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
  13132. index 868539f..a38a182 100644
  13133. --- a/maps/TinTower7F.asm
  13134. +++ b/maps/TinTower7F.asm
  13135. @@ -28,4 +28,4 @@ TinTower7F_MapEventHeader:
  13136.  
  13137.  .PersonEvents:
  13138.     db 1
  13139. -   person_event SPRITE_POKE_BALL, 1, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE
  13140. +   person_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE
  13141. diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
  13142. index 59cce2a..3dfff24 100644
  13143. --- a/maps/TinTower8F.asm
  13144. +++ b/maps/TinTower8F.asm
  13145. @@ -35,6 +35,6 @@ TinTower8F_MapEventHeader:
  13146.  
  13147.  .PersonEvents:
  13148.     db 3
  13149. -   person_event SPRITE_POKE_BALL, 13, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET
  13150. -   person_event SPRITE_POKE_BALL, 6, 11, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER
  13151. -   person_event SPRITE_POKE_BALL, 1, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE
  13152. +   person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET
  13153. +   person_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER
  13154. +   person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE
  13155. diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
  13156. index c76deab..d2ee20e 100644
  13157. --- a/maps/TinTower9F.asm
  13158. +++ b/maps/TinTower9F.asm
  13159. @@ -38,4 +38,4 @@ TinTower9F_MapEventHeader:
  13160.  
  13161.  .PersonEvents:
  13162.     db 1
  13163. -   person_event SPRITE_POKE_BALL, 1, 9, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP
  13164. +   person_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP
  13165. diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
  13166. index f9aaa2f..705c8e7 100644
  13167. --- a/maps/TinTowerRoof.asm
  13168. +++ b/maps/TinTowerRoof.asm
  13169. @@ -60,4 +60,4 @@ TinTowerRoof_MapEventHeader:
  13170.  
  13171.  .PersonEvents:
  13172.     db 1
  13173. -   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
  13174. +   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
  13175. diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
  13176. index 7d6cc15..1c9db6c 100644
  13177. --- a/maps/TohjoFalls.asm
  13178. +++ b/maps/TohjoFalls.asm
  13179. @@ -25,4 +25,4 @@ TohjoFalls_MapEventHeader:
  13180.  
  13181.  .PersonEvents:
  13182.     db 1
  13183. -   person_event SPRITE_POKE_BALL, 6, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE
  13184. +   person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE
  13185. diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
  13186. index 8df21cb..38a9d2a 100644
  13187. --- a/maps/TradeCenter.asm
  13188. +++ b/maps/TradeCenter.asm
  13189. @@ -3,8 +3,8 @@ TradeCenter_MapScriptHeader:
  13190.     db 2
  13191.  
  13192.     ; triggers
  13193.     dw .Trigger1, $0000
  13194.     dw .Trigger2, $0000
  13195.  
  13196.  .MapCallbacks:
  13197.     db 1
  13198. @@ -73,5 +73,5 @@ TradeCenter_MapEventHeader:
  13199.  
  13200.  .PersonEvents:
  13201.     db 2
  13202. -   person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
  13203. -   person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
  13204. +   person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
  13205. +   person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
  13206. diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
  13207. index fbed606..a12748a 100644
  13208. --- a/maps/TrainerHouse1F.asm
  13209. +++ b/maps/TrainerHouse1F.asm
  13210. @@ -151,8 +151,8 @@ TrainerHouse1F_MapEventHeader:
  13211.  
  13212.  .PersonEvents:
  13213.     db 5
  13214. -   person_event SPRITE_RECEPTIONIST, 11, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x9af67, -1
  13215. -   person_event SPRITE_COOLTRAINER_M, 11, 7, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x9af6a, -1
  13216. -   person_event SPRITE_COOLTRAINER_F, 2, 6, $6, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9af6d, -1
  13217. -   person_event SPRITE_YOUNGSTER, 8, 4, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x9af70, -1
  13218. -   person_event SPRITE_GENTLEMAN, 4, 2, $9, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x9af73, -1
  13219. +   person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x9af67, -1
  13220. +   person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x9af6a, -1
  13221. +   person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEFN_06, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9af6d, -1
  13222. +   person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x9af70, -1
  13223. +   person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x9af73, -1
  13224. diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
  13225. index 7f58cdf..9f4136c 100644
  13226. --- a/maps/TrainerHouseB1F.asm
  13227. +++ b/maps/TrainerHouseB1F.asm
  13228. @@ -3,7 +3,7 @@ TrainerHouseB1F_MapScriptHeader:
  13229.     db 1
  13230.  
  13231.     ; triggers
  13232.     dw UnknownScript_0x9b38a, $0000
  13233.  
  13234.  .MapCallbacks:
  13235.     db 0
  13236. @@ -42,14 +42,14 @@ UnknownScript_0x9b3aa:
  13237.     loadmovesprites
  13238.     special SpecialTrainerHouse
  13239.     iffalse UnknownScript_0x9b3dc
  13240.     winlosstext UnknownText_0x9b578, $0000
  13241.     setlasttalked $3
  13242.     loadtrainer CAL, CAL2
  13243.     startbattle
  13244.     returnafterbattle
  13245.     iffalse UnknownScript_0x9b3e8
  13246.  UnknownScript_0x9b3dc:
  13247.     winlosstext UnknownText_0x9b578, $0000
  13248.     setlasttalked $3
  13249.     loadtrainer CAL, CAL3
  13250.     startbattle
  13251. @@ -184,5 +184,5 @@ TrainerHouseB1F_MapEventHeader:
  13252.  
  13253.  .PersonEvents:
  13254.     db 2
  13255. -   person_event SPRITE_RECEPTIONIST, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
  13256. -   person_event SPRITE_CHRIS, 11, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, -1
  13257. +   person_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
  13258. +   person_event SPRITE_CHRIS, 11, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, -1
  13259. diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm
  13260. index 63222b8..f826534 100644
  13261. --- a/maps/UndergroundPathSwitchRoomEntrances.asm
  13262. +++ b/maps/UndergroundPathSwitchRoomEntrances.asm
  13263. @@ -3,8 +3,8 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader:
  13264.     db 2
  13265.  
  13266.     ; triggers
  13267.     dw UnknownScript_0x7c9f5, $0000
  13268.     dw UnknownScript_0x7c9f6, $0000
  13269.  
  13270.  .MapCallbacks:
  13271.     db 1
  13272. @@ -166,7 +166,7 @@ UnknownScript_0x7cb29:
  13273.     end
  13274.  
  13275.  TrainerGruntM11:
  13276.     trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, $0000, GruntM11Script
  13277.  
  13278.  GruntM11Script:
  13279.     talkaftercancel
  13280. @@ -177,7 +177,7 @@ GruntM11Script:
  13281.     end
  13282.  
  13283.  TrainerGruntM25:
  13284.     trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, $0000, GruntM25Script
  13285.  
  13286.  GruntM25Script:
  13287.     talkaftercancel
  13288. @@ -188,7 +188,7 @@ GruntM25Script:
  13289.     end
  13290.  
  13291.  TrainerBurglarDuncan:
  13292.     trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, $0000, BurglarDuncanScript
  13293.  
  13294.  BurglarDuncanScript:
  13295.     talkaftercancel
  13296. @@ -199,7 +199,7 @@ BurglarDuncanScript:
  13297.     end
  13298.  
  13299.  TrainerBurglarEddie:
  13300.     trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, $0000, BurglarEddieScript
  13301.  
  13302.  BurglarEddieScript:
  13303.     talkaftercancel
  13304. @@ -210,7 +210,7 @@ BurglarEddieScript:
  13305.     end
  13306.  
  13307.  TrainerGruntM13:
  13308.     trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, $0000, GruntM13Script
  13309.  
  13310.  GruntM13Script:
  13311.     talkaftercancel
  13312. @@ -221,7 +221,7 @@ GruntM13Script:
  13313.     end
  13314.  
  13315.  TrainerGruntF3:
  13316.     trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, $0000, GruntF3Script
  13317.  
  13318.  GruntF3Script:
  13319.     talkaftercancel
  13320. @@ -923,14 +923,14 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
  13321.  
  13322.  .PersonEvents:
  13323.     db 11
  13324. -   person_event SPRITE_PHARMACIST, 12, 9, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13325. -   person_event SPRITE_PHARMACIST, 8, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13326. -   person_event SPRITE_ROCKET, 2, 17, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13327. -   person_event SPRITE_ROCKET, 2, 11, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13328. -   person_event SPRITE_ROCKET, 2, 3, $6, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13329. -   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
  13330. -   person_event SPRITE_TEACHER, 27, 3, $6, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x7ca7d, -1
  13331. -   person_event SPRITE_SUPER_NERD, 27, 19, $6, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7ca7a, -1
  13332. -   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
  13333. -   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
  13334. -   person_event SPRITE_SILVER, 3, 23, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH
  13335. +   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
  13336. +   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
  13337. +   person_event SPRITE_ROCKET, 2, 17, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13338. +   person_event SPRITE_ROCKET, 2, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13339. +   person_event SPRITE_ROCKET, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13340. +   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
  13341. +   person_event SPRITE_TEACHER, 27, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x7ca7d, -1
  13342. +   person_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7ca7a, -1
  13343. +   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
  13344. +   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
  13345. +   person_event SPRITE_SILVER, 3, 23, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH
  13346. diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm
  13347. index 3f73eed..53aa2c0 100644
  13348. --- a/maps/UndergroundWarehouse.asm
  13349. +++ b/maps/UndergroundWarehouse.asm
  13350. @@ -30,7 +30,7 @@ UndergroundWarehouse_MapScriptHeader:
  13351.     return
  13352.  
  13353.  TrainerGruntM24:
  13354.     trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, $0000, GruntM24Script
  13355.  
  13356.  GruntM24Script:
  13357.     talkaftercancel
  13358. @@ -41,7 +41,7 @@ GruntM24Script:
  13359.     end
  13360.  
  13361.  TrainerGruntM14:
  13362.     trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, $0000, GruntM14Script
  13363.  
  13364.  GruntM14Script:
  13365.     talkaftercancel
  13366. @@ -52,7 +52,7 @@ GruntM14Script:
  13367.     end
  13368.  
  13369.  TrainerGruntM15:
  13370.     trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, $0000, GruntM15Script
  13371.  
  13372.  GruntM15Script:
  13373.     talkaftercancel
  13374. @@ -222,10 +222,10 @@ UndergroundWarehouse_MapEventHeader:
  13375.  
  13376.  .PersonEvents:
  13377.     db 7
  13378. -   person_event SPRITE_ROCKET, 8, 9, $7, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13379. -   person_event SPRITE_ROCKET, 15, 8, $7, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13380. -   person_event SPRITE_ROCKET, 3, 14, $9, 0, 0, -1, -1, 0, 2, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13381. -   person_event SPRITE_GENTLEMAN, 8, 12, $3, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13382. -   person_event SPRITE_POKE_BALL, 15, 18, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
  13383. -   person_event SPRITE_POKE_BALL, 9, 13, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
  13384. -   person_event SPRITE_POKE_BALL, 1, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
  13385. +   person_event SPRITE_ROCKET, 8, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13386. +   person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13387. +   person_event SPRITE_ROCKET, 3, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 2, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13388. +   person_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
  13389. +   person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
  13390. +   person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
  13391. +   person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
  13392. diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
  13393. index d663d2f..f5f9baa 100644
  13394. --- a/maps/UnionCave1F.asm
  13395. +++ b/maps/UnionCave1F.asm
  13396. @@ -6,7 +6,7 @@ UnionCave1F_MapScriptHeader:
  13397.     db 0
  13398.  
  13399.  TrainerPokemaniacLarry:
  13400.     trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, $0000, PokemaniacLarryScript
  13401.  
  13402.  PokemaniacLarryScript:
  13403.     talkaftercancel
  13404. @@ -17,7 +17,7 @@ PokemaniacLarryScript:
  13405.     end
  13406.  
  13407.  TrainerHikerRussell:
  13408.     trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, $0000, HikerRussellScript
  13409.  
  13410.  HikerRussellScript:
  13411.     talkaftercancel
  13412. @@ -28,7 +28,7 @@ HikerRussellScript:
  13413.     end
  13414.  
  13415.  TrainerHikerDaniel:
  13416.     trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, $0000, HikerDanielScript
  13417.  
  13418.  HikerDanielScript:
  13419.     talkaftercancel
  13420. @@ -39,7 +39,7 @@ HikerDanielScript:
  13421.     end
  13422.  
  13423.  TrainerFirebreatherBill:
  13424.     trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, $0000, FirebreatherBillScript
  13425.  
  13426.  FirebreatherBillScript:
  13427.     talkaftercancel
  13428. @@ -50,7 +50,7 @@ FirebreatherBillScript:
  13429.     end
  13430.  
  13431.  TrainerFirebreatherRay:
  13432.     trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, $0000, FirebreatherRayScript
  13433.  
  13434.  FirebreatherRayScript:
  13435.     talkaftercancel
  13436. @@ -207,12 +207,12 @@ UnionCave1F_MapEventHeader:
  13437.  
  13438.  .PersonEvents:
  13439.     db 9
  13440. -   person_event SPRITE_POKEFAN_M, 6, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerDaniel, -1
  13441. -   person_event SPRITE_SUPER_NERD, 21, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacLarry, -1
  13442. -   person_event SPRITE_POKEFAN_M, 8, 11, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerRussell, -1
  13443. -   person_event SPRITE_FISHER, 27, 15, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerFirebreatherRay, -1
  13444. -   person_event SPRITE_FISHER, 19, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerFirebreatherBill, -1
  13445. -   person_event SPRITE_POKE_BALL, 21, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL
  13446. -   person_event SPRITE_POKE_BALL, 2, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK
  13447. -   person_event SPRITE_POKE_BALL, 17, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION
  13448. -   person_event SPRITE_POKE_BALL, 33, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING
  13449. +   person_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerHikerDaniel, -1
  13450. +   person_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacLarry, -1
  13451. +   person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerHikerRussell, -1
  13452. +   person_event SPRITE_FISHER, 27, 15, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerFirebreatherRay, -1
  13453. +   person_event SPRITE_FISHER, 19, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerFirebreatherBill, -1
  13454. +   person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL
  13455. +   person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK
  13456. +   person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION
  13457. +   person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING
  13458. diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
  13459. index 44f6669..14439c8 100644
  13460. --- a/maps/UnionCaveB1F.asm
  13461. +++ b/maps/UnionCaveB1F.asm
  13462. @@ -6,7 +6,7 @@ UnionCaveB1F_MapScriptHeader:
  13463.     db 0
  13464.  
  13465.  TrainerPokemaniacAndrew:
  13466.     trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, $0000, PokemaniacAndrewScript
  13467.  
  13468.  PokemaniacAndrewScript:
  13469.     talkaftercancel
  13470. @@ -17,7 +17,7 @@ PokemaniacAndrewScript:
  13471.     end
  13472.  
  13473.  TrainerPokemaniacCalvin:
  13474.     trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, $0000, PokemaniacCalvinScript
  13475.  
  13476.  PokemaniacCalvinScript:
  13477.     talkaftercancel
  13478. @@ -28,7 +28,7 @@ PokemaniacCalvinScript:
  13479.     end
  13480.  
  13481.  TrainerHikerPhillip:
  13482.     trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, $0000, HikerPhillipScript
  13483.  
  13484.  HikerPhillipScript:
  13485.     talkaftercancel
  13486. @@ -39,7 +39,7 @@ HikerPhillipScript:
  13487.     end
  13488.  
  13489.  TrainerHikerLeonard:
  13490.     trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, $0000, HikerLeonardScript
  13491.  
  13492.  HikerLeonardScript:
  13493.     talkaftercancel
  13494. @@ -163,10 +163,10 @@ UnionCaveB1F_MapEventHeader:
  13495.  
  13496.  .PersonEvents:
  13497.     db 7
  13498. -   person_event SPRITE_POKEFAN_M, 4, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerPhillip, -1
  13499. -   person_event SPRITE_POKEFAN_M, 7, 16, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerLeonard, -1
  13500. -   person_event SPRITE_SUPER_NERD, 32, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacAndrew, -1
  13501. -   person_event SPRITE_SUPER_NERD, 30, 17, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacCalvin, -1
  13502. -   person_event SPRITE_POKE_BALL, 16, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT
  13503. -   person_event SPRITE_BOULDER, 10, 7, $19, 0, 0, -1, -1, 0, 0, 0, UnionCaveB1FBoulder, -1
  13504. -   person_event SPRITE_POKE_BALL, 23, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND
  13505. +   person_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerPhillip, -1
  13506. +   person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerHikerLeonard, -1
  13507. +   person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacAndrew, -1
  13508. +   person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacCalvin, -1
  13509. +   person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT
  13510. +   person_event SPRITE_BOULDER, 10, 7, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, UnionCaveB1FBoulder, -1
  13511. +   person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND
  13512. diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
  13513. index 34f0b61..bce92a4 100644
  13514. --- a/maps/UnionCaveB2F.asm
  13515. +++ b/maps/UnionCaveB2F.asm
  13516. @@ -33,7 +33,7 @@ SurfScript_0x5a31f:
  13517.     end
  13518.  
  13519.  TrainerCooltrainermNick:
  13520.     trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, $0000, CooltrainermNickScript
  13521.  
  13522.  CooltrainermNickScript:
  13523.     talkaftercancel
  13524. @@ -44,7 +44,7 @@ CooltrainermNickScript:
  13525.     end
  13526.  
  13527.  TrainerCooltrainerfGwen:
  13528.     trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, $0000, CooltrainerfGwenScript
  13529.  
  13530.  CooltrainerfGwenScript:
  13531.     talkaftercancel
  13532. @@ -55,7 +55,7 @@ CooltrainerfGwenScript:
  13533.     end
  13534.  
  13535.  TrainerCooltrainerfEmma:
  13536.     trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, $0000, CooltrainerfEmmaScript
  13537.  
  13538.  CooltrainerfEmmaScript:
  13539.     talkaftercancel
  13540. @@ -152,9 +152,9 @@ UnionCaveB2F_MapEventHeader:
  13541.  
  13542.  .PersonEvents:
  13543.     db 6
  13544. -   person_event SPRITE_ROCKER, 19, 15, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermNick, -1
  13545. -   person_event SPRITE_COOLTRAINER_F, 13, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfGwen, -1
  13546. -   person_event SPRITE_COOLTRAINER_F, 30, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfEmma, -1
  13547. -   person_event SPRITE_POKE_BALL, 2, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER
  13548. -   person_event SPRITE_POKE_BALL, 19, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION
  13549. -   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
  13550. +   person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermNick, -1
  13551. +   person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfGwen, -1
  13552. +   person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfEmma, -1
  13553. +   person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER
  13554. +   person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION
  13555. +   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
  13556. diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
  13557. index aeb998a..9f965d9 100644
  13558. --- a/maps/VermilionCity.asm
  13559. +++ b/maps/VermilionCity.asm
  13560. @@ -294,9 +294,9 @@ VermilionCity_MapEventHeader:
  13561.  
  13562.  .PersonEvents:
  13563.     db 6
  13564. -   person_event SPRITE_TEACHER, 9, 18, $2, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x1aa983, -1
  13565. -   person_event SPRITE_GRAMPS, 6, 23, $9, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1aa986, -1
  13566. -   person_event SPRITE_MACHOP, 7, 26, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, VermilionMachop, -1
  13567. -   person_event SPRITE_SUPER_NERD, 16, 14, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x1aa99b, -1
  13568. -   person_event SPRITE_BIG_SNORLAX, 8, 34, $15, 0, 0, -1, -1, 0, 0, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
  13569. -   person_event SPRITE_POKEFAN_M, 12, 31, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, VermilionGymBadgeGuy, -1
  13570. +   person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x1aa983, -1
  13571. +   person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1aa986, -1
  13572. +   person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, VermilionMachop, -1
  13573. +   person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x1aa99b, -1
  13574. +   person_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEFN_15, 0, 0, -1, -1, 0, 0, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
  13575. +   person_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, VermilionGymBadgeGuy, -1
  13576. diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
  13577. index 911f1e6..bee3656 100644
  13578. --- a/maps/VermilionGym.asm
  13579. +++ b/maps/VermilionGym.asm
  13580. @@ -13,7 +13,7 @@ SurgeScript_0x1920a5:
  13581.     writetext UnknownText_0x192142
  13582.     closetext
  13583.     loadmovesprites
  13584.     winlosstext UnknownText_0x192238, $0000
  13585.     loadtrainer LT_SURGE, 1
  13586.     startbattle
  13587.     returnafterbattle
  13588. @@ -38,7 +38,7 @@ SurgeScript_0x1920a5:
  13589.     end
  13590.  
  13591.  TrainerGentlemanGregory:
  13592.     trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, $0000, GentlemanGregoryScript
  13593.  
  13594.  GentlemanGregoryScript:
  13595.     talkaftercancel
  13596. @@ -49,7 +49,7 @@ GentlemanGregoryScript:
  13597.     end
  13598.  
  13599.  TrainerGuitaristVincent:
  13600.     trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, $0000, GuitaristVincentScript
  13601.  
  13602.  GuitaristVincentScript:
  13603.     talkaftercancel
  13604. @@ -60,7 +60,7 @@ GuitaristVincentScript:
  13605.     end
  13606.  
  13607.  TrainerJugglerHorton:
  13608.     trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, $0000, JugglerHortonScript
  13609.  
  13610.  JugglerHortonScript:
  13611.     talkaftercancel
  13612. @@ -287,8 +287,8 @@ VermilionGym_MapEventHeader:
  13613.  
  13614.  .PersonEvents:
  13615.     db 5
  13616. -   person_event SPRITE_SURGE, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SurgeScript_0x1920a5, -1
  13617. -   person_event SPRITE_GENTLEMAN, 8, 8, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerGentlemanGregory, -1
  13618. -   person_event SPRITE_ROCKER, 7, 4, $6, 0, 3, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerGuitaristVincent, -1
  13619. -   person_event SPRITE_SUPER_NERD, 10, 0, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerJugglerHorton, -1
  13620. -   person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, VermilionGymGuyScript, -1
  13621. +   person_event SPRITE_SURGE, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SurgeScript_0x1920a5, -1
  13622. +   person_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerGentlemanGregory, -1
  13623. +   person_event SPRITE_ROCKER, 7, 4, SPRITEMOVEFN_06, 0, 3, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerGuitaristVincent, -1
  13624. +   person_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerJugglerHorton, -1
  13625. +   person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 1, VermilionGymGuyScript, -1
  13626. diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
  13627. index 9aec5f3..e2f94d2 100644
  13628. --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
  13629. +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
  13630. @@ -34,4 +34,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader:
  13631.  
  13632.  .PersonEvents:
  13633.     db 1
  13634. -   person_event SPRITE_GENTLEMAN, 3, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x192031, -1
  13635. +   person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x192031, -1
  13636. diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm
  13637. index 0081bac..08f516f 100644
  13638. --- a/maps/VermilionHouseFishingSpeechHouse.asm
  13639. +++ b/maps/VermilionHouseFishingSpeechHouse.asm
  13640. @@ -65,4 +65,4 @@ VermilionHouseFishingSpeechHouse_MapEventHeader:
  13641.  
  13642.  .PersonEvents:
  13643.     db 1
  13644. -   person_event SPRITE_FISHING_GURU, 4, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingDude, -1
  13645. +   person_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingDude, -1
  13646. diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
  13647. index 6dbee12..3126726 100644
  13648. --- a/maps/VermilionMagnetTrainSpeechHouse.asm
  13649. +++ b/maps/VermilionMagnetTrainSpeechHouse.asm
  13650. @@ -48,5 +48,5 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader:
  13651.  
  13652.  .PersonEvents:
  13653.     db 2
  13654. -   person_event SPRITE_POKEFAN_F, 3, 2, $8, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x191eb7, -1
  13655. -   person_event SPRITE_YOUNGSTER, 3, 0, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x191eba, -1
  13656. +   person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, PokefanFScript_0x191eb7, -1
  13657. +   person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x191eba, -1
  13658. diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
  13659. index 21ea465..3070ce0 100644
  13660. --- a/maps/VermilionMart.asm
  13661. +++ b/maps/VermilionMart.asm
  13662. @@ -48,6 +48,6 @@ VermilionMart_MapEventHeader:
  13663.  
  13664.  .PersonEvents:
  13665.     db 3
  13666. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x191f7e, -1
  13667. -   person_event SPRITE_SUPER_NERD, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x191f85, -1
  13668. -   person_event SPRITE_BUENA, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x191f88, -1
  13669. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x191f7e, -1
  13670. +   person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x191f85, -1
  13671. +   person_event SPRITE_BUENA, 6, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x191f88, -1
  13672. diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm
  13673. index 428c85d..971ee27 100644
  13674. --- a/maps/VermilionPokeCenter1F.asm
  13675. +++ b/maps/VermilionPokeCenter1F.asm
  13676. @@ -88,7 +88,7 @@ VermilionPokeCenter1F_MapEventHeader:
  13677.  
  13678.  .PersonEvents:
  13679.     db 4
  13680. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x191603, -1
  13681. -   person_event SPRITE_FISHING_GURU, 2, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x191606, -1
  13682. -   person_event SPRITE_SAILOR, 5, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x19161a, -1
  13683. -   person_event SPRITE_BUG_CATCHER, 5, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x19161d, -1
  13684. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x191603, -1
  13685. +   person_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x191606, -1
  13686. +   person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x19161a, -1
  13687. +   person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x19161d, -1
  13688. diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
  13689. index 93543dc..0b9fcc1 100644
  13690. --- a/maps/VermilionPort.asm
  13691. +++ b/maps/VermilionPort.asm
  13692. @@ -3,8 +3,8 @@ VermilionPort_MapScriptHeader:
  13693.     db 2
  13694.  
  13695.     ; triggers
  13696.     dw .Trigger1, $0000
  13697.     dw .Trigger2, $0000
  13698.  
  13699.  .MapCallbacks:
  13700.     db 1
  13701. @@ -317,6 +317,6 @@ VermilionPort_MapEventHeader:
  13702.  
  13703.  .PersonEvents:
  13704.     db 3
  13705. -   person_event SPRITE_SAILOR, 17, 7, $7, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
  13706. -   person_event SPRITE_SAILOR, 11, 6, $9, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x74e97, -1
  13707. -   person_event SPRITE_SUPER_NERD, 11, 11, $5, 0, 2, -1, -1, 0, 0, 0, SuperNerdScript_0x74ee6, -1
  13708. +   person_event SPRITE_SAILOR, 17, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
  13709. +   person_event SPRITE_SAILOR, 11, 6, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, SailorScript_0x74e97, -1
  13710. +   person_event SPRITE_SUPER_NERD, 11, 11, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, SuperNerdScript_0x74ee6, -1
  13711. diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
  13712. index 2910622..a00fd5c 100644
  13713. --- a/maps/VermilionPortPassage.asm
  13714. +++ b/maps/VermilionPortPassage.asm
  13715. @@ -35,4 +35,4 @@ VermilionPortPassage_MapEventHeader:
  13716.  
  13717.  .PersonEvents:
  13718.     db 1
  13719. -   person_event SPRITE_TEACHER, 1, 17, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x7701a, -1
  13720. +   person_event SPRITE_TEACHER, 1, 17, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x7701a, -1
  13721. diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
  13722. index dbcfef7..b917d7a 100644
  13723. --- a/maps/VictoryRoad.asm
  13724. +++ b/maps/VictoryRoad.asm
  13725. @@ -3,8 +3,8 @@ VictoryRoad_MapScriptHeader:
  13726.     db 2
  13727.  
  13728.     ; triggers
  13729.     dw UnknownScript_0x74490, $0000
  13730.     dw UnknownScript_0x74491, $0000
  13731.  
  13732.  .MapCallbacks:
  13733.     db 0
  13734. @@ -263,9 +263,9 @@ VictoryRoad_MapEventHeader:
  13735.  
  13736.  .PersonEvents:
  13737.     db 6
  13738. -   person_event SPRITE_SILVER, 13, 18, $7, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
  13739. -   person_event SPRITE_POKE_BALL, 28, 3, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
  13740. -   person_event SPRITE_POKE_BALL, 48, 12, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE
  13741. -   person_event SPRITE_POKE_BALL, 29, 18, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE
  13742. -   person_event SPRITE_POKE_BALL, 48, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL
  13743. -   person_event SPRITE_POKE_BALL, 38, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP
  13744. +   person_event SPRITE_SILVER, 13, 18, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
  13745. +   person_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
  13746. +   person_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE
  13747. +   person_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE
  13748. +   person_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL
  13749. +   person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP
  13750. diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
  13751. index 8562ccf..6fc0843 100644
  13752. --- a/maps/VictoryRoadGate.asm
  13753. +++ b/maps/VictoryRoadGate.asm
  13754. @@ -3,8 +3,8 @@ VictoryRoadGate_MapScriptHeader:
  13755.     db 2
  13756.  
  13757.     ; triggers
  13758.     dw UnknownScript_0x9b9fb, $0000
  13759.     dw UnknownScript_0x9b9fc, $0000
  13760.  
  13761.  .MapCallbacks:
  13762.     db 0
  13763. @@ -118,6 +118,6 @@ VictoryRoadGate_MapEventHeader:
  13764.  
  13765.  .PersonEvents:
  13766.     db 3
  13767. -   person_event SPRITE_OFFICER, 11, 8, $9, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x9ba03, -1
  13768. -   person_event SPRITE_BLACK_BELT, 5, 7, $9, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER
  13769. -   person_event SPRITE_BLACK_BELT, 5, 12, $8, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX
  13770. +   person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x9ba03, -1
  13771. +   person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER
  13772. +   person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX
  13773. diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
  13774. index 18207d9..1e6ff89 100644
  13775. --- a/maps/VioletCity.asm
  13776. +++ b/maps/VioletCity.asm
  13777. @@ -301,11 +301,11 @@ VioletCity_MapEventHeader:
  13778.  
  13779.  .PersonEvents:
  13780.     db 8
  13781. -   person_event SPRITE_FISHER, 16, 13, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a83bb, EVENT_VIOLET_CITY_EARL
  13782. -   person_event SPRITE_LASS, 28, 28, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x1a8403, -1
  13783. -   person_event SPRITE_SUPER_NERD, 14, 24, $2, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a8406, -1
  13784. -   person_event SPRITE_GRAMPS, 20, 17, $5, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a8409, -1
  13785. -   person_event SPRITE_YOUNGSTER, 18, 5, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a840c, -1
  13786. -   person_event SPRITE_FRUIT_TREE, 29, 14, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8425, -1
  13787. -   person_event SPRITE_POKE_BALL, 1, 4, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP
  13788. -   person_event SPRITE_POKE_BALL, 5, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY
  13789. +   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
  13790. +   person_event SPRITE_LASS, 28, 28, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x1a8403, -1
  13791. +   person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEFN_02, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a8406, -1
  13792. +   person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a8409, -1
  13793. +   person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a840c, -1
  13794. +   person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x1a8425, -1
  13795. +   person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP
  13796. +   person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY
  13797. diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
  13798. index a3b0515..4654f1f 100644
  13799. --- a/maps/VioletGym.asm
  13800. +++ b/maps/VioletGym.asm
  13801. @@ -13,7 +13,7 @@ FalknerScript_0x683c2:
  13802.     writetext UnknownText_0x68473
  13803.     closetext
  13804.     loadmovesprites
  13805.     winlosstext UnknownText_0x6854a, $0000
  13806.     loadtrainer FALKNER, 1
  13807.     startbattle
  13808.     returnafterbattle
  13809. @@ -61,7 +61,7 @@ VioletGymTriggerRockets:
  13810.     jumpstd radiotowerrockets
  13811.  
  13812.  TrainerBird_keeperRod:
  13813.     trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, $0000, Bird_keeperRodScript
  13814.  
  13815.  Bird_keeperRodScript:
  13816.     talkaftercancel
  13817. @@ -72,7 +72,7 @@ Bird_keeperRodScript:
  13818.     end
  13819.  
  13820.  TrainerBird_keeperAbe:
  13821.     trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, $0000, Bird_keeperAbeScript
  13822.  
  13823.  Bird_keeperAbeScript:
  13824.     talkaftercancel
  13825. @@ -294,7 +294,7 @@ VioletGym_MapEventHeader:
  13826.  
  13827.  .PersonEvents:
  13828.     db 4
  13829. -   person_event SPRITE_FALKNER, 1, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FalknerScript_0x683c2, -1
  13830. -   person_event SPRITE_YOUNGSTER, 6, 7, $8, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperRod, -1
  13831. -   person_event SPRITE_YOUNGSTER, 10, 2, $9, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperAbe, -1
  13832. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, VioletGymGuyScript, -1
  13833. +   person_event SPRITE_FALKNER, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FalknerScript_0x683c2, -1
  13834. +   person_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEFN_08, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperRod, -1
  13835. +   person_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEFN_09, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperAbe, -1
  13836. +   person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, VioletGymGuyScript, -1
  13837. diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
  13838. index cd878e8..1c63cae 100644
  13839. --- a/maps/VioletMart.asm
  13840. +++ b/maps/VioletMart.asm
  13841. @@ -60,6 +60,6 @@ VioletMart_MapEventHeader:
  13842.  
  13843.  .PersonEvents:
  13844.     db 3
  13845. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x68295, -1
  13846. -   person_event SPRITE_GRANNY, 6, 7, $5, 0, 1, -1, -1, 0, 0, 0, GrannyScript_0x6829c, -1
  13847. -   person_event SPRITE_COOLTRAINER_M, 2, 5, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x6829f, -1
  13848. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x68295, -1
  13849. +   person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GrannyScript_0x6829c, -1
  13850. +   person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x6829f, -1
  13851. diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
  13852. index 5447e30..232dca2 100644
  13853. --- a/maps/VioletNicknameSpeechHouse.asm
  13854. +++ b/maps/VioletNicknameSpeechHouse.asm
  13855. @@ -56,6 +56,6 @@ VioletNicknameSpeechHouse_MapEventHeader:
  13856.  
  13857.  .PersonEvents:
  13858.     db 3
  13859. -   person_event SPRITE_TEACHER, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x693e9, -1
  13860. -   person_event SPRITE_LASS, 4, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x693ec, -1
  13861. -   person_event SPRITE_BIRD, 2, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BirdScript_0x693ef, -1
  13862. +   person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x693e9, -1
  13863. +   person_event SPRITE_LASS, 4, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x693ec, -1
  13864. +   person_event SPRITE_BIRD, 2, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BirdScript_0x693ef, -1
  13865. diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm
  13866. index 134c561..cef27de 100644
  13867. --- a/maps/VioletOnixTradeHouse.asm
  13868. +++ b/maps/VioletOnixTradeHouse.asm
  13869. @@ -45,5 +45,5 @@ VioletOnixTradeHouse_MapEventHeader:
  13870.  
  13871.  .PersonEvents:
  13872.     db 2
  13873. -   person_event SPRITE_POKEFAN_M, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x6998d, -1
  13874. -   person_event SPRITE_YOUNGSTER, 5, 6, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x69990, -1
  13875. +   person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x6998d, -1
  13876. +   person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x69990, -1
  13877. diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm
  13878. index 3172efb..253c6b5 100644
  13879. --- a/maps/VioletPokeCenter1F.asm
  13880. +++ b/maps/VioletPokeCenter1F.asm
  13881. @@ -226,8 +226,8 @@ VioletPokeCenter1F_MapEventHeader:
  13882.  
  13883.  .PersonEvents:
  13884.     db 5
  13885. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x694c9, -1
  13886. -   person_event SPRITE_GAMEBOY_KID, 6, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GameboyKidScript_0x69540, -1
  13887. -   person_event SPRITE_GENTLEMAN, 4, 1, $3, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x69543, -1
  13888. -   person_event SPRITE_YOUNGSTER, 1, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x69546, -1
  13889. -   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
  13890. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x694c9, -1
  13891. +   person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GameboyKidScript_0x69540, -1
  13892. +   person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x69543, -1
  13893. +   person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x69546, -1
  13894. +   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
  13895. diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
  13896. index 2ebd02c..763c308 100644
  13897. --- a/maps/ViridianCity.asm
  13898. +++ b/maps/ViridianCity.asm
  13899. @@ -237,7 +237,7 @@ ViridianCity_MapEventHeader:
  13900.  
  13901.  .PersonEvents:
  13902.     db 4
  13903. -   person_event SPRITE_GRAMPS, 5, 18, $2, 2, 2, -1, -1, 0, 0, 0, GrampsScript_0x1a9a4c, -1
  13904. -   person_event SPRITE_GRAMPS, 8, 30, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x1a9a61, -1
  13905. -   person_event SPRITE_FISHER, 23, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x1a9a75, -1
  13906. -   person_event SPRITE_YOUNGSTER, 21, 17, $2, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9a90, -1
  13907. +   person_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, GrampsScript_0x1a9a4c, -1
  13908. +   person_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x1a9a61, -1
  13909. +   person_event SPRITE_FISHER, 23, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x1a9a75, -1
  13910. +   person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEFN_02, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9a90, -1
  13911. diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
  13912. index 2508938..8e8a54e 100644
  13913. --- a/maps/ViridianGym.asm
  13914. +++ b/maps/ViridianGym.asm
  13915. @@ -13,7 +13,7 @@ BlueScript_0x9aa26:
  13916.     writetext UnknownText_0x9aa7b
  13917.     closetext
  13918.     loadmovesprites
  13919.     winlosstext UnknownText_0x9abae, $0000
  13920.     loadtrainer BLUE, 1
  13921.     startbattle
  13922.     returnafterbattle
  13923. @@ -183,5 +183,5 @@ ViridianGym_MapEventHeader:
  13924.  
  13925.  .PersonEvents:
  13926.     db 2
  13927. -   person_event SPRITE_BLUE, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE
  13928. -   person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
  13929. +   person_event SPRITE_BLUE, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE
  13930. +   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
  13931. diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
  13932. index 8ca273c..1177c0c 100644
  13933. --- a/maps/ViridianMart.asm
  13934. +++ b/maps/ViridianMart.asm
  13935. @@ -48,6 +48,6 @@ ViridianMart_MapEventHeader:
  13936.  
  13937.  .PersonEvents:
  13938.     db 3
  13939. -   person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x9b5e7, -1
  13940. -   person_event SPRITE_LASS, 2, 7, $5, 0, 2, -1, -1, 0, 0, 0, LassScript_0x9b5ee, -1
  13941. -   person_event SPRITE_COOLTRAINER_M, 6, 1, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x9b5f1, -1
  13942. +   person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x9b5e7, -1
  13943. +   person_event SPRITE_LASS, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, LassScript_0x9b5ee, -1
  13944. +   person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x9b5f1, -1
  13945. diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
  13946. index c7aa1e0..6689a12 100644
  13947. --- a/maps/ViridianNicknameSpeechHouse.asm
  13948. +++ b/maps/ViridianNicknameSpeechHouse.asm
  13949. @@ -72,7 +72,7 @@ ViridianNicknameSpeechHouse_MapEventHeader:
  13950.  
  13951.  .PersonEvents:
  13952.     db 4
  13953. -   person_event SPRITE_POKEFAN_M, 4, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x9ae3a, -1
  13954. -   person_event SPRITE_LASS, 4, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9ae3d, -1
  13955. -   person_event SPRITE_MOLTRES, 2, 5, $16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MoltresScript_0x9ae40, -1
  13956. -   person_event SPRITE_GROWLITHE, 3, 6, $16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrowlitheScript_0x9ae4a, -1
  13957. +   person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x9ae3a, -1
  13958. +   person_event SPRITE_LASS, 4, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9ae3d, -1
  13959. +   person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEFN_16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MoltresScript_0x9ae40, -1
  13960. +   person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEFN_16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrowlitheScript_0x9ae4a, -1
  13961. diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm
  13962. index 1c44183..0fdac5a 100644
  13963. --- a/maps/ViridianPokeCenter1F.asm
  13964. +++ b/maps/ViridianPokeCenter1F.asm
  13965. @@ -83,7 +83,7 @@ ViridianPokeCenter1F_MapEventHeader:
  13966.  
  13967.  .PersonEvents:
  13968.     db 4
  13969. -   person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9b690, -1
  13970. -   person_event SPRITE_COOLTRAINER_M, 4, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x9b693, -1
  13971. -   person_event SPRITE_COOLTRAINER_F, 3, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerFScript_0x9b6a7, -1
  13972. -   person_event SPRITE_BUG_CATCHER, 6, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x9b6aa, -1
  13973. +   person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9b690, -1
  13974. +   person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x9b693, -1
  13975. +   person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerFScript_0x9b6a7, -1
  13976. +   person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugCatcherScript_0x9b6aa, -1
  13977. diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm
  13978. index 0d1b786..7bc4b8d 100644
  13979. --- a/maps/WarehouseEntrance.asm
  13980. +++ b/maps/WarehouseEntrance.asm
  13981. @@ -105,7 +105,7 @@ WarehouseEntrance_MapScriptHeader:
  13982.     return
  13983.  
  13984.  TrainerSupernerdEric:
  13985.     trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, $0000, SupernerdEricScript
  13986.  
  13987.  SupernerdEricScript:
  13988.     talkaftercancel
  13989. @@ -116,7 +116,7 @@ SupernerdEricScript:
  13990.     end
  13991.  
  13992.  TrainerSupernerdTeru:
  13993.     trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, $0000, SupernerdTeruScript
  13994.  
  13995.  SupernerdTeruScript:
  13996.     talkaftercancel
  13997. @@ -127,7 +127,7 @@ SupernerdTeruScript:
  13998.     end
  13999.  
  14000.  TrainerPokemaniacIssac:
  14001.     trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, $0000, PokemaniacIssacScript
  14002.  
  14003.  PokemaniacIssacScript:
  14004.     talkaftercancel
  14005. @@ -138,7 +138,7 @@ PokemaniacIssacScript:
  14006.     end
  14007.  
  14008.  TrainerPokemaniacDonald:
  14009.     trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, $0000, PokemaniacDonaldScript
  14010.  
  14011.  PokemaniacDonaldScript:
  14012.     talkaftercancel
  14013. @@ -171,7 +171,7 @@ GrampsScript_0x7c146:
  14014.  .CheckMorn:
  14015.     checkmorn
  14016.     iffalse WarehouseEntranceScript_ShopClosed
  14017.     pokemart $2, $0000
  14018.     loadmovesprites
  14019.     end
  14020.  
  14021. @@ -669,12 +669,12 @@ WarehouseEntrance_MapEventHeader:
  14022.  
  14023.  .PersonEvents:
  14024.     db 9
  14025. -   person_event SPRITE_SUPER_NERD, 31, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdEric, -1
  14026. -   person_event SPRITE_SUPER_NERD, 9, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdTeru, -1
  14027. -   person_event SPRITE_SUPER_NERD, 27, 3, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacIssac, -1
  14028. -   person_event SPRITE_SUPER_NERD, 6, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacDonald, -1
  14029. -   person_event SPRITE_POKE_BALL, 25, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
  14030. -   person_event SPRITE_GRAMPS, 11, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS
  14031. -   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
  14032. -   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
  14033. -   person_event SPRITE_GRANNY, 21, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY
  14034. +   person_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerSupernerdEric, -1
  14035. +   person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerSupernerdTeru, -1
  14036. +   person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerPokemaniacIssac, -1
  14037. +   person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerPokemaniacDonald, -1
  14038. +   person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
  14039. +   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
  14040. +   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
  14041. +   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
  14042. +   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
  14043. diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
  14044. index bae2a02..70f4ee1 100644
  14045. --- a/maps/WhirlIslandB1F.asm
  14046. +++ b/maps/WhirlIslandB1F.asm
  14047. @@ -62,9 +62,9 @@ WhirlIslandB1F_MapEventHeader:
  14048.  
  14049.  .PersonEvents:
  14050.     db 6
  14051. -   person_event SPRITE_POKE_BALL, 13, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
  14052. -   person_event SPRITE_POKE_BALL, 18, 2, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS
  14053. -   person_event SPRITE_POKE_BALL, 23, 33, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM
  14054. -   person_event SPRITE_POKE_BALL, 8, 17, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET
  14055. -   person_event SPRITE_POKE_BALL, 26, 19, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
  14056. -   person_event SPRITE_BOULDER, 26, 23, $19, 0, 0, -1, -1, 0, 0, 0, WhirlIslandB1FBoulder, -1
  14057. +   person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
  14058. +   person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS
  14059. +   person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM
  14060. +   person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET
  14061. +   person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
  14062. +   person_event SPRITE_BOULDER, 26, 23, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, WhirlIslandB1FBoulder, -1
  14063. diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
  14064. index 091dc6f..d86648d 100644
  14065. --- a/maps/WhirlIslandB2F.asm
  14066. +++ b/maps/WhirlIslandB2F.asm
  14067. @@ -33,6 +33,6 @@ WhirlIslandB2F_MapEventHeader:
  14068.  
  14069.  .PersonEvents:
  14070.     db 3
  14071. -   person_event SPRITE_POKE_BALL, 11, 10, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
  14072. -   person_event SPRITE_POKE_BALL, 4, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
  14073. -   person_event SPRITE_POKE_BALL, 12, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
  14074. +   person_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
  14075. +   person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
  14076. +   person_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
  14077. diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
  14078. index e92fac7..c4dc628 100644
  14079. --- a/maps/WhirlIslandLugiaChamber.asm
  14080. +++ b/maps/WhirlIslandLugiaChamber.asm
  14081. @@ -59,4 +59,4 @@ WhirlIslandLugiaChamber_MapEventHeader:
  14082.  
  14083.  .PersonEvents:
  14084.     db 1
  14085. -   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
  14086. +   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
  14087. diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
  14088. index dce0357..2ba3274 100644
  14089. --- a/maps/WhirlIslandNE.asm
  14090. +++ b/maps/WhirlIslandNE.asm
  14091. @@ -26,4 +26,4 @@ WhirlIslandNE_MapEventHeader:
  14092.  
  14093.  .PersonEvents:
  14094.     db 1
  14095. -   person_event SPRITE_POKE_BALL, 11, 11, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
  14096. +   person_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
  14097. diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
  14098. index e8132d1..d688328 100644
  14099. --- a/maps/WhirlIslandSW.asm
  14100. +++ b/maps/WhirlIslandSW.asm
  14101. @@ -28,4 +28,4 @@ WhirlIslandSW_MapEventHeader:
  14102.  
  14103.  .PersonEvents:
  14104.     db 1
  14105. -   person_event SPRITE_POKE_BALL, 2, 15, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
  14106. +   person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
  14107. diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
  14108. index 6bc754d..28ad4df 100644
  14109. --- a/maps/WillsRoom.asm
  14110. +++ b/maps/WillsRoom.asm
  14111. @@ -3,8 +3,8 @@ WillsRoom_MapScriptHeader:
  14112.     db 2
  14113.  
  14114.     ; triggers
  14115.     dw UnknownScript_0x1804c6, $0000
  14116.     dw UnknownScript_0x1804ca, $0000
  14117.  
  14118.  .MapCallbacks:
  14119.     db 1
  14120. @@ -52,7 +52,7 @@ WillScript_0x1804f8:
  14121.     writetext UnknownText_0x180531
  14122.     closetext
  14123.     loadmovesprites
  14124.     winlosstext UnknownText_0x18062c, $0000
  14125.     loadtrainer WILL, 1
  14126.     startbattle
  14127.     returnafterbattle
  14128. @@ -148,4 +148,4 @@ WillsRoom_MapEventHeader:
  14129.  
  14130.  .PersonEvents:
  14131.     db 1
  14132. -   person_event SPRITE_WILL, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, WillScript_0x1804f8, -1
  14133. +   person_event SPRITE_WILL, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, WillScript_0x1804f8, -1
  14134. diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
  14135. index 783dd39..f7abb4f 100644
  14136. --- a/maps/WiseTriosRoom.asm
  14137. +++ b/maps/WiseTriosRoom.asm
  14138. @@ -3,8 +3,8 @@ WiseTriosRoom_MapScriptHeader:
  14139.     db 2
  14140.  
  14141.     ; triggers
  14142.     dw UnknownScript_0x98572, $0000
  14143.     dw UnknownScript_0x98573, $0000
  14144.  
  14145.  .MapCallbacks:
  14146.     db 1
  14147. @@ -66,7 +66,7 @@ UnknownScript_0x985a3:
  14148.     end
  14149.  
  14150.  TrainerSageGaku:
  14151.     trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, $0000, SageGakuScript
  14152.  
  14153.  SageGakuScript:
  14154.     loadfont
  14155. @@ -76,7 +76,7 @@ SageGakuScript:
  14156.     end
  14157.  
  14158.  TrainerSageMasa:
  14159.     trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, $0000, SageMasaScript
  14160.  
  14161.  SageMasaScript:
  14162.     loadfont
  14163. @@ -86,7 +86,7 @@ SageMasaScript:
  14164.     end
  14165.  
  14166.  TrainerSageKoji:
  14167.     trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, $0000, SageKojiScript
  14168.  
  14169.  SageKojiScript:
  14170.     checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
  14171. @@ -360,9 +360,9 @@ WiseTriosRoom_MapEventHeader:
  14172.  
  14173.  .PersonEvents:
  14174.     db 6
  14175. -   person_event SPRITE_SAGE, 2, 6, $3, 0, 0, -1, -1, 0, 0, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14176. -   person_event SPRITE_SAGE, 7, 6, $5, 0, 1, -1, -1, 0, 0, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14177. -   person_event SPRITE_SAGE, 5, 7, $8, 0, 0, -1, -1, 0, 0, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14178. -   person_event SPRITE_SAGE, 2, 4, $6, 0, 0, -1, -1, 0, 2, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14179. -   person_event SPRITE_SAGE, 6, 4, $7, 0, 0, -1, -1, 0, 2, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14180. -   person_event SPRITE_SAGE, 4, 6, $8, 0, 0, -1, -1, 0, 2, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14181. +   person_event SPRITE_SAGE, 2, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14182. +   person_event SPRITE_SAGE, 7, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14183. +   person_event SPRITE_SAGE, 5, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
  14184. +   person_event SPRITE_SAGE, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 2, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14185. +   person_event SPRITE_SAGE, 6, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 2, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14186. +   person_event SPRITE_SAGE, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 2, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
  14187. diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
  14188. index 6e9091f..b6c61ee 100644
  14189. --- a/misc/mobile_22_2.asm
  14190. +++ b/misc/mobile_22_2.asm
  14191. @@ -939,7 +939,7 @@ Function8b88c: ; 8b88c
  14192.     call Function8931b
  14193.     call Function8932d
  14194.     jr c, .asm_8b8a3
  14195.     ld hl, $0000
  14196.     add hl, bc
  14197.     ld d, h
  14198.     ld e, l
  14199. diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
  14200. index b6664ca..0de6c5c 100644
  14201. --- a/misc/mobile_40.asm
  14202. +++ b/misc/mobile_40.asm
  14203. @@ -246,17 +246,17 @@ Function10016f: ; 10016f
  14204.  
  14205.  .asm_1001af
  14206.     ld a, $d7
  14207.     ld de, $0000
  14208.     jr .asm_1001d7
  14209.  
  14210.  .asm_1001b6
  14211.     ld a, $d5
  14212.     ld de, $0000
  14213.     jr .asm_1001d7
  14214.  
  14215.  .asm_1001bd
  14216.     ld a, $d6
  14217.     ld de, $0000
  14218.     jr .asm_1001d7
  14219.  
  14220.  .asm_1001c4
  14221. @@ -271,7 +271,7 @@ Function10016f: ; 10016f
  14222.  
  14223.  .asm_1001d2
  14224.     ld a, $d0
  14225.     ld de, $0000
  14226.  
  14227.  .asm_1001d7
  14228.     ld [wc300], a
  14229. @@ -645,7 +645,7 @@ Function100406: ; 100406
  14230.  Function10043a: ; 10043a
  14231.     push hl
  14232.     push bc
  14233.     ld de, $0000
  14234.  .asm_10043f
  14235.     ld a, [hli]
  14236.     add e
  14237. @@ -3636,7 +3636,7 @@ Function10177b: ; 10177b
  14238.     ld c, a
  14239.     ld b, $0
  14240.     ld a, [wcd3a]
  14241.     ld hl, $0000
  14242.     call AddNTimes
  14243.     ld e, l
  14244.     ld d, h
  14245. @@ -6666,7 +6666,7 @@ Function102cee: ; 102cee
  14246.     sub c
  14247.     ret z
  14248.     ld bc, $002f
  14249.     ld hl, $0000
  14250.     call AddNTimes
  14251.     push hl
  14252.     ld a, [wJumptableIndex]
  14253. @@ -7473,7 +7473,7 @@ Function10343c: ; 10343c
  14254.     call Function1034e0
  14255.  
  14256.  .asm_10345f
  14257.     ld bc, $0000
  14258.     call Function10350f
  14259.     ld bc, $0001
  14260.     call Function103487
  14261. diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
  14262. index 52a2a65..c978bff 100644
  14263. --- a/misc/mobile_45.asm
  14264. +++ b/misc/mobile_45.asm
  14265. @@ -14428,7 +14428,7 @@ Function11ad1b: ; 11ad1b
  14266.     ld a, [wcfa9]
  14267.     ld [wcd82], a
  14268.     dec a
  14269. -   ld [hConnectedMapWidth], a
  14270. +   ld [hMapObjectIndexBuffer2], a
  14271.     ld a, $10
  14272.     ld [wc3b7], a
  14273.     ld hl, Function8e83f
  14274. @@ -15521,7 +15521,7 @@ Function11b3d9: ; 11b3d9
  14275.     add [hl]
  14276.     cp e
  14277.     jr z, .asm_11b40d
  14278.     ld hl, $0000
  14279.     ld bc, $0070
  14280.     call AddNTimes
  14281.     ld e, l
  14282. @@ -16413,7 +16413,7 @@ Function11b98f: ; 11b98f
  14283.  ; 11ba38
  14284.  
  14285.  Function11ba38: ; 11ba38
  14286. -   callba Functione538
  14287. +   callba CheckCurPartyMonFainted
  14288.     ret c
  14289.     xor a
  14290.     ld [ScriptVar], a
  14291. diff --git a/wram.asm b/wram.asm
  14292. index 08de7d7..bde772d 100644
  14293. --- a/wram.asm
  14294. +++ b/wram.asm
  14295. @@ -1644,9 +1644,9 @@ NorthConnectionStripPointer:: ; d1ab
  14296.     ds 2
  14297.  NorthConnectionStripLocation:: ; d1ad
  14298.     ds 2
  14299. -NorthConnectionStripLength:: ; d1af
  14300. +NorthMapObjectIndexBuffer1:: ; d1af
  14301.     ds 1
  14302. -NorthConnectedMapWidth:: ; d1b0
  14303. +NorthMapObjectIndexBuffer2:: ; d1b0
  14304.     ds 1
  14305.  NorthConnectionStripYOffset:: ; d1b1
  14306.     ds 1
  14307. @@ -1664,9 +1664,9 @@ SouthConnectionStripPointer:: ; d1b7
  14308.     ds 2
  14309.  SouthConnectionStripLocation:: ; d1b9
  14310.     ds 2
  14311. -SouthConnectionStripLength:: ; d1bb
  14312. +SouthMapObjectIndexBuffer1:: ; d1bb
  14313.     ds 1
  14314. -SouthConnectedMapWidth:: ; d1bc
  14315. +SouthMapObjectIndexBuffer2:: ; d1bc
  14316.     ds 1
  14317.  SouthConnectionStripYOffset:: ; d1bd
  14318.     ds 1
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!