pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

No more -bash000; engine/movement.asm, SPRITEMOVEFN

Browse Source
This commit is contained in:
PikalaxALT 2015-10-29 23:32:11 -04:00
parent 0d17d4a758
commit ed29db5841
387 changed files with 2831 additions and 2830 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/cries.asm
View File

@ -370,7 +370,7 @@ Cry_2C_branch_f3022: ; f3022
unknownmusic0xde $52 unknownmusic0xde $52
sound $4, $f1, $0796 sound $4, $f1, $0796
sound $4, $f1, $072d sound $4, $f1, $072d
sound $7, $0, $0000 sound $7, $0, NONE
sound $10, $f1, $07a7 sound $10, $f1, $07a7
endchannel endchannel
; f3035 ; f3035
@ -381,7 +381,7 @@ Cry_2C_Ch6: ; f3038
Cry_2C_branch_f3038: ; f3038 Cry_2C_branch_f3038: ; f3038
callchannel Cry_2C_branch_f3022 callchannel Cry_2C_branch_f3022
loopchannel 2, Cry_2C_branch_f3038 loopchannel 2, Cry_2C_branch_f3038
sound $e, $0, $0000 sound $e, $0, NONE
sound $8, $f2, $07c2 sound $8, $f2, $07c2
endchannel endchannel
; f3048 ; f3048
@ -398,7 +398,7 @@ Cry_27_Ch5: ; f3048
Cry_27_Ch6: ; f305b Cry_27_Ch6: ; f305b
unknownmusic0xde $2a unknownmusic0xde $2a
sound $3, $2c, $07c7 sound $3, $2c, $07c7
sound $1, $0, $0000 sound $1, $0, NONE
sound $5, $59, $07be sound $5, $59, $07be
sound $6, $b4, $07bd sound $6, $b4, $07bd
endchannel endchannel
@ -621,7 +621,7 @@ Cry_36_Ch6: ; f3200
Cry_36_branch_f3202: ; f3202 Cry_36_branch_f3202: ; f3202
sound $3, $f8, $0791 sound $3, $f8, $0791
sound $3, $d8, $078d sound $3, $d8, $078d
sound $2, $0, $0000 sound $2, $0, NONE
sound $1, $78, $06c1 sound $1, $78, $06c1
sound $1, $f8, $0741 sound $1, $f8, $0741
sound $4, $e1, $0751 sound $4, $e1, $0751
@ -646,7 +646,7 @@ Cry_43_Ch5: ; f322e
sound $8, $ab, $0734 sound $8, $ab, $0734
sound $4, $d6, $0716 sound $4, $d6, $0716
sound $8, $d1, $0712 sound $8, $d1, $0712
sound $8, $0, $0000 sound $8, $0, NONE
endchannel endchannel
; f3249 ; f3249
@ -658,7 +658,7 @@ Cry_43_Ch6: ; f3249
sound $8, $cb, $0754 sound $8, $cb, $0754
sound $4, $f6, $0736 sound $4, $f6, $0736
sound $8, $f1, $0732 sound $8, $f1, $0732
sound $8, $0, $0000 sound $8, $0, NONE
endchannel endchannel
; f3264 ; f3264
@ -1213,7 +1213,7 @@ Cry_09_Ch5: ; f361f
Cry_09_Ch6: ; f363c Cry_09_Ch6: ; f363c
unknownmusic0xde $5 unknownmusic0xde $5
sound $2, $8, $0000 sound $2, $8, NONE
sound $f, $a7, $06a1 sound $f, $a7, $06a1
sound $6, $86, $06a2 sound $6, $86, $06a2
sound $a, $74, $06a1 sound $a, $74, $06a1
@ -1312,7 +1312,7 @@ Cry_11_Ch5: ; f3703
Cry_11_Ch6: ; f3722 Cry_11_Ch6: ; f3722
unknownmusic0xde $a unknownmusic0xde $a
sound $4, $8, $0000 sound $4, $8, NONE
sound $6, $a7, $0741 sound $6, $a7, $0741
sound $8, $86, $0743 sound $8, $86, $0743
sound $4, $76, $0741 sound $4, $76, $0741
@ -1587,7 +1587,7 @@ Cry_0B_Ch5: ; f394b
Cry_0B_Ch6: ; f3976 Cry_0B_Ch6: ; f3976
unknownmusic0xde $44 unknownmusic0xde $44
sound $c, $8, $0000 sound $c, $8, NONE
sound $4, $f1, $0701 sound $4, $f1, $0701
sound $4, $e1, $0782 sound $4, $e1, $0782
sound $4, $d1, $0741 sound $4, $d1, $0741
@ -1670,7 +1670,7 @@ Cry_0D_branch_f3a1a: ; f3a1a
Cry_0D_Ch6: ; f3a39 Cry_0D_Ch6: ; f3a39
unknownmusic0xde $40 unknownmusic0xde $40
sound $4, $8, $0000 sound $4, $8, NONE
sound $5, $f2, $0651 sound $5, $f2, $0651
sound $9, $d1, $0661 sound $9, $d1, $0661
sound $5, $e2, $0614 sound $5, $e2, $0614
@ -1738,7 +1738,7 @@ Cry_0A_Ch5: ; f3aba
Cry_0A_Ch6: ; f3ad9 Cry_0A_Ch6: ; f3ad9
unknownmusic0xde $5 unknownmusic0xde $5
sound $3, $8, $0000 sound $3, $8, NONE
sound $8, $a7, $06a1 sound $8, $a7, $06a1
sound $6, $86, $06a3 sound $6, $86, $06a3
sound $3, $74, $06a1 sound $3, $74, $06a1

2
audio/engine.asm
View File

@ -2773,7 +2773,7 @@ LoadMusicByte:: ; e8d76
; e8d80 ; e8d80
FrequencyTable: ; e8d80 FrequencyTable: ; e8d80
dw $0000 ; filler dw NONE ; filler
dw $f82c dw $f82c
dw $f89d dw $f89d
dw $f907 dw $f907

2
audio/music/battletowertheme.asm
View File

@ -242,7 +242,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970
note __, 1 note __, 1
note F_, 4 note F_, 4
note __, 4 note __, 4
tone $0000 tone NONE
intensity $b7 intensity $b7
note G_, 2 note G_, 2
octave 4 octave 4

2
audio/music/lookkimonogirl.asm
View File

@ -14,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2
notetype $6, $87 notetype $6, $87
tone $0001 tone $0001
callchannel Music_LookKimonoGirl_branch_f7aa8 callchannel Music_LookKimonoGirl_branch_f7aa8
tone $0000 tone NONE
Music_LookKimonoGirl_branch_f79d7: ; f79d7 Music_LookKimonoGirl_branch_f79d7: ; f79d7
notetype $c, $b2 notetype $c, $b2
callchannel Music_LookKimonoGirl_branch_f7a13 callchannel Music_LookKimonoGirl_branch_f7a13

4
audio/music/titlescreen.asm
View File

@ -490,7 +490,7 @@ Music_TitleScreen_Ch2: ; eb984
octave 4 octave 4
note A_, 4 note A_, 4
stereopanning $ff stereopanning $ff
tone $0000 tone NONE
notetype $c, $b0 notetype $c, $b0
octave 3 octave 3
note B_, 6 note B_, 6
@ -775,7 +775,7 @@ Music_TitleScreen_Ch3: ; ebb01
note __, 1 note __, 1
stereopanning $ff stereopanning $ff
notetype $c, $16 notetype $c, $16
tone $0000 tone NONE
octave 4 octave 4
note A_, 2 note A_, 2
octave 5 octave 5

114
audio/sfx.asm
View File

@ -151,7 +151,7 @@ Sfx_Save_Ch5: ; f09b6
Sfx_Save_Ch6: ; f09d5 Sfx_Save_Ch6: ; f09d5
dutycycle $2 dutycycle $2
sound $2, $8, $0000 sound $2, $8, NONE
sound $2, $a1, $0701 sound $2, $a1, $0701
sound $1, $91, $0601 sound $1, $91, $0601
sound $1, $91, $0681 sound $1, $91, $0681
@ -2291,7 +2291,7 @@ Sfx_Sketch_Ch5: ; f12f9
Sfx_Sketch_branch_f12fd: ; f12fd Sfx_Sketch_branch_f12fd: ; f12fd
sound $2, $f1, $06e0 sound $2, $f1, $06e0
sound $d, $af, $05b0 sound $d, $af, $05b0
sound $4, $0, $0000 sound $4, $0, NONE
sound $9, $f4, $0718 sound $9, $f4, $0718
loopchannel 3, Sfx_Sketch_branch_f12fd loopchannel 3, Sfx_Sketch_branch_f12fd
soundinput $8 soundinput $8
@ -2490,15 +2490,15 @@ Sfx_Nightmare_Ch5: ; f1420
soundinput $34 soundinput $34
Sfx_Nightmare_branch_f1424: ; f1424 Sfx_Nightmare_branch_f1424: ; f1424
sound $3, $ba, $0631 sound $3, $ba, $0631
sound $2, $0, $0000 sound $2, $0, NONE
sound $3, $f8, $0621 sound $3, $f8, $0621
sound $2, $0, $0000 sound $2, $0, NONE
sound $3, $f8, $0611 sound $3, $f8, $0611
sound $2, $0, $0000 sound $2, $0, NONE
sound $3, $e8, $0601 sound $3, $e8, $0601
sound $2, $0, $0000 sound $2, $0, NONE
sound $3, $e8, $05f1 sound $3, $e8, $05f1
sound $2, $0, $0000 sound $2, $0, NONE
loopchannel 2, Sfx_Nightmare_branch_f1424 loopchannel 2, Sfx_Nightmare_branch_f1424
soundinput $8 soundinput $8
endchannel endchannel
@ -2540,11 +2540,11 @@ Sfx_SweetKiss2_Ch5: ; f1482
dutycycle $0 dutycycle $0
soundinput $97 soundinput $97
sound $2, $f4, $0772 sound $2, $f4, $0772
sound $4, $0, $0000 sound $4, $0, NONE
sound $2, $c4, $0772 sound $2, $c4, $0772
sound $4, $0, $0000 sound $4, $0, NONE
sound $2, $b4, $0772 sound $2, $b4, $0772
sound $4, $0, $0000 sound $4, $0, NONE
sound $2, $a1, $0772 sound $2, $a1, $0772
soundinput $8 soundinput $8
endchannel endchannel
@ -2591,7 +2591,7 @@ Sfx_SludgeBomb_Ch5: ; f14d6
dutycycle $2 dutycycle $2
soundinput $c5 soundinput $c5
sound $3, $f8, $0581 sound $3, $f8, $0581
sound $1, $0, $0000 sound $1, $0, NONE
soundinput $cb soundinput $cb
sound $10, $f2, $05d1 sound $10, $f2, $05d1
soundinput $8 soundinput $8
@ -2613,9 +2613,9 @@ Sfx_Foresight_Ch5: ; f14f8
sound $3, $f4, $07b5 sound $3, $f4, $07b5
sound $3, $f5, $07c8 sound $3, $f5, $07c8
sound $8, $f4, $07da sound $8, $f4, $07da
sound $2, $0, $0000 sound $2, $0, NONE
sound $8, $c1, $07da sound $8, $c1, $07da
sound $2, $0, $0000 sound $2, $0, NONE
sound $8, $91, $07da sound $8, $91, $07da
endchannel endchannel
; f1515 ; f1515
@ -2811,7 +2811,7 @@ Sfx_Return_branch_f163c: ; f163c
sound $8, $f1, $0759 sound $8, $f1, $0759
soundinput $57 soundinput $57
sound $8, $f1, $0759 sound $8, $f1, $0759
sound $10, $0, $0000 sound $10, $0, NONE
loopchannel 2, Sfx_Return_branch_f163c loopchannel 2, Sfx_Return_branch_f163c
soundinput $8 soundinput $8
endchannel endchannel
@ -2849,7 +2849,7 @@ Sfx_MilkDrink_branch_f1684: ; f1684
sound $d, $f7, $0290 sound $d, $f7, $0290
soundinput $9e soundinput $9e
sound $4, $c9, $05e1 sound $4, $c9, $05e1
sound $2, $0, $0000 sound $2, $0, NONE
loopchannel 6, Sfx_MilkDrink_branch_f1684 loopchannel 6, Sfx_MilkDrink_branch_f1684
soundinput $8 soundinput $8
endchannel endchannel
@ -2864,7 +2864,7 @@ Sfx_Present_Ch5: ; f16a2
soundinput $d6 soundinput $d6
Sfx_Present_branch_f16a6: ; f16a6 Sfx_Present_branch_f16a6: ; f16a6
sound $2, $f1, $0740 sound $2, $f1, $0740
sound $1, $0, $0000 sound $1, $0, NONE
loopchannel 3, Sfx_Present_branch_f16a6 loopchannel 3, Sfx_Present_branch_f16a6
sound $10, $f1, $0780 sound $10, $f1, $0780
soundinput $8 soundinput $8
@ -2882,9 +2882,9 @@ Sfx_MorningSun_branch_f16be: ; f16be
sound $2, $f1, $07e0 sound $2, $f1, $07e0
sound $5, $f2, $07e7 sound $5, $f2, $07e7
loopchannel 3, Sfx_MorningSun_branch_f16be loopchannel 3, Sfx_MorningSun_branch_f16be
sound $1, $0, $0000 sound $1, $0, NONE
sound $8, $c2, $07e7 sound $8, $c2, $07e7
sound $1, $0, $0000 sound $1, $0, NONE
sound $8, $82, $07e7 sound $8, $82, $07e7
endchannel endchannel
; f16df ; f16df
@ -2913,10 +2913,10 @@ Sfx_Encore: ; f16fd
Sfx_Encore_Ch5: ; f1703 Sfx_Encore_Ch5: ; f1703
dutycycle $2 dutycycle $2
soundinput $ce soundinput $ce
sound $10, $0, $0000 sound $10, $0, NONE
Sfx_Encore_branch_f170b: ; f170b Sfx_Encore_branch_f170b: ; f170b
sound $2, $f8, $0774 sound $2, $f8, $0774
sound $24, $0, $0000 sound $24, $0, NONE
loopchannel 2, Sfx_Encore_branch_f170b loopchannel 2, Sfx_Encore_branch_f170b
soundinput $8 soundinput $8
endchannel endchannel
@ -2966,9 +2966,9 @@ Sfx_BatonPass_Ch5: ; f1752
soundinput $f7 soundinput $f7
sound $20, $f2, $0680 sound $20, $f2, $0680
sound $1, $f1, $0760 sound $1, $f1, $0760
sound $20, $0, $0000 sound $20, $0, NONE
sound $1, $f1, $0760 sound $1, $f1, $0760
sound $1a, $0, $0000 sound $1a, $0, NONE
sound $1, $f1, $0760 sound $1, $f1, $0760
soundinput $8 soundinput $8
endchannel endchannel
@ -3836,27 +3836,27 @@ Sfx_BallBounce: ; f1b63
Sfx_BallBounce_Ch5: ; f1b69 Sfx_BallBounce_Ch5: ; f1b69
dutycycle $2 dutycycle $2
sound $8, $e1, $0740 sound $8, $e1, $0740
sound $17, $0, $0000 sound $17, $0, NONE
sound $8, $b1, $0740 sound $8, $b1, $0740
sound $17, $0, $0000 sound $17, $0, NONE
sound $8, $81, $0740 sound $8, $81, $0740
sound $17, $0, $0000 sound $17, $0, NONE
sound $8, $51, $0740 sound $8, $51, $0740
sound $17, $0, $0000 sound $17, $0, NONE
endchannel endchannel
; f1b8c ; f1b8c
Sfx_BallBounce_Ch6: ; f1b8c Sfx_BallBounce_Ch6: ; f1b8c
dutycycle $2 dutycycle $2
sound $2, $8, $0000 sound $2, $8, NONE
sound $8, $b1, $0741 sound $8, $b1, $0741
sound $17, $0, $0000 sound $17, $0, NONE
sound $8, $81, $0741 sound $8, $81, $0741
sound $17, $0, $0000 sound $17, $0, NONE
sound $8, $51, $0741 sound $8, $51, $0741
sound $17, $0, $0000 sound $17, $0, NONE
sound $8, $21, $0741 sound $8, $21, $0741
sound $17, $0, $0000 sound $17, $0, NONE
endchannel endchannel
; f1bb3 ; f1bb3
@ -3916,7 +3916,7 @@ Sfx_GiveTrademon: ; f1c10
; f1c13 ; f1c13
Sfx_GiveTrademon_Ch5: ; f1c13 Sfx_GiveTrademon_Ch5: ; f1c13
sound $20, $0, $0000 sound $20, $0, NONE
dutycycle $1 dutycycle $1
soundinput $a7 soundinput $a7
sound $1b, $f4, $0750 sound $1b, $f4, $0750
@ -3936,7 +3936,7 @@ Sfx_GetTrademon: ; f1c3e
; f1c41 ; f1c41
Sfx_GetTrademon_Ch5: ; f1c41 Sfx_GetTrademon_Ch5: ; f1c41
sound $20, $0, $0000 sound $20, $0, NONE
dutycycle $2 dutycycle $2
soundinput $bf soundinput $bf
sound $1b, $14, $07bc sound $1b, $14, $07bc
@ -3959,7 +3959,7 @@ Sfx_TrainArrived: ; f1c6c
Sfx_TrainArrived_Ch6: ; f1c75 Sfx_TrainArrived_Ch6: ; f1c75
tone $0008 tone $0008
sound $8, $0, $0000 sound $8, $0, NONE
Sfx_TrainArrived_Ch5: ; f1c7c Sfx_TrainArrived_Ch5: ; f1c7c
dutycycle $2 dutycycle $2
sound $4, $5f, $0691 sound $4, $5f, $0691
@ -4060,7 +4060,7 @@ Sfx_SwitchPokemon_Ch5: ; f1d0f
Sfx_SwitchPokemon_Ch6: ; f1d16 Sfx_SwitchPokemon_Ch6: ; f1d16
dutycycle $2 dutycycle $2
sound $2, $8, $0000 sound $2, $8, NONE
sound $8, $b1, $0741 sound $8, $b1, $0741
endchannel endchannel
; f1d21 ; f1d21
@ -4093,7 +4093,7 @@ Sfx_Tally_Ch5: ; f1d43
Sfx_Tally_Ch6: ; f1d4a Sfx_Tally_Ch6: ; f1d4a
dutycycle $2 dutycycle $2
sound $1, $8, $0000 sound $1, $8, NONE
sound $4, $a1, $0761 sound $4, $a1, $0761
endchannel endchannel
; f1d55 ; f1d55
@ -4107,7 +4107,7 @@ Sfx_Transaction_Ch5: ; f1d55
Sfx_Transaction_Ch6: ; f1d60 Sfx_Transaction_Ch6: ; f1d60
dutycycle $2 dutycycle $2
sound $1, $8, $0000 sound $1, $8, NONE
sound $4, $91, $06c1 sound $4, $91, $06c1
sound $18, $a2, $07a1 sound $18, $a2, $07a1
endchannel endchannel
@ -4183,7 +4183,7 @@ Sfx_GotSafariBalls_Ch5: ; f1dd4
Sfx_BootPc_Ch5: ; f1de3 Sfx_BootPc_Ch5: ; f1de3
dutycycle $2 dutycycle $2
sound $f, $f2, $07c0 sound $f, $f2, $07c0
sound $f, $0, $0000 sound $f, $0, NONE
sound $3, $a1, $0780 sound $3, $a1, $0780
sound $3, $a1, $0700 sound $3, $a1, $0700
sound $3, $a1, $0740 sound $3, $a1, $0740
@ -4200,16 +4200,16 @@ Sfx_ShutDownPc_Ch5: ; f1e0e
sound $4, $f0, $0600 sound $4, $f0, $0600
sound $4, $f0, $0400 sound $4, $f0, $0400
sound $4, $f0, $0200 sound $4, $f0, $0200
sound $1, $0, $0000 sound $1, $0, NONE
endchannel endchannel
; f1e21 ; f1e21
Sfx_ChoosePcOption_Ch5: ; f1e21 Sfx_ChoosePcOption_Ch5: ; f1e21
dutycycle $2 dutycycle $2
sound $6, $f0, $0700 sound $6, $f0, $0700
sound $4, $0, $0000 sound $4, $0, NONE
sound $6, $f0, $0700 sound $6, $f0, $0700
sound $1, $0, $0000 sound $1, $0, NONE
endchannel endchannel
; f1e34 ; f1e34
@ -4227,11 +4227,11 @@ Sfx_EscapeRope_Ch5: ; f1e34
Sfx_PushButton_Ch5: ; f1e4f Sfx_PushButton_Ch5: ; f1e4f
dutycycle $2 dutycycle $2
sound $4, $0, $0000 sound $4, $0, NONE
sound $2, $f1, $0680 sound $2, $f1, $0680
sound $1, $0, $0000 sound $1, $0, NONE
sound $4, $f1, $0780 sound $4, $f1, $0780
sound $4, $0, $0000 sound $4, $0, NONE
endchannel endchannel
; f1e66 ; f1e66
@ -4242,7 +4242,7 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
soundinput $22 soundinput $22
sound $2, $f1, $0500 sound $2, $f1, $0500
soundinput $8 soundinput $8
sound $1, $0, $0000 sound $1, $0, NONE
endchannel endchannel
; f1e7b ; f1e7b
@ -4319,18 +4319,18 @@ Sfx_Wrong_Ch5: ; f1f05
soundinput $5a soundinput $5a
sound $4, $f0, $0500 sound $4, $f0, $0500
soundinput $8 soundinput $8
sound $4, $0, $0000 sound $4, $0, NONE
sound $f, $f0, $0500 sound $f, $f0, $0500
sound $1, $0, $0000 sound $1, $0, NONE
endchannel endchannel
; f1f1c ; f1f1c
Sfx_Wrong_Ch6: ; f1f1c Sfx_Wrong_Ch6: ; f1f1c
dutycycle $3 dutycycle $3
sound $4, $f0, $0401 sound $4, $f0, $0401
sound $4, $0, $0000 sound $4, $0, NONE
sound $f, $f0, $0401 sound $f, $f0, $0401
sound $1, $0, $0000 sound $1, $0, NONE
endchannel endchannel
; f1f2f ; f1f2f
@ -4357,7 +4357,7 @@ Sfx_Strength_Ch8: ; f1f3a
Sfx_Boat_Ch5: ; f1f53 Sfx_Boat_Ch5: ; f1f53
dutycycle $2 dutycycle $2
sound $f, $f0, $0500 sound $f, $f0, $0500
sound $4, $0, $0000 sound $4, $0, NONE
sound $f, $f0, $0500 sound $f, $f0, $0500
sound $f, $f0, $0500 sound $f, $f0, $0500
sound $f, $f0, $0500 sound $f, $f0, $0500
@ -4369,7 +4369,7 @@ Sfx_Boat_Ch5: ; f1f53
Sfx_Boat_Ch6: ; f1f72 Sfx_Boat_Ch6: ; f1f72
dutycycle $3 dutycycle $3
sound $f, $f0, $0482 sound $f, $f0, $0482
sound $4, $0, $0000 sound $4, $0, NONE
sound $f, $f0, $0482 sound $f, $f0, $0482
sound $f, $f0, $0482 sound $f, $f0, $0482
sound $f, $f0, $0482 sound $f, $f0, $0482
@ -4423,7 +4423,7 @@ Sfx_Shine_Ch5: ; f1fd9
sound $0, $d2, $0780 sound $0, $d2, $0780
sound $0, $d2, $07c0 sound $0, $d2, $07c0
sound $a, $e1, $07e0 sound $a, $e1, $07e0
sound $1, $0, $0000 sound $1, $0, NONE
endchannel endchannel
; f1ff4 ; f1ff4
@ -4493,7 +4493,7 @@ Sfx_Call_Ch5: ; f2052
sound $4, $f7, $07a0 sound $4, $f7, $07a0
sound $4, $f7, $07a0 sound $4, $f7, $07a0
soundinput $8 soundinput $8
sound $4, $0, $0000 sound $4, $0, NONE
endchannel endchannel
; f206f ; f206f
@ -5483,13 +5483,13 @@ Sfx_HangUp_Ch5: ; f26f1
dutycycle $2 dutycycle $2
sound $4, $b8, $077b sound $4, $b8, $077b
sound $2, $21, $077b sound $2, $21, $077b
sound $10, $0, $0000 sound $10, $0, NONE
Sfx_HangUp_branch_f26ff: ; f26ff Sfx_HangUp_branch_f26ff: ; f26ff
Sfx_NoSignal_Ch5: ; f26ff Sfx_NoSignal_Ch5: ; f26ff
Sfx_NoSignal_branch_f26ff: ; f26ff Sfx_NoSignal_branch_f26ff: ; f26ff
dutycycle $2 dutycycle $2
sound $14, $e8, $070b sound $14, $e8, $070b
sound $1c, $0, $0000 sound $1c, $0, NONE
loopchannel 3, Sfx_HangUp_branch_f26ff loopchannel 3, Sfx_HangUp_branch_f26ff
endchannel endchannel
; f270e ; f270e
@ -5526,8 +5526,8 @@ Sfx_Elevator_branch_f2726: ; f2726
Sfx_Elevator_Ch6: ; f274b Sfx_Elevator_Ch6: ; f274b
Sfx_Elevator_Ch7: ; f274b Sfx_Elevator_Ch7: ; f274b
sound $60, $0, $0000 sound $60, $0, NONE
sound $53, $0, $0000 sound $53, $0, NONE
endchannel endchannel
; f2754 ; f2754

2
audio/sfx_crystal.asm
View File

@ -84,7 +84,7 @@ Sfx_IntroPichu_Ch5: ; 1798ad
dutycycle $3 dutycycle $3
soundinput $4d soundinput $4d
sound $1, $88, $0770 sound $1, $88, $0770
sound $3, $0, $0000 sound $3, $0, NONE
soundinput $17 soundinput $17
sound $2, $88, $0776 sound $2, $88, $0776
endchannel endchannel

2
audio/trainer_encounters.asm
View File

@ -7,7 +7,7 @@ PlayTrainerEncounterMusic:: ; e900a
ld [MusicFade], a ld [MusicFade], a
; play nothing for one frame ; play nothing for one frame
push de push de
ld de, $0000 ; id: Music_Nothing ld de, NONE ; id: Music_Nothing
call PlayMusic call PlayMusic
call DelayFrame call DelayFrame
; play new song ; play new song

2
battle/anim_objects.asm
View File

@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
Functioncc9bd: ; cc9bd Functioncc9bd: ; cc9bd
ld hl, $0000 ld hl, NONE
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
ret ret

16
battle/core.asm
View File

@ -3240,7 +3240,7 @@ MonFaintedAnimation: ; 3d444
Function3d490: ; 3d490 Function3d490: ; 3d490
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld c, a ld c, a
.asm_3d493 .asm_3d493
push bc push bc
@ -3264,7 +3264,7 @@ Function3d490: ; 3d490
; 3d4ae ; 3d4ae
Function3d4ae: ; 3d4ae Function3d4ae: ; 3d4ae
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld c, a ld c, a
cp $8 cp $8
jr nz, .back jr nz, .back
@ -3646,7 +3646,7 @@ Function3d714: ; 3d714
push af push af
ld a, [CurBattleMon] ld a, [CurBattleMon]
ld [CurPartyMon], a ld [CurPartyMon], a
callba Functione538 callba CheckCurPartyMonFainted
pop bc pop bc
ld a, b ld a, b
ld [CurPartyMon], a ld [CurPartyMon], a
@ -9458,7 +9458,7 @@ Function3fc30: ; 3fc30
Function3fc5b: ; 3fc5b Function3fc5b: ; 3fc5b
ld hl, Sprites ld hl, Sprites
xor a xor a
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld b, $6 ld b, $6
ld e, $a8 ld e, $a8
.asm_3fc65 .asm_3fc65
@ -9469,10 +9469,10 @@ Function3fc5b: ; 3fc5b
inc hl inc hl
ld [hl], e ld [hl], e
inc hl inc hl
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld [hli], a ld [hli], a
inc a inc a
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, $1 ld a, $1
ld [hli], a ld [hli], a
ld a, d ld a, d
@ -9480,9 +9480,9 @@ Function3fc5b: ; 3fc5b
ld d, a ld d, a
dec c dec c
jr nz, .asm_3fc69 jr nz, .asm_3fc69
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
add $3 add $3
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, e ld a, e
add $8 add $8
ld e, a ld e, a

2
battle/effect_command_pointers.asm
View File

@ -1,5 +1,5 @@
dw $0000 ; padding dw NONE ; padding
BattleCommandPointers: ; 3fd28 BattleCommandPointers: ; 3fd28
dw BattleCommand01 ; 34084 dw BattleCommand01 ; 34084

1
constants.asm
View File

@ -1,4 +1,3 @@
INCLUDE "macros.asm" INCLUDE "macros.asm"
INCLUDE "gbhw.asm" INCLUDE "gbhw.asm"

4
constants/map_constants.asm
View File

@ -517,8 +517,8 @@ const_value SET 1
const OBJECT_MAP_OBJECT_INDEX const OBJECT_MAP_OBJECT_INDEX
const OBJECT_SPRITE_TILE const OBJECT_SPRITE_TILE
const OBJECT_03 const OBJECT_03
const OBJECT_04 const OBJECT_FLAGS1
const OBJECT_FLAGS const OBJECT_FLAGS2
const OBJECT_PALETTE const OBJECT_PALETTE
const OBJECT_DIRECTION_WALKING const OBJECT_DIRECTION_WALKING
const OBJECT_FACING const OBJECT_FACING

1
constants/misc_constants.asm
View File

@ -1,5 +1,4 @@
NONE EQU 0 NONE EQU 0
PARTY_LENGTH EQU 6 PARTY_LENGTH EQU 6
MAX_ITEMS EQU 20 MAX_ITEMS EQU 20

3
constants/sprite_constants.asm
View File

@ -217,3 +217,6 @@ const_value SET 1
const SPRITEMOVEFN_1F const SPRITEMOVEFN_1F
const SPRITEMOVEFN_20 const SPRITEMOVEFN_20
const SPRITEMOVEFN_21 const SPRITEMOVEFN_21
const SPRITEMOVEFN_22
const SPRITEMOVEFN_23
const SPRITEMOVEFN_24

2
engine/events.asm
View File

@ -606,7 +606,7 @@ TryObjectEvent: ; 969b5
.IsObject .IsObject
call PlayTalkObject call PlayTalkObject
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
call GetObjectStruct call GetObjectStruct
ld hl, OBJECT_MAP_OBJECT_INDEX ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc add hl, bc

10
engine/events_2.asm
View File

@ -352,7 +352,7 @@ Function97e08:: ; 97e08
ld hl, wd6de ld hl, wd6de
xor a xor a
.asm_97e0c .asm_97e0c
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, [hl] ld a, [hl]
and a and a
jr z, .asm_97e19 jr z, .asm_97e19
@ -365,7 +365,7 @@ Function97e08:: ; 97e08
.asm_97e19 .asm_97e19
ld de, $0006 ld de, $0006
add hl, de add hl, de
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
inc a inc a
cp $4 cp $4
jr nz, .asm_97e0c jr nz, .asm_97e0c
@ -441,14 +441,14 @@ Function97e5c:: ; 97e5c
; 97e72 ; 97e72
Function97e72: ; 97e72 Function97e72: ; 97e72
ld hl, $0000 ld hl, NONE
add hl, bc add hl, bc
ld [hl], 0 ld [hl], 0
ret ret
; 97e79 ; 97e79
Function97e79: ; 97e79 Function97e79: ; 97e79
ld hl, $0000 ld hl, NONE
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp 5 cp 5
@ -620,7 +620,7 @@ Function97f42: ; 97f42
.asm_97f47 .asm_97f47
push af push af
ld hl, $0000 ld hl, NONE
add hl, de add hl, de
ld a, [hl] ld a, [hl]
and a and a

90
engine/map_objects.asm
View File

@ -78,7 +78,7 @@ Function437b: ; 437b
; 4386 ; 4386
Function4386: ; 4386 Function4386: ; 4386
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 6, [hl] res 6, [hl]
ld a, [XCoord] ld a, [XCoord]
@ -104,7 +104,7 @@ Function4386: ; 4386
jr .yes jr .yes
.ok .ok
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
set 6, [hl] set 6, [hl]
ld a, [XCoord] ld a, [XCoord]
@ -133,7 +133,7 @@ Function4386: ; 4386
ret ret
.ok2 .ok2
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 1, [hl] bit 1, [hl]
jr nz, .yes2 jr nz, .yes2
@ -142,7 +142,7 @@ Function4386: ; 4386
ret ret
.yes2 .yes2
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
set 6, [hl] set 6, [hl]
and a and a
@ -155,7 +155,7 @@ Function43f3: ; 43f3
ld a, [hl] ld a, [hl]
and a and a
jr z, .zero jr z, .zero
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
bit 5, [hl] bit 5, [hl]
jr nz, .not_bit5 jr nz, .not_bit5
@ -165,7 +165,7 @@ Function43f3: ; 43f3
.zero .zero
call Function47bc call Function47bc
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
bit 5, [hl] bit 5, [hl]
jr nz, .not_bit5 jr nz, .not_bit5
@ -190,12 +190,12 @@ Function43f3: ; 43f3
; 4427 ; 4427
Function4427: ; 4427 Function4427: ; 4427
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 0, [hl] bit 0, [hl]
jr nz, Function44a3 jr nz, Function44a3
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
bit 6, [hl] bit 6, [hl]
jr nz, Function44a3 jr nz, Function44a3
@ -208,7 +208,7 @@ Function4427: ; 4427
; 4440 ; 4440
Function4440: ; 4440 Function4440: ; 4440
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 0, [hl] bit 0, [hl]
jr nz, Function44a3 jr nz, Function44a3
@ -300,7 +300,7 @@ Function44b5: ; 44b5
; 44c1 ; 44c1
Function44c1: ; 44c1 Function44c1: ; 44c1
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 3, [hl] bit 3, [hl]
jp nz, Function44aa jp nz, Function44aa
@ -324,7 +324,7 @@ Function44c1: ; 44c1
; 44e4 ; 44e4
Function44e4: ; 44e4 Function44e4: ; 44e4
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 3, [hl] bit 3, [hl]
jp nz, Function44aa jp nz, Function44aa
@ -348,7 +348,7 @@ Function44e4: ; 44e4
; 4508 ; 4508
Function4508: ; 4508 Function4508: ; 4508
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 3, [hl] bit 3, [hl]
jp nz, Function44aa jp nz, Function44aa
@ -603,7 +603,7 @@ Function462a: ; 462a
; 463f ; 463f
Function463f: ; 463f Function463f: ; 463f
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
bit 3, [hl] bit 3, [hl]
jr z, .ok jr z, .ok
@ -632,13 +632,13 @@ Function4661: ; 4661
jr c, .reset jr c, .reset
.set .set
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
set 3, [hl] set 3, [hl]
ret ret
.reset .reset
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 3, [hl] res 3, [hl]
ret ret
@ -670,7 +670,7 @@ Function4690: ; 4690
ld hl, OBJECT_DIRECTION_WALKING ld hl, OBJECT_DIRECTION_WALKING
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 2, [hl] bit 2, [hl]
jr nz, .ok jr nz, .ok
@ -1098,7 +1098,7 @@ Function48b3: ; 48b3
ld a, [hl] ld a, [hl]
call CheckPitTile call CheckPitTile
jr z, .on_pit jr z, .on_pit
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
bit 2, [hl] bit 2, [hl]
res 2, [hl] res 2, [hl]
@ -1192,7 +1192,7 @@ Function48ff: ; 48ff
and %00001100 and %00001100
or d or d
pop bc pop bc
jp Function5412 jp NormalStep
.standing .standing
pop bc pop bc
@ -1499,7 +1499,7 @@ Function4af0: ; 4af0
add hl, bc add hl, bc
ld [hl], 2 ld [hl], 2
ld hl, wd4cf ld hl, wd4cf
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
cp [hl] cp [hl]
jr z, .ok jr z, .ok
ld hl, OBJECT_09 ld hl, OBJECT_09
@ -1604,7 +1604,7 @@ Function4b8d: ; 4b8d
ret nz ret nz
call Function4600 call Function4600
call Function46a6 call Function46a6
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 3, [hl] res 3, [hl]
call IncrementObjectStructField28 call IncrementObjectStructField28
@ -1648,7 +1648,7 @@ Function4bd2: ; 4bd2
dec [hl] dec [hl]
ret nz ret nz
call Function4600 call Function4600
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 3, [hl] res 3, [hl]
ld hl, wd150 ld hl, wd150
@ -1723,7 +1723,7 @@ Function4c42: ; 4c42
ld hl, OBJECT_STEP_DURATION ld hl, OBJECT_STEP_DURATION
add hl, bc add hl, bc
ld [hl], $10 ld [hl], $10
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 3, [hl] res 3, [hl]
call IncrementObjectStructField28 call IncrementObjectStructField28
@ -2198,7 +2198,7 @@ Function4ecd: ; 4ecd
ld b, a ld b, a
callba CopyDECoordsToMapObject callba CopyDECoordsToMapObject
pop bc pop bc
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 2, [hl] res 2, [hl]
call Function4600 call Function4600
@ -2508,7 +2508,7 @@ Function54b8: ; 54b8
ret z ret z
ld a, [wd4cd] ld a, [wd4cd]
ld d, a ld d, a
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
cp d cp d
ret nz ret nz
ld a, e ld a, e
@ -2651,7 +2651,7 @@ Function5565: ; 5565
Function5579: ; 5579 Function5579: ; 5579
push bc push bc
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld c, a ld c, a
call Function5582 call Function5582
pop bc pop bc
@ -2663,7 +2663,7 @@ Function5582: ; 5582
ld a, NUM_OBJECT_STRUCTS ld a, NUM_OBJECT_STRUCTS
.loop .loop
push af push af
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, de add hl, de
bit 7, [hl] bit 7, [hl]
jr z, .next jr z, .next
@ -2712,7 +2712,7 @@ Function55b9: ; 55b9
ld [hli], a ld [hli], a
ld a, [de] ld a, [de]
ld [hli], a ld [hli], a
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld [hli], a ld [hli], a
push hl push hl
ld hl, OBJECT_MAP_X ld hl, OBJECT_MAP_X
@ -2737,7 +2737,7 @@ Function55e0:: ; 55e0
ld bc, ObjectStructs ld bc, ObjectStructs
xor a xor a
.loop .loop
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call GetObjectSprite call GetObjectSprite
jr z, .ok jr z, .ok
call Function565c call Function565c
@ -2747,7 +2747,7 @@ Function55e0:: ; 55e0
add hl, bc add hl, bc
ld b, h ld b, h
ld c, l ld c, l
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
inc a inc a
cp NUM_OBJECT_STRUCTS cp NUM_OBJECT_STRUCTS
jr nz, .loop jr nz, .loop
@ -2801,13 +2801,13 @@ Function5645: ; 5645
xor a xor a
ld bc, ObjectStructs ld bc, ObjectStructs
.loop .loop
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call Function5680 call Function5680
ld hl, OBJECT_STRUCT_LENGTH ld hl, OBJECT_STRUCT_LENGTH
add hl, bc add hl, bc
ld b, h ld b, h
ld c, l ld c, l
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
inc a inc a
cp NUM_OBJECT_STRUCTS cp NUM_OBJECT_STRUCTS
jr nz, .loop jr nz, .loop
@ -3032,7 +3032,7 @@ Function5781: ; 5781
ld bc, ObjectStructs ld bc, ObjectStructs
xor a xor a
.loop .loop
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call GetObjectSprite call GetObjectSprite
jr z, .next jr z, .next
call Function437b call Function437b
@ -3042,7 +3042,7 @@ Function5781: ; 5781
add hl, bc add hl, bc
ld b, h ld b, h
ld c, l ld c, l
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
inc a inc a
cp NUM_OBJECT_STRUCTS cp NUM_OBJECT_STRUCTS
jr nz, .loop jr nz, .loop
@ -3102,7 +3102,7 @@ Function57e2: ; 57e2
ld a, d ld a, d
and $80 and $80
ret z ret z
ld bc, $0000 ; debug? ld bc, NONE ; debug?
ld hl, OBJECT_FACING ld hl, OBJECT_FACING
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -3137,7 +3137,7 @@ Function5803:: ; 5803
Function5815: ; 5815 Function5815: ; 5815
call Function18de call Function18de
ret c ret c
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
ld [wd4cd], a ld [wd4cd], a
ret ret
; 581f ; 581f
@ -3166,7 +3166,7 @@ Function582c: ; 582c
ld hl, OBJECT_09 ld hl, OBJECT_09
add hl, bc add hl, bc
ld [hl], 0 ld [hl], 0
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
ld [wd4ce], a ld [wd4ce], a
ret ret
; 5847 ; 5847
@ -3189,7 +3189,7 @@ SetFlagsForMovement_1:: ; 585c
push bc push bc
call Function587a call Function587a
pop bc pop bc
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 5, [hl] res 5, [hl]
xor a xor a
@ -3199,7 +3199,7 @@ SetFlagsForMovement_1:: ; 585c
Function586e: ; 586e Function586e: ; 586e
call Function18de call Function18de
ret c ret c
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
set 5, [hl] set 5, [hl]
xor a xor a
@ -3213,7 +3213,7 @@ Function587a: ; 587a
push af push af
call GetObjectSprite call GetObjectSprite
jr z, .next jr z, .next
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
set 5, [hl] set 5, [hl]
@ -3245,7 +3245,7 @@ _SetFlagsForMovement_2:: ; 5897
cp -1 cp -1
ret z ret z
call GetObjectStruct call GetObjectStruct
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 5, [hl] res 5, [hl]
ret ret
@ -3259,7 +3259,7 @@ Function58b9:: ; 58b9
push af push af
call GetObjectSprite call GetObjectSprite
jr z, .next jr z, .next
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 5, [hl] res 5, [hl]
@ -3279,7 +3279,7 @@ Function58b9:: ; 58b9
Function58d8: ; 58d8 Function58d8: ; 58d8
call Function18de call Function18de
ret c ret c
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 5, [hl] res 5, [hl]
ret ret
@ -3357,7 +3357,7 @@ Function593a: ; 593a
ret nc ret nc
ld l, a ld l, a
ld h, $c4 ld h, $c4
ld de, OBJECT_04 ld de, OBJECT_FLAGS1
ld a, b ld a, b
ld c, $a0 ld c, $a0
.loop .loop
@ -3447,7 +3447,7 @@ Function59a4: ; 59a4
; Define the sprite priority. ; Define the sprite priority.
ld e, $10 ld e, $10
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
bit 0, [hl] bit 0, [hl]
jr nz, .add jr nz, .add
@ -3517,7 +3517,7 @@ Function5a0d: ; 5a0d
or %00001000 or %00001000
.skip1 .skip1
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
ld e, [hl] ld e, [hl]
bit 7, e bit 7, e

600
engine/movement.asm
View File

File diff suppressed because it is too large Load Diff

18
engine/scripting.asm
View File

@ -1200,7 +1200,7 @@ ApplyPersonFacing: ; 0x9728b
call Function1836 call Function1836
pop bc pop bc
jr c, .not_visible ; 0x9729c $1b jr c, .not_visible ; 0x9729c $1b
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 2, [hl] bit 2, [hl]
jr nz, .not_visible ; 0x972a4 $13 jr nz, .not_visible ; 0x972a4 $13
@ -1258,7 +1258,7 @@ Script_appear: ; 0x972dd
call GetScriptByte call GetScriptByte
call GetScriptPerson call GetScriptPerson
call _CopyObjectStruct call _CopyObjectStruct
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld b, 0 ; clear ld b, 0 ; clear
call ApplyEventActionAppearDisappear call ApplyEventActionAppearDisappear
ret ret
@ -1276,7 +1276,7 @@ Script_disappear: ; 0x972ee
ld a, [hLastTalked] ld a, [hLastTalked]
.ok .ok
call DeleteObjectStruct call DeleteObjectStruct
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld b, 1 ; set ld b, 1 ; set
call ApplyEventActionAppearDisappear call ApplyEventActionAppearDisappear
callba RefreshMapAppearDisappear callba RefreshMapAppearDisappear
@ -1390,7 +1390,7 @@ Script_loademote: ; 0x97384
ld a, [ScriptVar] ld a, [ScriptVar]
.not_var_emote .not_var_emote
ld c, a ld c, a
callba Function1442f callba LoadEmote
ret ret
; 0x97396 ; 0x97396
@ -1446,7 +1446,7 @@ Script_earthquake: ; 0x973c7
call CopyBytes call CopyBytes
call GetScriptByte call GetScriptByte
ld [wd003], a ld [wd003], a
and $3f and (1 << 6) - 1
ld [wd005], a ld [wd005], a
ld b, BANK(.script) ld b, BANK(.script)
ld de, .script ld de, .script
@ -2428,10 +2428,10 @@ Script_checkmoney: ; 0x97843
call GetMoneyAccount call GetMoneyAccount
call LoadMoneyAmountToMem call LoadMoneyAmountToMem
callba CheckMoney callba CompareMoney
; 0x9784f ; 0x9784f
CheckMoneyAction: ; 0x9784f CompareMoneyAction: ; 0x9784f
jr c, .two jr c, .two
jr z, .one jr z, .one
ld a, 0 ld a, 0
@ -2497,12 +2497,12 @@ Script_checkcoins: ; 0x97895
call LoadCoinAmountToMem call LoadCoinAmountToMem
callba CheckCoins callba CheckCoins
jr CheckMoneyAction jr CompareMoneyAction
; 978a0 ; 978a0
LoadCoinAmountToMem: ; 978a0 LoadCoinAmountToMem: ; 978a0
call GetScriptByte call GetScriptByte
ld [$ffc4], a ld [hMoneyTemp + 1], a
call GetScriptByte call GetScriptByte
ld [hMoneyTemp], a ld [hMoneyTemp], a
ld bc, hMoneyTemp ld bc, hMoneyTemp

2
event/battle_tower.asm
View File

@ -117,7 +117,7 @@ JumpText_YouCantTakeAnEgg: ; 0x8b256
; 0x8b25b ; 0x8b25b
Function8b25b: ; 8b25b Function8b25b: ; 8b25b
ld bc, $0000 ld bc, NONE
.asm_8b25e .asm_8b25e
call Function8b26c call Function8b26c
call c, Function8b28e call c, Function8b28e

4
event/mom.asm
View File

@ -162,7 +162,7 @@ endr
jr z, .CancelDeposit jr z, .CancelDeposit
ld de, Money ld de, Money
ld bc, StringBuffer2 ld bc, StringBuffer2
callba CheckMoney callba CompareMoney
jr c, .DontHaveThatMuchToDeposit jr c, .DontHaveThatMuchToDeposit
ld hl, StringBuffer2 ld hl, StringBuffer2
ld de, StringBuffer2 + 3 ld de, StringBuffer2 + 3
@ -234,7 +234,7 @@ endr
call CopyBytes call CopyBytes
ld de, wd851 ld de, wd851
ld bc, StringBuffer2 ld bc, StringBuffer2
callba CheckMoney callba CompareMoney
jr c, .InsufficientFundsInBank jr c, .InsufficientFundsInBank
ld bc, Money ld bc, Money
ld de, StringBuffer2 ld de, StringBuffer2

2
gfx/pics/animation.asm
View File

@ -445,7 +445,7 @@ PokeAnim_End: ; d02a8
Functiond02ae: ; d02ae Functiond02ae: ; d02ae
ld c, a ld c, a
ld b, $0 ld b, $0
ld hl, $0000 ld hl, NONE
ld a, [w2_d173] ld a, [w2_d173]
call AddNTimes call AddNTimes
ld a, h ld a, h

36
home/joypad.asm
View File

@ -356,14 +356,14 @@ JoyTextDelay:: ; a57
; a80 ; a80
Functiona80:: ; a80 Functiona80:: ; a80
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
push af push af
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
push af push af
xor a xor a
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, 6 ld a, 6
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
.loop .loop
push hl push hl
@ -377,9 +377,9 @@ Functiona80:: ; a80
jr z, .loop jr z, .loop
pop af pop af
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
pop af pop af
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ret ret
; aa5 ; aa5
@ -459,37 +459,37 @@ Functionb06:: ; b06
cp b cp b
pop bc pop bc
jr nz, .asm_b27 jr nz, .asm_b27
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
dec a dec a
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ret nz ret nz
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
dec a dec a
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
ret nz ret nz
ld a, "─" ld a, "─"
ld [hl], a ld [hl], a
ld a, -1 ld a, -1
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, 6 ld a, 6
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
ret ret
.asm_b27 .asm_b27
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
and a and a
ret z ret z
dec a dec a
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ret nz ret nz
dec a dec a
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
dec a dec a
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
ret nz ret nz
ld a, $6 ld a, $6
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
ld a, $ee ld a, $ee
ld [hl], a ld [hl], a
ret ret

54
home/map.asm
View File

@ -729,9 +729,9 @@ ChangeMap:: ; 24e4
ld hl, OverworldMap ld hl, OverworldMap
ld a, [MapWidth] ld a, [MapWidth]
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
add $6 add $6
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld c, a ld c, a
ld b, 0 ld b, 0
rept 3 rept 3
@ -750,7 +750,7 @@ endr
ld b, a ld b, a
.asm_250c .asm_250c
push hl push hl
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
ld c, a ld c, a
.asm_2510 .asm_2510
ld a, [de] ld a, [de]
@ -759,7 +759,7 @@ endr
dec c dec c
jr nz, .asm_2510 jr nz, .asm_2510
pop hl pop hl
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
add l add l
ld l, a ld l, a
jr nc, .asm_251e jr nc, .asm_251e
@ -794,10 +794,10 @@ FillMapConnections:: ; 2524
ld e, a ld e, a
ld a, [NorthConnectionStripLocation + 1] ld a, [NorthConnectionStripLocation + 1]
ld d, a ld d, a
ld a, [NorthConnectionStripLength] ld a, [NorthMapObjectIndexBuffer1]
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, [NorthConnectedMapWidth] ld a, [NorthMapObjectIndexBuffer2]
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
call FillNorthConnectionStrip call FillNorthConnectionStrip
.South .South
@ -817,10 +817,10 @@ FillMapConnections:: ; 2524
ld e, a ld e, a
ld a, [SouthConnectionStripLocation + 1] ld a, [SouthConnectionStripLocation + 1]
ld d, a ld d, a
ld a, [SouthConnectionStripLength] ld a, [SouthMapObjectIndexBuffer1]
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, [SouthConnectedMapWidth] ld a, [SouthMapObjectIndexBuffer2]
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
call FillSouthConnectionStrip call FillSouthConnectionStrip
.West .West
@ -843,7 +843,7 @@ FillMapConnections:: ; 2524
ld a, [WestConnectionStripLength] ld a, [WestConnectionStripLength]
ld b, a ld b, a
ld a, [WestConnectedMapWidth] ld a, [WestConnectedMapWidth]
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call FillWestConnectionStrip call FillWestConnectionStrip
.East .East
@ -866,7 +866,7 @@ FillMapConnections:: ; 2524
ld a, [EastConnectionStripLength] ld a, [EastConnectionStripLength]
ld b, a ld b, a
ld a, [EastConnectedMapWidth] ld a, [EastConnectedMapWidth]
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call FillEastConnectionStrip call FillEastConnectionStrip
.Done .Done
@ -882,7 +882,7 @@ FillSouthConnectionStrip:: ; 25d3
push de push de
push hl push hl
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld b, a ld b, a
.x .x
ld a, [hli] ld a, [hli]
@ -892,7 +892,7 @@ FillSouthConnectionStrip:: ; 25d3
jr nz, .x jr nz, .x
pop hl pop hl
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
ld e, a ld e, a
ld d, 0 ld d, 0
add hl, de add hl, de
@ -917,7 +917,7 @@ FillEastConnectionStrip:: ; 25f6
.asm_25f6 .asm_25f6
ld a, [MapWidth] ld a, [MapWidth]
add 6 add 6
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
push de push de
@ -933,13 +933,13 @@ FillEastConnectionStrip:: ; 25f6
inc de inc de
pop hl pop hl
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld e, a ld e, a
ld d, 0 ld d, 0
add hl, de add hl, de
pop de pop de
ld a, [hConnectedMapWidth] ld a, [hMapObjectIndexBuffer2]
add e add e
ld e, a ld e, a
jr nc, .asm_2617 jr nc, .asm_2617
@ -1171,7 +1171,7 @@ CoordinatesEventText:: ; 2702
Function2707:: ; 2707 Function2707:: ; 2707
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld e, a ld e, a
ld d, $0 ld d, $0
ld hl, wd81e ld hl, wd81e
@ -1181,7 +1181,7 @@ Function2707:: ; 2707
; 2712 ; 2712
Function2712:: ; 2712 Function2712:: ; 2712
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld e, a ld e, a
ld d, $0 ld d, $0
ld hl, wd81e ld hl, wd81e
@ -1191,7 +1191,7 @@ Function2712:: ; 2712
; 271e ; 271e
Function271e:: ; 271e Function271e:: ; 271e
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld e, a ld e, a
ld d, $0 ld d, $0
ld hl, wd81e ld hl, wd81e
@ -1463,7 +1463,7 @@ SaveScreen:: ; 289d
ld de, XCoord + 1 ld de, XCoord + 1
ld a, [MapWidth] ld a, [MapWidth]
add $6 add $6
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld a, [wd151] ld a, [wd151]
and a and a
jr z, .asm_28cb jr z, .asm_28cb
@ -1477,7 +1477,7 @@ SaveScreen:: ; 289d
.asm_28c0 .asm_28c0
ld de, wdcbf ld de, wdcbf
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld c, a ld c, a
ld b, $0 ld b, $0
add hl, bc add hl, bc
@ -1512,7 +1512,7 @@ LoadNeighboringBlockData:: ; 28e3
ld l, a ld l, a
ld a, [MapWidth] ld a, [MapWidth]
add $6 add $6
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
ld de, XCoord + 1 ld de, XCoord + 1
ld b, $6 ld b, $6
ld c, $5 ld c, $5
@ -1537,7 +1537,7 @@ Function28f7:: ; 28f7
.asm_2908 .asm_2908
pop hl pop hl
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
ld c, a ld c, a
ld b, $0 ld b, $0
add hl, bc add hl, bc
@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29
GetAnyMapBank:: ; 2c31 GetAnyMapBank:: ; 2c31
push hl push hl
push de push de
ld de, $0000 ld de, NONE
call GetAnyMapHeaderMember call GetAnyMapHeaderMember
ld a, c ld a, c
pop de pop de

18
home/map_objects.asm
View File

@ -21,7 +21,7 @@ Function180e:: ; 180e
ld hl, UsedSprites + 2 ld hl, UsedSprites + 2
ld c, SPRITE_GFX_LIST_CAPACITY - 1 ld c, SPRITE_GFX_LIST_CAPACITY - 1
ld b, a ld b, a
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
cp 0 cp 0
jr z, .nope jr z, .nope
ld a, b ld a, b
@ -234,14 +234,14 @@ GetMapObject:: ; 18d2
Function18de:: ; 18de Function18de:: ; 18de
; Sets carry if the object is not visible on the screen. ; Sets carry if the object is not visible on the screen.
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call GetMapObject call GetMapObject
ld hl, MAPOBJECT_OBJECT_STRUCT_ID ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp -1 cp -1
jr z, .not_visible jr z, .not_visible
ld [hConnectedMapWidth], a ld [hMapObjectIndexBuffer2], a
call GetObjectStruct call GetObjectStruct
and a and a
ret ret
@ -326,7 +326,7 @@ Function18f5:: ; 18f5
; 194d ; 194d
Function194d:: ; 194d Function194d:: ; 194d
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call GetMapObject call GetMapObject
call CopyObjectStruct call CopyObjectStruct
ret ret
@ -335,16 +335,16 @@ Function194d:: ; 194d
_CopyObjectStruct:: ; 1956 _CopyObjectStruct:: ; 1956
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call Function271e call Function271e
ld a, [hConnectionStripLength] ld a, [hMapObjectIndexBuffer1]
call GetMapObject call GetMapObject
callba CopyObjectStruct callba CopyObjectStruct
ret ret
; 1967 ; 1967
Function1967:: ; 1967 Function1967:: ; 1967
ld [hConnectionStripLength], a ld [hMapObjectIndexBuffer1], a
call GetMapObject call GetMapObject
ld hl, MAPOBJECT_OBJECT_STRUCT_ID ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc add hl, bc
@ -569,12 +569,12 @@ endr
ld [hl], a ld [hl], a
ld a, [bc] ld a, [bc]
inc bc inc bc
ld hl, OBJECT_04 ld hl, OBJECT_FLAGS1
add hl, de add hl, de
ld [hl], a ld [hl], a
ld a, [bc] ld a, [bc]
inc bc inc bc
ld hl, OBJECT_FLAGS ld hl, OBJECT_FLAGS2
add hl, de add hl, de
ld [hl], a ld [hl], a
ld a, [bc] ld a, [bc]

2
home/menu.asm
View File

@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75
db $40 ; tile backup db $40 ; tile backup
db 0, 0 ; start coords db 0, 0 ; start coords
db 17, 19 ; end coords db 17, 19 ; end coords
dw $0000 dw NONE
db 1 ; default option db 1 ; default option
; 1d7d ; 1d7d

4
hram.asm
View File

@ -32,8 +32,8 @@ hJoyDown EQU $ffa8
hJoyLast EQU $ffa9 hJoyLast EQU $ffa9
hInMenu EQU $ffaa hInMenu EQU $ffaa
hConnectionStripLength EQU $ffaf hMapObjectIndexBuffer1 EQU $ffaf
hConnectedMapWidth EQU $ffb0 hMapObjectIndexBuffer2 EQU $ffb0
hPastLeadingZeroes EQU $ffb3 hPastLeadingZeroes EQU $ffb3

22
lib/mobile/main.asm
View File

@ -1,7 +1,7 @@
; A library included as part of the Mobile Adapter GB SDK. ; A library included as part of the Mobile Adapter GB SDK.
INCLUDE "gbhw.asm" INCLUDE "gbhw.asm"
NONE EQU 0
SECTION "Main", ROMX SECTION "Main", ROMX
@ -258,7 +258,7 @@ Function110115: ; 110115
cp $0 cp $0
jr z, .asm_11015d jr z, .asm_11015d
.asm_110158 .asm_110158
ld hl, $0000 ld hl, NONE
.asm_11015b .asm_11015b
ld a, e ld a, e
ret ret
@ -684,14 +684,14 @@ rept 2
inc de inc de
endr endr
pop hl pop hl
ld bc, $0000 ld bc, NONE
call Function110007 call Function110007
ld a, c ld a, c
ld [$cb7a], a ld [$cb7a], a
ld [$c86b], a ld [$c86b], a
push de push de
inc de inc de
ld bc, $0000 ld bc, NONE
ld a, $20 ld a, $20
call Function11000f call Function11000f
ld l, e ld l, e
@ -1021,7 +1021,7 @@ Function110615: ; 110615
push de push de
inc de inc de
ld a, b ld a, b
ld bc, $0000 ld bc, NONE
call Function11000f call Function11000f
ld a, c ld a, c
pop hl pop hl
@ -4810,7 +4810,7 @@ Function111f07: ; 111f07 (44:5f07)
Function111f63: ; 111f63 Function111f63: ; 111f63
push de push de
ld hl, $0000 ld hl, NONE
ld c, b ld c, b
xor a xor a
cp b cp b
@ -5233,7 +5233,7 @@ Function112271: ; 112271
cp $41 cp $41
jr nz, .asm_1122f5 jr nz, .asm_1122f5
ld b, $be ld b, $be
ld de, $0000 ld de, NONE
.asm_1122b3 .asm_1122b3
ld a, [hli] ld a, [hli]
add e add e
@ -6506,8 +6506,8 @@ Function112aac: ; 112aac
push af push af
ld a, [$c874] ld a, [$c874]
push af push af
ld bc, $0000 ld bc, NONE
ld de, $0000 ld de, NONE
.asm_112abe .asm_112abe
ld a, [hli] ld a, [hli]
cp $d cp $d
@ -6584,7 +6584,7 @@ Function112b11: ; 112b11
.asm_112b36 .asm_112b36
push hl push hl
ld hl, $c872 ld hl, $c872
ld de, $0000 ld de, NONE
ld a, b ld a, b
or a or a
jr z, .asm_112b49 jr z, .asm_112b49
@ -8226,7 +8226,7 @@ Function113519: ; 113519
cp $41 cp $41
jr nz, .asm_113586 jr nz, .asm_113586
ld b, $be ld b, $be
ld de, $0000 ld de, NONE
.asm_113551 .asm_113551
ld a, [hli] ld a, [hli]
add e add e

368
main.asm
View File

File diff suppressed because it is too large Load Diff

76
maps/AzaleaGym.asm
View File

@ -5,21 +5,21 @@ AzaleaGym_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
BugsyScript_0x18ec1e: BugsyScript:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_BEAT_BUGSY checkevent EVENT_BEAT_BUGSY
iftrue .FightDone iftrue .FightDone
writetext UnknownText_0x18ed0b writetext BugsyText_INeverLose
closetext closetext
loadmovesprites loadmovesprites
winlosstext UnknownText_0x18edae, $0000 winlosstext BugsyText_ResearchIncomplete, NONE
loadtrainer BUGSY, 1 loadtrainer BUGSY, 1
startbattle startbattle
returnafterbattle returnafterbattle
setevent EVENT_BEAT_BUGSY setevent EVENT_BEAT_BUGSY
loadfont loadfont
writetext UnknownText_0x18ee14 writetext Text_ReceivedHiveBadge
playsound SFX_GET_BADGE playsound SFX_GET_BADGE
waitbutton waitbutton
setflag ENGINE_HIVEBADGE setflag ENGINE_HIVEBADGE
@ -32,18 +32,18 @@ BugsyScript_0x18ec1e:
setevent EVENT_BEAT_BUG_CATCHER_BENNY setevent EVENT_BEAT_BUG_CATCHER_BENNY
setevent EVENT_BEAT_BUG_CATCHER_AL setevent EVENT_BEAT_BUG_CATCHER_AL
setevent EVENT_BEAT_BUG_CATCHER_JOSH setevent EVENT_BEAT_BUG_CATCHER_JOSH
writetext UnknownText_0x18ee2b writetext BugsyText_HiveBadgeSpeech
keeptextopen keeptextopen
verbosegiveitem TM_FURY_CUTTER, 1 verbosegiveitem TM_FURY_CUTTER, 1
iffalse .NoRoomForFuryCutter iffalse .NoRoomForFuryCutter
setevent EVENT_GOT_TM49_FURY_CUTTER setevent EVENT_GOT_TM49_FURY_CUTTER
writetext UnknownText_0x18eefa writetext BugsyText_FuryCutterSpeech
closetext closetext
loadmovesprites loadmovesprites
end end
.GotFuryCutter: .GotFuryCutter:
writetext UnknownText_0x18ef98 writetext BugsyText_BugMonsAreDeep
closetext closetext
.NoRoomForFuryCutter: .NoRoomForFuryCutter:
loadmovesprites loadmovesprites
@ -61,56 +61,56 @@ AzaleaGymTriggerRockets:
jumpstd radiotowerrockets jumpstd radiotowerrockets
TrainerTwinsAmyandmay1: TrainerTwinsAmyandmay1:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, .AfterScript trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, NONE, .AfterScript
.AfterScript: .AfterScript:
talkaftercancel talkaftercancel
loadfont loadfont
writetext UnknownText_0x18f1fc writetext TwinsAmyandmay1AfterBattleText
closetext closetext
loadmovesprites loadmovesprites
end end
TrainerTwinsAmyandmay2: TrainerTwinsAmyandmay2:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, .AfterScript trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, NONE, .AfterScript
.AfterScript: .AfterScript:
talkaftercancel talkaftercancel
loadfont loadfont
writetext UnknownText_0x18f269 writetext TwinsAmyandmay2AfterBattleText
closetext closetext
loadmovesprites loadmovesprites
end end
TrainerBug_catcherBug_catcher_benny: TrainerBug_catcherbenny:
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, .AfterScript trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, NONE, .AfterScript
.AfterScript: .AfterScript:
talkaftercancel talkaftercancel
loadfont loadfont
writetext UnknownText_0x18f053 writetext Bug_catcherbennyAfterBattleText
closetext closetext
loadmovesprites loadmovesprites
end end
TrainerBug_catcherAl: TrainerBug_catcherAl:
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, .AfterScript trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, NONE, .AfterScript
.AfterScript: .AfterScript:
talkaftercancel talkaftercancel
loadfont loadfont
writetext UnknownText_0x18f0d3 writetext Bug_catcherAlAfterBattleText
closetext closetext
loadmovesprites loadmovesprites
end end
TrainerBug_catcherJosh: TrainerBug_catcherJosh:
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, .AfterScript trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, NONE, .AfterScript
.AfterScript: .AfterScript:
talkaftercancel talkaftercancel
loadfont loadfont
writetext UnknownText_0x18f17e writetext Bug_catcherJoshAfterBattleText
closetext closetext
loadmovesprites loadmovesprites
end end
@ -140,7 +140,7 @@ AzaleaGymStatue:
trainertotext BUGSY, 1, $1 trainertotext BUGSY, 1, $1
jumpstd gymstatue2 jumpstd gymstatue2
UnknownText_0x18ed0b: BugsyText_INeverLose:
text "I'm BUGSY!" text "I'm BUGSY!"
line "I never lose when" line "I never lose when"
@ -158,7 +158,7 @@ UnknownText_0x18ed0b:
cont "from my studies." cont "from my studies."
done done
UnknownText_0x18edae: BugsyText_ResearchIncomplete:
text "Whoa, amazing!" text "Whoa, amazing!"
line "You're an expert" line "You're an expert"
cont "on #MON!" cont "on #MON!"
@ -170,12 +170,12 @@ UnknownText_0x18edae:
line "this BADGE." line "this BADGE."
done done
UnknownText_0x18ee14: Text_ReceivedHiveBadge:
text "<PLAYER> received" text "<PLAYER> received"
line "HIVEBADGE." line "HIVEBADGE."
done done
UnknownText_0x18ee2b: BugsyText_HiveBadgeSpeech:
text "Do you know the" text "Do you know the"
line "benefits of HIVE-" line "benefits of HIVE-"
cont "BADGE?" cont "BADGE?"
@ -196,7 +196,7 @@ UnknownText_0x18ee2b:
line "you to have this." line "you to have this."
done done
UnknownText_0x18eefa: BugsyText_FuryCutterSpeech:
text "TM49 contains" text "TM49 contains"
line "FURY CUTTER." line "FURY CUTTER."
@ -212,7 +212,7 @@ UnknownText_0x18eefa:
line "I discovered it!" line "I discovered it!"
done done
UnknownText_0x18ef98: BugsyText_BugMonsAreDeep:
text "Bug #MON are" text "Bug #MON are"
line "deep. There are" line "deep. There are"
@ -223,7 +223,7 @@ UnknownText_0x18ef98:
line "ites thoroughly." line "ites thoroughly."
done done
Bug_catcherBug_catcher_bennySeenText: Bug_catcherbennySeenText:
text "Bug #MON evolve" text "Bug #MON evolve"
line "young. So they get" line "young. So they get"
@ -231,12 +231,12 @@ Bug_catcherBug_catcher_bennySeenText:
line "faster." line "faster."
done done
Bug_catcherBug_catcher_bennyBeatenText: Bug_catcherbennyBeatenText:
text "Just evolving" text "Just evolving"
line "isn't enough!" line "isn't enough!"
done done
UnknownText_0x18f053: Bug_catcherbennyAfterBattleText:
text "#MON become" text "#MON become"
line "stronger if they" line "stronger if they"
cont "evolve. Really!" cont "evolve. Really!"
@ -255,7 +255,7 @@ Bug_catcherAlBeatenText:
line "tough you are…" line "tough you are…"
done done
UnknownText_0x18f0d3: Bug_catcherAlAfterBattleText:
text "They're so cool," text "They're so cool,"
line "but most girls" line "but most girls"
@ -279,7 +279,7 @@ Bug_catcherJoshBeatenText:
text "Urrgggh!" text "Urrgggh!"
done done
UnknownText_0x18f17e: Bug_catcherJoshAfterBattleText:
text "I guess I should" text "I guess I should"
line "teach them better" line "teach them better"
cont "moves…" cont "moves…"
@ -296,7 +296,7 @@ TwinsAmyandmay1BeatenText:
line "double goodness!" line "double goodness!"
done done
UnknownText_0x18f1fc: TwinsAmyandmay1AfterBattleText:
text "AMY: You're" text "AMY: You're"
line "really strong!" line "really strong!"
done done
@ -312,7 +312,7 @@ TwinsAmyandmay2BeatenText:
line "double goodness!" line "double goodness!"
done done
UnknownText_0x18f269: TwinsAmyandmay2AfterBattleText:
text "MAY: Our bug #-" text "MAY: Our bug #-"
line "MON lost! Oh, what" line "MON lost! Oh, what"
cont "a shame." cont "a shame."
@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
.PersonEvents: .PersonEvents:
db 7 db 7
person_event SPRITE_BUGSY, 7, 5, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript_0x18ec1e, -1 person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript, -1
person_event SPRITE_BUG_CATCHER, 3, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherBug_catcher_benny, -1 person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherbenny, -1
person_event SPRITE_BUG_CATCHER, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1 person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
person_event SPRITE_BUG_CATCHER, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1 person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
person_event SPRITE_TWIN, 10, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1 person_event SPRITE_TWIN, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
person_event SPRITE_TWIN, 10, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1 person_event SPRITE_TWIN, 10, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1 person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1

6
maps/AzaleaMart.asm
View File

@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
person_event SPRITE_COOLTRAINER_M, 5, 2, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1 person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
person_event SPRITE_BUG_CATCHER, 2, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1 person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1

10
maps/AzaleaPokeCenter1F.asm
View File

@ -3,7 +3,7 @@ AzaleaPokeCenter1F_MapScriptHeader:
db 1 db 1
; triggers ; triggers
dw UnknownScript_0x18db27, $0000 dw UnknownScript_0x18db27, NONE
.MapCallbacks: .MapCallbacks:
db 0 db 0
@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
person_event SPRITE_GENTLEMAN, 6, 9, $4, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1 person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
person_event SPRITE_FISHING_GURU, 1, 6, $6, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1 person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
person_event SPRITE_POKEFAN_F, 4, 1, $2, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1 person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1

30
maps/AzaleaTown.asm
View File

@ -3,9 +3,9 @@ AzaleaTown_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger1, $0000 dw .Trigger1, NONE
dw .Trigger2, $0000 dw .Trigger2, NONE
dw .Trigger3, $0000 dw .Trigger3, NONE
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
.PersonEvents: .PersonEvents:
db 12 db 12
person_event SPRITE_AZALEA_ROCKET, 9, 31, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
person_event SPRITE_GRAMPS, 9, 21, $2, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1 person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
person_event SPRITE_TEACHER, 13, 15, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1 person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
person_event SPRITE_YOUNGSTER, 9, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1 person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
person_event SPRITE_SLOWPOKE, 17, 8, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 9, 18, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 9, 29, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 15, 15, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_FRUIT_TREE, 2, 8, $1, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1 person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
person_event SPRITE_AZALEA_ROCKET, 10, 11, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
person_event SPRITE_AZALEA_ROCKET, 16, 10, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
person_event SPRITE_KURT_OUTSIDE, 5, 6, $8, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT

14
maps/BattleTower1F.asm
View File

@ -3,8 +3,8 @@ BattleTower1F_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x9e39d, $0000 dw UnknownScript_0x9e39d, NONE
dw UnknownScript_0x9e3d3, $0000 dw UnknownScript_0x9e3d3, NONE
.MapCallbacks: .MapCallbacks:
db 0 db 0
@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_RECEPTIONIST, 6, 7, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1 person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
person_event SPRITE_YOUNGSTER, 9, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1 person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
person_event SPRITE_COOLTRAINER_F, 9, 4, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1 person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
person_event SPRITE_BUG_CATCHER, 3, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1 person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
person_event SPRITE_GRANNY, 3, 14, $4, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1 person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1

8
maps/BattleTowerBattleRoom.asm
View File

@ -3,8 +3,8 @@ BattleTowerBattleRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw Script_EnterBattleRoom, $0000 dw Script_EnterBattleRoom, NONE
dw UnknownScript_0x9f420, $0000 dw UnknownScript_0x9f420, NONE
.MapCallbacks: .MapCallbacks:
db 0 db 0
@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_YOUNGSTER, 0, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
person_event SPRITE_RECEPTIONIST, 6, 1, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1 person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1

6
maps/BattleTowerElevator.asm
View File

@ -3,8 +3,8 @@ BattleTowerElevator_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x9f562, $0000 dw UnknownScript_0x9f562, NONE
dw UnknownScript_0x9f567, $0000 dw UnknownScript_0x9f567, NONE
.MapCallbacks: .MapCallbacks:
db 0 db 0
@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_RECEPTIONIST, 2, 1, $9, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1 person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1

6
maps/BattleTowerHallway.asm
View File

@ -3,8 +3,8 @@ BattleTowerHallway_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x9f5bb, $0000 dw UnknownScript_0x9f5bb, NONE
dw UnknownScript_0x9f5c0, $0000 dw UnknownScript_0x9f5c0, NONE
.MapCallbacks: .MapCallbacks:
db 0 db 0
@ -98,4 +98,4 @@ BattleTowerHallway_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_RECEPTIONIST, 2, 11, $6, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1 person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1

8
maps/BattleTowerOutside.asm
View File

@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_STANDING_YOUNGSTER, 12, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1 person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
person_event SPRITE_BUENA, 11, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1 person_event SPRITE_BUENA, 11, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
person_event SPRITE_SAILOR, 18, 12, $5, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
person_event SPRITE_LASS, 24, 12, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1 person_event SPRITE_LASS, 24, 12, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1

2
maps/BillsHouse.asm
View File

@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_GRAMPS, 3, 2, $7, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1 person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_07, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1

18
maps/BlackthornCity.asm
View File

@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
.PersonEvents: .PersonEvents:
db 9 db 9
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 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
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 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
person_event SPRITE_GRAMPS, 2, 20, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
person_event SPRITE_GRAMPS, 2, 21, $8, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN 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
person_event SPRITE_BLACK_BELT, 31, 24, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1 person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
person_event SPRITE_COOLTRAINER_F, 25, 9, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1 person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
person_event SPRITE_YOUNGSTER, 15, 13, $5, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1 person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
person_event SPRITE_YOUNGSTER, 20, 22, $6, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
person_event SPRITE_COOLTRAINER_F, 19, 35, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1 person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1

2
maps/BlackthornDodrioTradeHouse.asm
View File

@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_LASS, 3, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1 person_event SPRITE_LASS, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1

4
maps/BlackthornDragonSpeechHouse.asm
View File

@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_GRANNY, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1 person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
person_event SPRITE_EKANS, 5, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1 person_event SPRITE_EKANS, 5, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1

18
maps/BlackthornGym1F.asm
View File

@ -33,7 +33,7 @@ ClairScript_0x194e24:
writetext UnknownText_0x194efa writetext UnknownText_0x194efa
closetext closetext
loadmovesprites loadmovesprites
winlosstext UnknownText_0x194fd6, $0000 winlosstext UnknownText_0x194fd6, NONE
loadtrainer CLAIR, 1 loadtrainer CLAIR, 1
startbattle startbattle
returnafterbattle returnafterbattle
@ -87,7 +87,7 @@ UnknownScript_0x194e94:
end end
TrainerCooltrainermPaul: TrainerCooltrainermPaul:
trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, $0000, CooltrainermPaulScript trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, NONE, CooltrainermPaulScript
CooltrainermPaulScript: CooltrainermPaulScript:
talkaftercancel talkaftercancel
@ -98,7 +98,7 @@ CooltrainermPaulScript:
end end
TrainerCooltrainermMike: TrainerCooltrainermMike:
trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, $0000, CooltrainermMikeScript trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, NONE, CooltrainermMikeScript
CooltrainermMikeScript: CooltrainermMikeScript:
talkaftercancel talkaftercancel
@ -109,7 +109,7 @@ CooltrainermMikeScript:
end end
TrainerCooltrainerfLola: TrainerCooltrainerfLola:
trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, $0000, CooltrainerfLolaScript trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, NONE, CooltrainerfLolaScript
CooltrainerfLolaScript: CooltrainerfLolaScript:
talkaftercancel talkaftercancel
@ -404,8 +404,8 @@ BlackthornGym1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_CLAIR, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1 person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
person_event SPRITE_COOLTRAINER_M, 6, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1 person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
person_event SPRITE_COOLTRAINER_M, 14, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1 person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
person_event SPRITE_COOLTRAINER_F, 2, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1 person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1 person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1

20
maps/BlackthornGym2F.asm
View File

@ -59,7 +59,7 @@ BlackthornGymBoulder:
jumpstd strengthboulder jumpstd strengthboulder
TrainerCooltrainermCody: TrainerCooltrainermCody:
trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, $0000, CooltrainermCodyScript trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, NONE, CooltrainermCodyScript
CooltrainermCodyScript: CooltrainermCodyScript:
talkaftercancel talkaftercancel
@ -70,7 +70,7 @@ CooltrainermCodyScript:
end end
TrainerCooltrainerfFran: TrainerCooltrainerfFran:
trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, $0000, CooltrainerfFranScript trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, NONE, CooltrainerfFranScript
CooltrainerfFranScript: CooltrainerfFranScript:
talkaftercancel talkaftercancel
@ -145,11 +145,11 @@ BlackthornGym2F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 8 db 8
person_event SPRITE_COOLTRAINER_M, 1, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1 person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1
person_event SPRITE_COOLTRAINER_F, 11, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1 person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1
person_event SPRITE_BOULDER, 2, 8, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 person_event SPRITE_BOULDER, 2, 8, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
person_event SPRITE_BOULDER, 3, 2, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 person_event SPRITE_BOULDER, 3, 2, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
person_event SPRITE_BOULDER, 16, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 person_event SPRITE_BOULDER, 16, 6, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
person_event SPRITE_BOULDER, 3, 3, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1 person_event SPRITE_BOULDER, 3, 3, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 1, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1 person_event SPRITE_BOULDER, 1, 6, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 14, 8, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1 person_event SPRITE_BOULDER, 14, 8, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1

6
maps/BlackthornMart.asm
View File

@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1 person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1
person_event SPRITE_BLACK_BELT, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1 person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1

8
maps/BlackthornPokeCenter1F.asm
View File

@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1
person_event SPRITE_GENTLEMAN, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1 person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1
person_event SPRITE_TWIN, 4, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1 person_event SPRITE_TWIN, 4, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1 person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1

2
maps/BluesHouse.asm
View File

@ -158,4 +158,4 @@ BluesHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_DAISY, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1 person_event SPRITE_DAISY, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1

8
maps/BrunosRoom.asm
View File

@ -3,8 +3,8 @@ BrunosRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x180993, $0000 dw UnknownScript_0x180993, NONE
dw UnknownScript_0x180997, $0000 dw UnknownScript_0x180997, NONE
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -52,7 +52,7 @@ BrunoScript_0x1809c5:
writetext UnknownText_0x1809fe writetext UnknownText_0x1809fe
closetext closetext
loadmovesprites loadmovesprites
winlosstext UnknownText_0x180b23, $0000 winlosstext UnknownText_0x180b23, NONE
loadtrainer BRUNO, 1 loadtrainer BRUNO, 1
startbattle startbattle
returnafterbattle returnafterbattle
@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_BRUNO, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1 person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1

16
maps/BurnedTower1F.asm
View File

@ -3,9 +3,9 @@ BurnedTower1F_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw UnknownScript_0x185bf2, $0000 dw UnknownScript_0x185bf2, NONE
dw UnknownScript_0x185bf6, $0000 dw UnknownScript_0x185bf6, NONE
dw UnknownScript_0x185bf7, $0000 dw UnknownScript_0x185bf7, NONE
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -309,8 +309,8 @@ BurnedTower1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_ROCK, 4, 15, $18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1 person_event SPRITE_ROCK, 4, 15, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1
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 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
person_event SPRITE_SILVER, 9, 8, $8, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER person_event SPRITE_SILVER, 9, 8, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 14, 14, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY 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
person_event SPRITE_POKE_BALL, 2, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP

22
maps/BurnedTowerB1F.asm
View File

@ -3,8 +3,8 @@ BurnedTowerB1F_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x18615e, $0000 dw UnknownScript_0x18615e, NONE
dw UnknownScript_0x18615f, $0000 dw UnknownScript_0x18615f, NONE
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -251,12 +251,12 @@ BurnedTowerB1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 9 db 9
person_event SPRITE_BOULDER, 8, 17, $19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1 person_event SPRITE_BOULDER, 8, 17, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1
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 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
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 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
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 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
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 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
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 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
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 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
person_event SPRITE_POKE_BALL, 4, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
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 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

10
maps/CeladonCafe.asm
View File

@ -219,8 +219,8 @@ CeladonCafe_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_SUPER_NERD, 3, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1 person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1
person_event SPRITE_FISHER, 6, 4, $8, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1 person_event SPRITE_FISHER, 6, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1
person_event SPRITE_FISHER, 7, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1 person_event SPRITE_FISHER, 7, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1
person_event SPRITE_FISHER, 2, 1, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1 person_event SPRITE_FISHER, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1
person_event SPRITE_TEACHER, 3, 4, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1 person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1

18
maps/CeladonCity.asm
View File

@ -257,12 +257,12 @@ CeladonCity_MapEventHeader:
.PersonEvents: .PersonEvents:
db 9 db 9
person_event SPRITE_FISHER, 11, 26, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1 person_event SPRITE_FISHER, 11, 26, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1
person_event SPRITE_POLIWAG, 11, 27, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1 person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1
person_event SPRITE_TEACHER, 24, 20, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1 person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1
person_event SPRITE_GRAMPS, 16, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1 person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1
person_event SPRITE_GRAMPS, 31, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1 person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1
person_event SPRITE_YOUNGSTER, 13, 18, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1 person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1
person_event SPRITE_YOUNGSTER, 33, 24, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1 person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1
person_event SPRITE_TEACHER, 14, 6, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1 person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1
person_event SPRITE_LASS, 22, 7, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1 person_event SPRITE_LASS, 22, 7, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1

6
maps/CeladonDeptStore1F.asm
View File

@ -89,6 +89,6 @@ CeladonDeptStore1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_RECEPTIONIST, 1, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1 person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1
person_event SPRITE_GENTLEMAN, 4, 11, $2, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1 person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1
person_event SPRITE_TEACHER, 3, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1 person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1

8
maps/CeladonDeptStore2F.asm
View File

@ -82,7 +82,7 @@ CeladonDeptStore2F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1
person_event SPRITE_CLERK, 5, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1 person_event SPRITE_CLERK, 5, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1
person_event SPRITE_POKEFAN_M, 2, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1 person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1
person_event SPRITE_YOUNGSTER, 2, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1 person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1

10
maps/CeladonDeptStore3F.asm
View File

@ -107,8 +107,8 @@ CeladonDeptStore3F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_CLERK, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1 person_event SPRITE_CLERK, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1
person_event SPRITE_YOUNGSTER, 4, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1 person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1
person_event SPRITE_GAMEBOY_KID, 1, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1 person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1
person_event SPRITE_GAMEBOY_KID, 1, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1 person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1
person_event SPRITE_SUPER_NERD, 4, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1 person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1

6
maps/CeladonDeptStore4F.asm
View File

@ -65,6 +65,6 @@ CeladonDeptStore4F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1
person_event SPRITE_SUPER_NERD, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1 person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1
person_event SPRITE_YOUNGSTER, 2, 8, $7, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1 person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1

10
maps/CeladonDeptStore5F.asm
View File

@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_CLERK, 5, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1 person_event SPRITE_CLERK, 5, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1
person_event SPRITE_CLERK, 5, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1 person_event SPRITE_CLERK, 5, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1
person_event SPRITE_GENTLEMAN, 5, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1 person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1
person_event SPRITE_SAILOR, 4, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1 person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1
person_event SPRITE_TEACHER, 7, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1 person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1

4
maps/CeladonDeptStore6F.asm
View File

@ -168,5 +168,5 @@ CeladonDeptStore6F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_SUPER_NERD, 2, 9, $7, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1 person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1
person_event SPRITE_YOUNGSTER, 5, 12, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1 person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEFN_02, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1

18
maps/CeladonGameCorner.asm
View File

@ -325,12 +325,12 @@ CeladonGameCorner_MapEventHeader:
.PersonEvents: .PersonEvents:
db 9 db 9
person_event SPRITE_CLERK, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1 person_event SPRITE_CLERK, 2, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1
person_event SPRITE_RECEPTIONIST, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1 person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1
person_event SPRITE_POKEFAN_M, 10, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1 person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1
person_event SPRITE_TEACHER, 7, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1 person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1
person_event SPRITE_FISHING_GURU, 7, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1 person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1
person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1 person_event SPRITE_FISHER, 10, 8, SPRITEMOVEFN_08, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1 person_event SPRITE_FISHER, 10, 8, SPRITEMOVEFN_08, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
person_event SPRITE_GYM_GUY, 3, 11, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1 person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1
person_event SPRITE_GRAMPS, 8, 2, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1 person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1

4
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -284,5 +284,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_GENTLEMAN, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1 person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1
person_event SPRITE_PHARMACIST, 4, 4, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1 person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1

24
maps/CeladonGym.asm
View File

@ -13,7 +13,7 @@ ErikaScript_0x72a6a:
writetext UnknownText_0x72b28 writetext UnknownText_0x72b28
closetext closetext
loadmovesprites loadmovesprites
winlosstext UnknownText_0x72c3e, $0000 winlosstext UnknownText_0x72c3e, NONE
loadtrainer ERIKA, 1 loadtrainer ERIKA, 1
startbattle startbattle
returnafterbattle returnafterbattle
@ -42,7 +42,7 @@ UnknownScript_0x72aae:
end end
TrainerLassMichelle: TrainerLassMichelle:
trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, $0000, LassMichelleScript trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, NONE, LassMichelleScript
LassMichelleScript: LassMichelleScript:
talkaftercancel talkaftercancel
@ -53,7 +53,7 @@ LassMichelleScript:
end end
TrainerPicnickerTanya: TrainerPicnickerTanya:
trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, $0000, PicnickerTanyaScript trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, NONE, PicnickerTanyaScript
PicnickerTanyaScript: PicnickerTanyaScript:
talkaftercancel talkaftercancel
@ -64,7 +64,7 @@ PicnickerTanyaScript:
end end
TrainerBeautyJulia: TrainerBeautyJulia:
trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, $0000, BeautyJuliaScript trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, NONE, BeautyJuliaScript
BeautyJuliaScript: BeautyJuliaScript:
talkaftercancel talkaftercancel
@ -75,7 +75,7 @@ BeautyJuliaScript:
end end
TrainerTwinsJoandzoe1: TrainerTwinsJoandzoe1:
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, $0000, TwinsJoandzoe1Script trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, NONE, TwinsJoandzoe1Script
TwinsJoandzoe1Script: TwinsJoandzoe1Script:
talkaftercancel talkaftercancel
@ -86,7 +86,7 @@ TwinsJoandzoe1Script:
end end
TrainerTwinsJoandzoe2: TrainerTwinsJoandzoe2:
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, $0000, TwinsJoandzoe2Script trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, NONE, TwinsJoandzoe2Script
TwinsJoandzoe2Script: TwinsJoandzoe2Script:
talkaftercancel talkaftercancel
@ -278,9 +278,9 @@ CeladonGym_MapEventHeader:
.PersonEvents: .PersonEvents:
db 6 db 6
person_event SPRITE_ERIKA, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1 person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1
person_event SPRITE_LASS, 8, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1 person_event SPRITE_LASS, 8, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1
person_event SPRITE_LASS, 8, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1 person_event SPRITE_LASS, 8, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1
person_event SPRITE_BUENA, 5, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1 person_event SPRITE_BUENA, 5, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1
person_event SPRITE_TWIN, 10, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1 person_event SPRITE_TWIN, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1
person_event SPRITE_TWIN, 10, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1 person_event SPRITE_TWIN, 10, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1

8
maps/CeladonMansion1F.asm
View File

@ -91,7 +91,7 @@ CeladonMansion1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_GRANNY, 5, 1, $3, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1 person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1
person_event SPRITE_GROWLITHE, 6, 2, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1 person_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1
person_event SPRITE_CLEFAIRY, 4, 3, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1 person_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1
person_event SPRITE_GROWLITHE, 4, 4, $16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1 person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEFN_16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1

8
maps/CeladonMansion3F.asm
View File

@ -206,7 +206,7 @@ CeladonMansion3F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_COOLTRAINER_M, 6, 3, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1 person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1
person_event SPRITE_GYM_GUY, 4, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1 person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1
person_event SPRITE_SUPER_NERD, 7, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1 person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1
person_event SPRITE_FISHER, 4, 0, $7, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1 person_event SPRITE_FISHER, 4, 0, SPRITEMOVEFN_07, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1

2
maps/CeladonMansionRoof.asm
View File

@ -49,4 +49,4 @@ CeladonMansionRoof_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_FISHER, 5, 7, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1 person_event SPRITE_FISHER, 5, 7, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1

2
maps/CeladonMansionRoofHouse.asm
View File

@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_PHARMACIST, 2, 3, $6, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1 person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEFN_06, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1

10
maps/CeladonPokeCenter1F.asm
View File

@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1
person_event SPRITE_GENTLEMAN, 5, 1, $5, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1 person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1
person_event SPRITE_PHARMACIST, 3, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1 person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1
person_event SPRITE_COOLTRAINER_F, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1 person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1
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 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

12
maps/CeruleanCity.asm
View File

@ -299,9 +299,9 @@ CeruleanCity_MapEventHeader:
.PersonEvents: .PersonEvents:
db 6 db 6
person_event SPRITE_COOLTRAINER_M, 23, 15, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1 person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEFN_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1
person_event SPRITE_SUPER_NERD, 15, 23, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1 person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1
person_event SPRITE_SLOWPOKE, 24, 20, $1, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1 person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1
person_event SPRITE_COOLTRAINER_F, 24, 21, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1 person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1
person_event SPRITE_FISHER, 26, 30, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1 person_event SPRITE_FISHER, 26, 30, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1
person_event SPRITE_YOUNGSTER, 12, 6, $3, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1 person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEFN_03, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1

24
maps/CeruleanGym.asm
View File

@ -3,8 +3,8 @@ CeruleanGym_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x1883d9, $0000 dw UnknownScript_0x1883d9, NONE
dw UnknownScript_0x1883da, $0000 dw UnknownScript_0x1883da, NONE
.MapCallbacks: .MapCallbacks:
db 0 db 0
@ -60,7 +60,7 @@ MistyScript_0x188432:
writetext UnknownText_0x188674 writetext UnknownText_0x188674
closetext closetext
loadmovesprites loadmovesprites
winlosstext UnknownText_0x18870c, $0000 winlosstext UnknownText_0x18870c, NONE
loadtrainer MISTY, 1 loadtrainer MISTY, 1
startbattle startbattle
returnafterbattle returnafterbattle
@ -80,7 +80,7 @@ MistyScript_0x188432:
end end
TrainerSwimmerfDiana: TrainerSwimmerfDiana:
trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, $0000, SwimmerfDianaScript trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, NONE, SwimmerfDianaScript
SwimmerfDianaScript: SwimmerfDianaScript:
talkaftercancel talkaftercancel
@ -91,7 +91,7 @@ SwimmerfDianaScript:
end end
TrainerSwimmerfBriana: TrainerSwimmerfBriana:
trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, $0000, SwimmerfBrianaScript trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, NONE, SwimmerfBrianaScript
SwimmerfBrianaScript: SwimmerfBrianaScript:
talkaftercancel talkaftercancel
@ -102,7 +102,7 @@ SwimmerfBrianaScript:
end end
TrainerSwimmermParker: TrainerSwimmermParker:
trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, $0000, SwimmermParkerScript trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, NONE, SwimmermParkerScript
SwimmermParkerScript: SwimmermParkerScript:
talkaftercancel talkaftercancel
@ -377,9 +377,9 @@ CeruleanGym_MapEventHeader:
.PersonEvents: .PersonEvents:
db 6 db 6
person_event SPRITE_ROCKET, 10, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET person_event SPRITE_ROCKET, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
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 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
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 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
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 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
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 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
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 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

2
maps/CeruleanGymBadgeSpeechHouse.asm
View File

@ -30,4 +30,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKEFAN_M, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x188002, -1 person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x188002, -1

6
maps/CeruleanMart.asm
View File

@ -57,6 +57,6 @@ CeruleanMart_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x188ac0, -1 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x188ac0, -1
person_event SPRITE_COOLTRAINER_M, 6, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x188ac7, -1 person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x188ac7, -1
person_event SPRITE_COOLTRAINER_F, 2, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x188aca, -1 person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x188aca, -1

6
maps/CeruleanPokeCenter1F.asm
View File

@ -75,6 +75,6 @@ CeruleanPokeCenter1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18820f, -1 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18820f, -1
person_event SPRITE_SUPER_NERD, 4, 8, $5, 0, 1, -1, -1, 0, 0, 0, SuperNerdScript_0x188212, -1 person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SuperNerdScript_0x188212, -1
person_event SPRITE_GYM_GUY, 5, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x18821e, -1 person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x18821e, -1

6
maps/CeruleanPoliceStation.asm
View File

@ -55,6 +55,6 @@ CeruleanPoliceStation_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_FISHING_GURU, 1, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x18804a, -1 person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x18804a, -1
person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x18804d, -1 person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x18804d, -1
person_event SPRITE_DIGLETT, 5, 3, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, DiglettScript_0x188050, -1 person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, DiglettScript_0x188050, -1

8
maps/CeruleanTradeSpeechHouse.asm
View File

@ -64,7 +64,7 @@ CeruleanTradeSpeechHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_GRANNY, 4, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x188133, -1 person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x188133, -1
person_event SPRITE_GRAMPS, 2, 1, $2, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x188136, -1 person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEFN_02, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x188136, -1
person_event SPRITE_RHYDON, 2, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, RhydonScript_0x188139, -1 person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, RhydonScript_0x188139, -1
person_event SPRITE_ZUBAT, 6, 5, $16, 0, 0, -1, -1, 0, 0, 0, ZubatScript_0x188143, -1 person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ZubatScript_0x188143, -1

6
maps/CharcoalKiln.asm
View File

@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_BLACK_BELT, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
person_event SPRITE_YOUNGSTER, 3, 5, $2, 1, 1, -1, -1, 0, 0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE person_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
person_event SPRITE_MOLTRES, 6, 5, $16, 2, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D 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

14
maps/CherrygroveCity.asm
View File

@ -3,8 +3,8 @@ CherrygroveCity_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger1, $0000 dw .Trigger1, NONE
dw .Trigger2, $0000 dw .Trigger2, NONE
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -570,8 +570,8 @@ CherrygroveCity_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_GRAMPS, 6, 32, $6, 0, 0, -1, -1, 0, 0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
person_event SPRITE_SILVER, 6, 39, $3, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY person_event SPRITE_SILVER, 6, 39, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
person_event SPRITE_TEACHER, 12, 27, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x19c146, -1 person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x19c146, -1
person_event SPRITE_YOUNGSTER, 7, 23, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19c15a, -1 person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19c15a, -1
person_event SPRITE_FISHER, 12, 7, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MysticWaterGuy, -1 person_event SPRITE_FISHER, 12, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MysticWaterGuy, -1

4
maps/CherrygroveEvolutionSpeechHouse.asm
View File

@ -56,5 +56,5 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_LASS, 5, 3, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x196cb9, -1 person_event SPRITE_LASS, 5, 3, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x196cb9, -1
person_event SPRITE_YOUNGSTER, 5, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196cb2, -1 person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196cb2, -1

4
maps/CherrygroveGymSpeechHouse.asm
View File

@ -59,5 +59,5 @@ CherrygroveGymSpeechHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x196ae1, -1 person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x196ae1, -1
person_event SPRITE_BUG_CATCHER, 5, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x196ae4, -1 person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x196ae4, -1

8
maps/CherrygroveMart.asm
View File

@ -9,7 +9,7 @@ ClerkScript_0x19680a:
loadfont loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196817 iftrue UnknownScript_0x196817
pokemart $0, $0000 pokemart $0, NONE
loadmovesprites loadmovesprites
end end
@ -83,6 +83,6 @@ CherrygroveMart_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x19680a, -1 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x19680a, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x19681d, -1 person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x19681d, -1
person_event SPRITE_YOUNGSTER, 5, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196831, -1 person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196831, -1

8
maps/CherrygrovePokeCenter1F.asm
View File

@ -80,7 +80,7 @@ CherrygrovePokeCenter1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19696d, -1 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x19696d, -1
person_event SPRITE_FISHER, 3, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x196970, -1 person_event SPRITE_FISHER, 3, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x196970, -1
person_event SPRITE_GENTLEMAN, 6, 8, $7, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196973, -1 person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x196973, -1
person_event SPRITE_TEACHER, 6, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x196976, -1 person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x196976, -1

30
maps/CianwoodCity.asm
View File

@ -3,8 +3,8 @@ CianwoodCity_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger1, $0000 dw .Trigger1, NONE
dw .Trigger2, $0000 dw .Trigger2, NONE
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -52,7 +52,7 @@ UnknownScript_0x1a001e:
writetext UnknownText_0x1a0433 writetext UnknownText_0x1a0433
closetext closetext
loadmovesprites loadmovesprites
winlosstext UnknownText_0x1a05a1, $0000 winlosstext UnknownText_0x1a05a1, NONE
setlasttalked $c setlasttalked $c
loadtrainer MYSTICALMAN, EUSINE loadtrainer MYSTICALMAN, EUSINE
startbattle startbattle
@ -401,15 +401,15 @@ CianwoodCity_MapEventHeader:
.PersonEvents: .PersonEvents:
db 12 db 12
person_event SPRITE_STANDING_YOUNGSTER, 37, 21, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, StandingYoungsterScript_0x1a00b3, -1 person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, StandingYoungsterScript_0x1a00b3, -1
person_event SPRITE_POKEFAN_M, 33, 17, $5, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x1a00b6, -1 person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, PokefanMScript_0x1a00b6, -1
person_event SPRITE_LASS, 42, 14, $4, 2, 0, -1, -1, 0, 0, 0, LassScript_0x1a00b9, -1 person_event SPRITE_LASS, 42, 14, SPRITEMOVEFN_04, 2, 0, -1, -1, 0, 0, 0, LassScript_0x1a00b9, -1
person_event SPRITE_ROCK, 16, 8, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 16, 8, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 17, 9, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 17, 9, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 25, 4, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 25, 4, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 29, 5, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 29, 5, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 27, 10, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 27, 10, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 19, 4, $18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 19, 4, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, CianwoodCityRock, -1
person_event SPRITE_POKEFAN_F, 46, 10, $5, 0, 1, -1, -1, 0, 0, 0, PokefanFScript_0x1a0084, -1 person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, PokefanFScript_0x1a0084, -1
person_event SPRITE_SUPER_NERD, 21, 11, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE 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
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 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

2
maps/CianwoodCityPhotoStudio.asm
View File

@ -62,4 +62,4 @@ CianwoodCityPhotoStudio_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_FISHING_GURU, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x9e0e0, -1 person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FishingGuruScript_0x9e0e0, -1

28
maps/CianwoodGym.asm
View File

@ -28,7 +28,7 @@ ChuckScript_0x9d60f:
writetext UnknownText_0x9d78a writetext UnknownText_0x9d78a
closetext closetext
loadmovesprites loadmovesprites
winlosstext UnknownText_0x9d7f6, $0000 winlosstext UnknownText_0x9d7f6, NONE
loadtrainer CHUCK, 1 loadtrainer CHUCK, 1
startbattle startbattle
returnafterbattle returnafterbattle
@ -76,7 +76,7 @@ CianwoodGymTriggerRockets:
jumpstd radiotowerrockets jumpstd radiotowerrockets
TrainerBlackbeltYoshi: TrainerBlackbeltYoshi:
trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, $0000, BlackbeltYoshiScript trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, NONE, BlackbeltYoshiScript
BlackbeltYoshiScript: BlackbeltYoshiScript:
talkaftercancel talkaftercancel
@ -87,7 +87,7 @@ BlackbeltYoshiScript:
end end
TrainerBlackbeltLao: TrainerBlackbeltLao:
trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, $0000, BlackbeltLaoScript trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, NONE, BlackbeltLaoScript
BlackbeltLaoScript: BlackbeltLaoScript:
talkaftercancel talkaftercancel
@ -98,7 +98,7 @@ BlackbeltLaoScript:
end end
TrainerBlackbeltNob: TrainerBlackbeltNob:
trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, $0000, BlackbeltNobScript trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, NONE, BlackbeltNobScript
BlackbeltNobScript: BlackbeltNobScript:
talkaftercancel talkaftercancel
@ -109,7 +109,7 @@ BlackbeltNobScript:
end end
TrainerBlackbeltLung: TrainerBlackbeltLung:
trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, $0000, BlackbeltLungScript trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, NONE, BlackbeltLungScript
BlackbeltLungScript: BlackbeltLungScript:
talkaftercancel talkaftercancel
@ -313,12 +313,12 @@ CianwoodGym_MapEventHeader:
.PersonEvents: .PersonEvents:
db 9 db 9
person_event SPRITE_CHUCK, 1, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ChuckScript_0x9d60f, -1 person_event SPRITE_CHUCK, 1, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ChuckScript_0x9d60f, -1
person_event SPRITE_BLACK_BELT, 12, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltYoshi, -1 person_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltYoshi, -1
person_event SPRITE_BLACK_BELT, 12, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltLao, -1 person_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBlackbeltLao, -1
person_event SPRITE_BLACK_BELT, 9, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltNob, -1 person_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBlackbeltNob, -1
person_event SPRITE_BLACK_BELT, 5, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBlackbeltLung, -1 person_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 1, TrainerBlackbeltLung, -1
person_event SPRITE_BOULDER, 1, 5, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1 person_event SPRITE_BOULDER, 1, 5, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 7, 3, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1 person_event SPRITE_BOULDER, 7, 3, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 7, 4, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1 person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 7, 5, $19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1 person_event SPRITE_BOULDER, 7, 5, SPRITEMOVEFN_19, 0, 0, -1, -1, 0, 0, 0, CianwoodGymBoulder, -1

6
maps/CianwoodLugiaSpeechHouse.asm
View File

@ -75,6 +75,6 @@ CianwoodLugiaSpeechHouse_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_TEACHER, 4, 2, $6, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9e1b0, -1 person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x9e1b0, -1
person_event SPRITE_LASS, 5, 6, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9e1b3, -1 person_event SPRITE_LASS, 5, 6, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9e1b3, -1
person_event SPRITE_TWIN, 2, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TwinScript_0x9e1b6, -1 person_event SPRITE_TWIN, 2, 0, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TwinScript_0x9e1b6, -1

4
maps/CianwoodPharmacy.asm
View File

@ -3,7 +3,7 @@ CianwoodPharmacy_MapScriptHeader:
db 1 db 1
; triggers ; triggers
dw CianwoodPharmacyTrigger, $0000 dw CianwoodPharmacyTrigger, NONE
.MapCallbacks: .MapCallbacks:
db 0 db 0
@ -90,4 +90,4 @@ CianwoodPharmacy_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_PHARMACIST, 3, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodPharmacist, -1 person_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodPharmacist, -1

8
maps/CianwoodPokeCenter1F.asm
View File

@ -143,7 +143,7 @@ CianwoodPokeCenter1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9dbcf, -1 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x9dbcf, -1
person_event SPRITE_LASS, 5, 1, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9dbd2, -1 person_event SPRITE_LASS, 5, 1, SPRITEMOVEFN_04, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x9dbd2, -1
person_event SPRITE_GYM_GUY, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodGymGuyScript, -1 person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CianwoodGymGuyScript, -1
person_event SPRITE_SUPER_NERD, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x9dbea, -1 person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x9dbea, -1

2
maps/CinnabarIsland.asm
View File

@ -146,4 +146,4 @@ CinnabarIsland_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_BLUE, 6, 9, $3, 0, 0, -1, -1, 0, 0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR person_event SPRITE_BLUE, 6, 9, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR

6
maps/CinnabarPokeCenter1F.asm
View File

@ -47,6 +47,6 @@ CinnabarPokeCenter1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ab32c, -1 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x1ab32c, -1
person_event SPRITE_COOLTRAINER_F, 6, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1ab32f, -1 person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1ab32f, -1
person_event SPRITE_FISHER, 4, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ab332, -1 person_event SPRITE_FISHER, 4, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1ab332, -1

10
maps/Colosseum.asm
View File

@ -3,9 +3,9 @@ Colosseum_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger1, $0000 dw .Trigger1, NONE
dw .Trigger2, $0000 dw .Trigger2, NONE
dw .Trigger3, $0000 dw .Trigger3, NONE
.MapCallbacks: .MapCallbacks:
db 2 db 2
@ -83,5 +83,5 @@ Colosseum_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT

6
maps/CopycatsHouse1F.asm
View File

@ -85,6 +85,6 @@ CopycatsHouse1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x18ad13, -1 person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x18ad13, -1
person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PokefanFScript_0x18ad16, -1 person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PokefanFScript_0x18ad16, -1
person_event SPRITE_CLEFAIRY, 6, 6, $16, 0, 0, -1, -1, 0, 0, 0, ClefairyScript_0x18ad2a, -1 person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, 0, 0, 0, ClefairyScript_0x18ad2a, -1

12
maps/CopycatsHouse2F.asm
View File

@ -373,9 +373,9 @@ CopycatsHouse2F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 6 db 6
person_event SPRITE_COPYCAT, 3, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Copycat, EVENT_COPYCAT_1 person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, Copycat, EVENT_COPYCAT_1
person_event SPRITE_MOLTRES, 4, 6, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CopycatsDodrio, -1 person_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CopycatsDodrio, -1
person_event SPRITE_FAIRY, 1, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL 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
person_event SPRITE_MONSTER, 1, 2, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CopycatsHouse2FDoll, -1 person_event SPRITE_MONSTER, 1, 2, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CopycatsHouse2FDoll, -1
person_event SPRITE_BIRD, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopycatsHouse2FDoll, -1 person_event SPRITE_BIRD, 1, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopycatsHouse2FDoll, -1
person_event SPRITE_COPYCAT, 3, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, Copycat, EVENT_COPYCAT_2 person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, Copycat, EVENT_COPYCAT_2

28
maps/DanceTheatre.asm
View File

@ -6,7 +6,7 @@ DanceTheatre_MapScriptHeader:
db 0 db 0
TrainerKimono_girlNaoko2: TrainerKimono_girlNaoko2:
trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, $0000, Kimono_girlNaoko2Script trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, NONE, Kimono_girlNaoko2Script
Kimono_girlNaoko2Script: Kimono_girlNaoko2Script:
talkaftercancel talkaftercancel
@ -17,7 +17,7 @@ Kimono_girlNaoko2Script:
end end
TrainerKimono_girlSayo: TrainerKimono_girlSayo:
trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, $0000, Kimono_girlSayoScript trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, NONE, Kimono_girlSayoScript
Kimono_girlSayoScript: Kimono_girlSayoScript:
talkaftercancel talkaftercancel
@ -28,7 +28,7 @@ Kimono_girlSayoScript:
end end
TrainerKimono_girlZuki: TrainerKimono_girlZuki:
trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, $0000, Kimono_girlZukiScript trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, NONE, Kimono_girlZukiScript
Kimono_girlZukiScript: Kimono_girlZukiScript:
talkaftercancel talkaftercancel
@ -39,7 +39,7 @@ Kimono_girlZukiScript:
end end
TrainerKimono_girlKuni: TrainerKimono_girlKuni:
trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, $0000, Kimono_girlKuniScript trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, NONE, Kimono_girlKuniScript
Kimono_girlKuniScript: Kimono_girlKuniScript:
talkaftercancel talkaftercancel
@ -50,7 +50,7 @@ Kimono_girlKuniScript:
end end
TrainerKimono_girlMiki: TrainerKimono_girlMiki:
trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, $0000, Kimono_girlMikiScript trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, NONE, Kimono_girlMikiScript
Kimono_girlMikiScript: Kimono_girlMikiScript:
talkaftercancel talkaftercancel
@ -345,12 +345,12 @@ DanceTheatre_MapEventHeader:
.PersonEvents: .PersonEvents:
db 9 db 9
person_event SPRITE_KIMONO_GIRL, 2, 0, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlNaoko2, -1 person_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlNaoko2, -1
person_event SPRITE_KIMONO_GIRL, 1, 2, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlSayo, -1 person_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlSayo, -1
person_event SPRITE_KIMONO_GIRL, 2, 6, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerKimono_girlZuki, -1 person_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 0, TrainerKimono_girlZuki, -1
person_event SPRITE_KIMONO_GIRL, 1, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlKuni, -1 person_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerKimono_girlKuni, -1
person_event SPRITE_KIMONO_GIRL, 2, 11, $1f, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlMiki, -1 person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEFN_1F, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 0, TrainerKimono_girlMiki, -1
person_event SPRITE_GENTLEMAN, 10, 7, $7, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x994c6, -1 person_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x994c6, -1
person_event SPRITE_RHYDON, 8, 6, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RhydonScript_0x9951b, -1 person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, RhydonScript_0x9951b, -1
person_event SPRITE_COOLTRAINER_M, 10, 10, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x99525, -1 person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x99525, -1
person_event SPRITE_GRANNY, 6, 3, $7, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99528, -1 person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x99528, -1

6
maps/DarkCaveBlackthornEntrance.asm
View File

@ -73,6 +73,6 @@ DarkCaveBlackthornEntrance_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_PHARMACIST, 3, 7, $3, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x18c720, -1 person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x18c720, -1
person_event SPRITE_POKE_BALL, 24, 21, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
person_event SPRITE_POKE_BALL, 22, 7, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE 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

16
maps/DarkCaveVioletEntrance.asm
View File

@ -43,11 +43,11 @@ DarkCaveVioletEntrance_MapEventHeader:
.PersonEvents: .PersonEvents:
db 8 db 8
person_event SPRITE_POKE_BALL, 8, 6, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
person_event SPRITE_ROCK, 14, 16, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 14, 16, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 6, 27, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 6, 27, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 14, 7, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 14, 7, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 31, 36, $18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 31, 36, SPRITEMOVEFN_18, 0, 0, -1, -1, 0, 0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_POKE_BALL, 22, 36, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL 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
person_event SPRITE_POKE_BALL, 9, 35, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION 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
person_event SPRITE_POKE_BALL, 28, 30, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT 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

4
maps/DayCare.asm
View File

@ -175,5 +175,5 @@ DayCare_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_GRAMPS, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE
person_event SPRITE_GRANNY, 3, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrannyScript_0x62fc3, -1 person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrannyScript_0x62fc3, -1

2
maps/DiglettsCave.asm
View File

@ -42,4 +42,4 @@ DiglettsCave_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKEFAN_M, 31, 3, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x74002, -1 person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x74002, -1

12
maps/DragonShrine.asm
View File

@ -3,8 +3,8 @@ DragonShrine_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger1, $0000 dw .Trigger1, NONE
dw .Trigger2, $0000 dw .Trigger2, NONE
.MapCallbacks: .MapCallbacks:
db 0 db 0
@ -681,7 +681,7 @@ DragonShrine_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_ELDER, 1, 5, $6, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_ELDER, 1, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_ELDER, 4, 2, $9, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_ELDER, 4, 2, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_ELDER, 4, 7, $8, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_ELDER, 4, 7, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_CLAIR, 8, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR person_event SPRITE_CLAIR, 8, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR

30
maps/DragonsDenB1F.asm
View File

@ -3,8 +3,8 @@ DragonsDenB1F_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x18c89d, $0000 dw UnknownScript_0x18c89d, NONE
dw UnknownScript_0x18c89e, $0000 dw UnknownScript_0x18c89e, NONE
.MapCallbacks: .MapCallbacks:
db 1 db 1
@ -78,7 +78,7 @@ UnknownScript_0x18c8f9:
end end
TrainerCooltrainermDarin: TrainerCooltrainermDarin:
trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, $0000, CooltrainermDarinScript trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, NONE, CooltrainermDarinScript
CooltrainermDarinScript: CooltrainermDarinScript:
talkaftercancel talkaftercancel
@ -89,7 +89,7 @@ CooltrainermDarinScript:
end end
TrainerCooltrainerfCara: TrainerCooltrainerfCara:
trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, $0000, CooltrainerfCaraScript trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, NONE, CooltrainerfCaraScript
CooltrainerfCaraScript: CooltrainerfCaraScript:
talkaftercancel talkaftercancel
@ -100,7 +100,7 @@ CooltrainerfCaraScript:
end end
TrainerTwinsLeaandpia1: TrainerTwinsLeaandpia1:
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, $0000, TwinsLeaandpia1Script trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, NONE, TwinsLeaandpia1Script
TwinsLeaandpia1Script: TwinsLeaandpia1Script:
talkaftercancel talkaftercancel
@ -111,7 +111,7 @@ TwinsLeaandpia1Script:
end end
TrainerTwinsLeaandpia2: TrainerTwinsLeaandpia2:
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, $0000, TwinsLeaandpia2Script trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, NONE, TwinsLeaandpia2Script
TwinsLeaandpia2Script: TwinsLeaandpia2Script:
talkaftercancel talkaftercancel
@ -419,12 +419,12 @@ DragonsDenB1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 9 db 9
person_event SPRITE_POKE_BALL, 16, 35, $1, 0, 0, -1, -1, 0, 0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG person_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
person_event SPRITE_CLAIR, 30, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR person_event SPRITE_CLAIR, 30, 14, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
person_event SPRITE_SILVER, 23, 20, $2, 2, 2, -1, -1, 0, 0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN person_event SPRITE_SILVER, 23, 20, SPRITEMOVEFN_02, 2, 2, -1, -1, 0, 0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
person_event SPRITE_COOLTRAINER_M, 8, 20, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermDarin, -1 person_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 4, TrainerCooltrainermDarin, -1
person_event SPRITE_COOLTRAINER_F, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfCara, -1 person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainerfCara, -1
person_event SPRITE_TWIN, 17, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia1, -1 person_event SPRITE_TWIN, 17, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia1, -1
person_event SPRITE_TWIN, 18, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia2, -1 person_event SPRITE_TWIN, 18, 4, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsLeaandpia2, -1
person_event SPRITE_POKE_BALL, 4, 30, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM
person_event SPRITE_POKE_BALL, 20, 5, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER

14
maps/EarlsPokemonAcademy.asm
View File

@ -106,7 +106,7 @@ AcademyBlackboard:
dn 3, 2 ; rows, columns dn 3, 2 ; rows, columns
db 5 ; spacing db 5 ; spacing
dbw BANK(.Text), .Text dbw BANK(.Text), .Text
dbw $1a, $0000 dbw $1a, NONE
.Text .Text
db "PSN@" db "PSN@"
@ -425,9 +425,9 @@ EarlsPokemonAcademy_MapEventHeader:
.PersonEvents: .PersonEvents:
db 6 db 6
person_event SPRITE_FISHER, 2, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL person_event SPRITE_FISHER, 2, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
person_event SPRITE_YOUNGSTER, 5, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x68a83, -1 person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x68a83, -1
person_event SPRITE_GAMEBOY_KID, 11, 3, $6, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x68a86, -1 person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, GameboyKidScript_0x68a86, -1
person_event SPRITE_GAMEBOY_KID, 11, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x68a91, -1 person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x68a91, -1
person_event SPRITE_YOUNGSTER, 7, 4, $7, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x68a9c, -1 person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x68a9c, -1
person_event SPRITE_POKEDEX, 4, 2, $1, 0, 0, -1, -1, 0, 0, 0, AcademyNotebook, -1 person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, AcademyNotebook, -1

14
maps/EcruteakCity.asm
View File

@ -290,10 +290,10 @@ EcruteakCity_MapEventHeader:
.PersonEvents: .PersonEvents:
db 7 db 7
person_event SPRITE_GRAMPS, 15, 18, $2, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a4009, -1 person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEFN_02, 1, 1, -1, -1, 0, 0, 0, GrampsScript_0x1a4009, -1
person_event SPRITE_GRAMPS, 21, 20, $3, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a400c, -1 person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a400c, -1
person_event SPRITE_LASS, 29, 21, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1a4012, -1 person_event SPRITE_LASS, 29, 21, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, LassScript_0x1a4012, -1
person_event SPRITE_LASS, 9, 3, $7, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a4015, -1 person_event SPRITE_LASS, 9, 3, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a4015, -1
person_event SPRITE_FISHER, 22, 9, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a4029, -1 person_event SPRITE_FISHER, 22, 9, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a4029, -1
person_event SPRITE_YOUNGSTER, 14, 10, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a403d, -1 person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x1a403d, -1
person_event SPRITE_GRAMPS, 7, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS 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

Some files were not shown because too many files have changed in this diff Show More