diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-02 14:37:02 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-02 14:37:02 -0500 |
| commit | 72af3337fd8746c51aac273b6c056209e73c7ae0 (patch) | |
| tree | 661d1515bcee017ce4652bc02d0691e00992ec9a | |
| parent | e0d6e9ca7acf8a23ad70fad405ddf1073dcd4291 (diff) | |
No more NONE
185 files changed, 1343 insertions, 1345 deletions
diff --git a/audio/cries.asm b/audio/cries.asm index 6f15d029e..fc7e371d1 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -370,7 +370,7 @@ Cry_2C_branch_f3022: ; f3022 unknownmusic0xde $52 sound $4, $f1, $0796 sound $4, $f1, $072d - sound $7, $0, NONE + sound $7, $0, 0 sound $10, $f1, $07a7 endchannel ; f3035 @@ -381,7 +381,7 @@ Cry_2C_Ch6: ; f3038 Cry_2C_branch_f3038: ; f3038 callchannel Cry_2C_branch_f3022 loopchannel 2, Cry_2C_branch_f3038 - sound $e, $0, NONE + sound $e, $0, 0 sound $8, $f2, $07c2 endchannel ; f3048 @@ -398,7 +398,7 @@ Cry_27_Ch5: ; f3048 Cry_27_Ch6: ; f305b unknownmusic0xde $2a sound $3, $2c, $07c7 - sound $1, $0, NONE + sound $1, $0, 0 sound $5, $59, $07be sound $6, $b4, $07bd endchannel @@ -621,7 +621,7 @@ Cry_36_Ch6: ; f3200 Cry_36_branch_f3202: ; f3202 sound $3, $f8, $0791 sound $3, $d8, $078d - sound $2, $0, NONE + sound $2, $0, 0 sound $1, $78, $06c1 sound $1, $f8, $0741 sound $4, $e1, $0751 @@ -646,7 +646,7 @@ Cry_43_Ch5: ; f322e sound $8, $ab, $0734 sound $4, $d6, $0716 sound $8, $d1, $0712 - sound $8, $0, NONE + sound $8, $0, 0 endchannel ; f3249 @@ -658,7 +658,7 @@ Cry_43_Ch6: ; f3249 sound $8, $cb, $0754 sound $4, $f6, $0736 sound $8, $f1, $0732 - sound $8, $0, NONE + sound $8, $0, 0 endchannel ; f3264 @@ -1213,7 +1213,7 @@ Cry_09_Ch5: ; f361f Cry_09_Ch6: ; f363c unknownmusic0xde $5 - sound $2, $8, NONE + sound $2, $8, 0 sound $f, $a7, $06a1 sound $6, $86, $06a2 sound $a, $74, $06a1 @@ -1312,7 +1312,7 @@ Cry_11_Ch5: ; f3703 Cry_11_Ch6: ; f3722 unknownmusic0xde $a - sound $4, $8, NONE + sound $4, $8, 0 sound $6, $a7, $0741 sound $8, $86, $0743 sound $4, $76, $0741 @@ -1587,7 +1587,7 @@ Cry_0B_Ch5: ; f394b Cry_0B_Ch6: ; f3976 unknownmusic0xde $44 - sound $c, $8, NONE + sound $c, $8, 0 sound $4, $f1, $0701 sound $4, $e1, $0782 sound $4, $d1, $0741 @@ -1670,7 +1670,7 @@ Cry_0D_branch_f3a1a: ; f3a1a Cry_0D_Ch6: ; f3a39 unknownmusic0xde $40 - sound $4, $8, NONE + sound $4, $8, 0 sound $5, $f2, $0651 sound $9, $d1, $0661 sound $5, $e2, $0614 @@ -1738,7 +1738,7 @@ Cry_0A_Ch5: ; f3aba Cry_0A_Ch6: ; f3ad9 unknownmusic0xde $5 - sound $3, $8, NONE + sound $3, $8, 0 sound $8, $a7, $06a1 sound $6, $86, $06a3 sound $3, $74, $06a1 diff --git a/audio/engine.asm b/audio/engine.asm index a995dd2a2..0c4ebcad3 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -2773,7 +2773,7 @@ LoadMusicByte:: ; e8d76 ; e8d80 FrequencyTable: ; e8d80 - dw NONE ; filler + dw 0 ; filler dw $f82c dw $f89d dw $f907 diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm index 4f9c320a7..95cdb3b0b 100644 --- a/audio/music/battletowertheme.asm +++ b/audio/music/battletowertheme.asm @@ -242,7 +242,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970 note __, 1 note F_, 4 note __, 4 - tone NONE + tone 0 intensity $b7 note G_, 2 octave 4 diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index a595b8cd0..823e85423 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -14,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2 notetype $6, $87 tone $0001 callchannel Music_LookKimonoGirl_branch_f7aa8 - tone NONE + tone 0 Music_LookKimonoGirl_branch_f79d7: ; f79d7 notetype $c, $b2 callchannel Music_LookKimonoGirl_branch_f7a13 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index b70823ba9..2e3b82115 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -490,7 +490,7 @@ Music_TitleScreen_Ch2: ; eb984 octave 4 note A_, 4 stereopanning $ff - tone NONE + tone 0 notetype $c, $b0 octave 3 note B_, 6 @@ -775,7 +775,7 @@ Music_TitleScreen_Ch3: ; ebb01 note __, 1 stereopanning $ff notetype $c, $16 - tone NONE + tone 0 octave 4 note A_, 2 octave 5 diff --git a/audio/sfx.asm b/audio/sfx.asm index 820f5ceae..2d2f9c314 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -151,7 +151,7 @@ Sfx_Save_Ch5: ; f09b6 Sfx_Save_Ch6: ; f09d5 dutycycle $2 - sound $2, $8, NONE + sound $2, $8, 0 sound $2, $a1, $0701 sound $1, $91, $0601 sound $1, $91, $0681 @@ -2291,7 +2291,7 @@ Sfx_Sketch_Ch5: ; f12f9 Sfx_Sketch_branch_f12fd: ; f12fd sound $2, $f1, $06e0 sound $d, $af, $05b0 - sound $4, $0, NONE + sound $4, $0, 0 sound $9, $f4, $0718 loopchannel 3, Sfx_Sketch_branch_f12fd soundinput $8 @@ -2490,15 +2490,15 @@ Sfx_Nightmare_Ch5: ; f1420 soundinput $34 Sfx_Nightmare_branch_f1424: ; f1424 sound $3, $ba, $0631 - sound $2, $0, NONE + sound $2, $0, 0 sound $3, $f8, $0621 - sound $2, $0, NONE + sound $2, $0, 0 sound $3, $f8, $0611 - sound $2, $0, NONE + sound $2, $0, 0 sound $3, $e8, $0601 - sound $2, $0, NONE + sound $2, $0, 0 sound $3, $e8, $05f1 - sound $2, $0, NONE + sound $2, $0, 0 loopchannel 2, Sfx_Nightmare_branch_f1424 soundinput $8 endchannel @@ -2540,11 +2540,11 @@ Sfx_SweetKiss2_Ch5: ; f1482 dutycycle $0 soundinput $97 sound $2, $f4, $0772 - sound $4, $0, NONE + sound $4, $0, 0 sound $2, $c4, $0772 - sound $4, $0, NONE + sound $4, $0, 0 sound $2, $b4, $0772 - sound $4, $0, NONE + sound $4, $0, 0 sound $2, $a1, $0772 soundinput $8 endchannel @@ -2591,7 +2591,7 @@ Sfx_SludgeBomb_Ch5: ; f14d6 dutycycle $2 soundinput $c5 sound $3, $f8, $0581 - sound $1, $0, NONE + sound $1, $0, 0 soundinput $cb sound $10, $f2, $05d1 soundinput $8 @@ -2613,9 +2613,9 @@ Sfx_Foresight_Ch5: ; f14f8 sound $3, $f4, $07b5 sound $3, $f5, $07c8 sound $8, $f4, $07da - sound $2, $0, NONE + sound $2, $0, 0 sound $8, $c1, $07da - sound $2, $0, NONE + sound $2, $0, 0 sound $8, $91, $07da endchannel ; f1515 @@ -2811,7 +2811,7 @@ Sfx_Return_branch_f163c: ; f163c sound $8, $f1, $0759 soundinput $57 sound $8, $f1, $0759 - sound $10, $0, NONE + sound $10, $0, 0 loopchannel 2, Sfx_Return_branch_f163c soundinput $8 endchannel @@ -2849,7 +2849,7 @@ Sfx_MilkDrink_branch_f1684: ; f1684 sound $d, $f7, $0290 soundinput $9e sound $4, $c9, $05e1 - sound $2, $0, NONE + sound $2, $0, 0 loopchannel 6, Sfx_MilkDrink_branch_f1684 soundinput $8 endchannel @@ -2864,7 +2864,7 @@ Sfx_Present_Ch5: ; f16a2 soundinput $d6 Sfx_Present_branch_f16a6: ; f16a6 sound $2, $f1, $0740 - sound $1, $0, NONE + sound $1, $0, 0 loopchannel 3, Sfx_Present_branch_f16a6 sound $10, $f1, $0780 soundinput $8 @@ -2882,9 +2882,9 @@ Sfx_MorningSun_branch_f16be: ; f16be sound $2, $f1, $07e0 sound $5, $f2, $07e7 loopchannel 3, Sfx_MorningSun_branch_f16be - sound $1, $0, NONE + sound $1, $0, 0 sound $8, $c2, $07e7 - sound $1, $0, NONE + sound $1, $0, 0 sound $8, $82, $07e7 endchannel ; f16df @@ -2913,10 +2913,10 @@ Sfx_Encore: ; f16fd Sfx_Encore_Ch5: ; f1703 dutycycle $2 soundinput $ce - sound $10, $0, NONE + sound $10, $0, 0 Sfx_Encore_branch_f170b: ; f170b sound $2, $f8, $0774 - sound $24, $0, NONE + sound $24, $0, 0 loopchannel 2, Sfx_Encore_branch_f170b soundinput $8 endchannel @@ -2966,9 +2966,9 @@ Sfx_BatonPass_Ch5: ; f1752 soundinput $f7 sound $20, $f2, $0680 sound $1, $f1, $0760 - sound $20, $0, NONE + sound $20, $0, 0 sound $1, $f1, $0760 - sound $1a, $0, NONE + sound $1a, $0, 0 sound $1, $f1, $0760 soundinput $8 endchannel @@ -3836,27 +3836,27 @@ Sfx_BallBounce: ; f1b63 Sfx_BallBounce_Ch5: ; f1b69 dutycycle $2 sound $8, $e1, $0740 - sound $17, $0, NONE + sound $17, $0, 0 sound $8, $b1, $0740 - sound $17, $0, NONE + sound $17, $0, 0 sound $8, $81, $0740 - sound $17, $0, NONE + sound $17, $0, 0 sound $8, $51, $0740 - sound $17, $0, NONE + sound $17, $0, 0 endchannel ; f1b8c Sfx_BallBounce_Ch6: ; f1b8c dutycycle $2 - sound $2, $8, NONE + sound $2, $8, 0 sound $8, $b1, $0741 - sound $17, $0, NONE + sound $17, $0, 0 sound $8, $81, $0741 - sound $17, $0, NONE + sound $17, $0, 0 sound $8, $51, $0741 - sound $17, $0, NONE + sound $17, $0, 0 sound $8, $21, $0741 - sound $17, $0, NONE + sound $17, $0, 0 endchannel ; f1bb3 @@ -3916,7 +3916,7 @@ Sfx_GiveTrademon: ; f1c10 ; f1c13 Sfx_GiveTrademon_Ch5: ; f1c13 - sound $20, $0, NONE + sound $20, $0, 0 dutycycle $1 soundinput $a7 sound $1b, $f4, $0750 @@ -3936,7 +3936,7 @@ Sfx_GetTrademon: ; f1c3e ; f1c41 Sfx_GetTrademon_Ch5: ; f1c41 - sound $20, $0, NONE + sound $20, $0, 0 dutycycle $2 soundinput $bf sound $1b, $14, $07bc @@ -3959,7 +3959,7 @@ Sfx_TrainArrived: ; f1c6c Sfx_TrainArrived_Ch6: ; f1c75 tone $0008 - sound $8, $0, NONE + sound $8, $0, 0 Sfx_TrainArrived_Ch5: ; f1c7c dutycycle $2 sound $4, $5f, $0691 @@ -4060,7 +4060,7 @@ Sfx_SwitchPokemon_Ch5: ; f1d0f Sfx_SwitchPokemon_Ch6: ; f1d16 dutycycle $2 - sound $2, $8, NONE + sound $2, $8, 0 sound $8, $b1, $0741 endchannel ; f1d21 @@ -4093,7 +4093,7 @@ Sfx_Tally_Ch5: ; f1d43 Sfx_Tally_Ch6: ; f1d4a dutycycle $2 - sound $1, $8, NONE + sound $1, $8, 0 sound $4, $a1, $0761 endchannel ; f1d55 @@ -4107,7 +4107,7 @@ Sfx_Transaction_Ch5: ; f1d55 Sfx_Transaction_Ch6: ; f1d60 dutycycle $2 - sound $1, $8, NONE + sound $1, $8, 0 sound $4, $91, $06c1 sound $18, $a2, $07a1 endchannel @@ -4183,7 +4183,7 @@ Sfx_GotSafariBalls_Ch5: ; f1dd4 Sfx_BootPc_Ch5: ; f1de3 dutycycle $2 sound $f, $f2, $07c0 - sound $f, $0, NONE + sound $f, $0, 0 sound $3, $a1, $0780 sound $3, $a1, $0700 sound $3, $a1, $0740 @@ -4200,16 +4200,16 @@ Sfx_ShutDownPc_Ch5: ; f1e0e sound $4, $f0, $0600 sound $4, $f0, $0400 sound $4, $f0, $0200 - sound $1, $0, NONE + sound $1, $0, 0 endchannel ; f1e21 Sfx_ChoosePcOption_Ch5: ; f1e21 dutycycle $2 sound $6, $f0, $0700 - sound $4, $0, NONE + sound $4, $0, 0 sound $6, $f0, $0700 - sound $1, $0, NONE + sound $1, $0, 0 endchannel ; f1e34 @@ -4227,11 +4227,11 @@ Sfx_EscapeRope_Ch5: ; f1e34 Sfx_PushButton_Ch5: ; f1e4f dutycycle $2 - sound $4, $0, NONE + sound $4, $0, 0 sound $2, $f1, $0680 - sound $1, $0, NONE + sound $1, $0, 0 sound $4, $f1, $0780 - sound $4, $0, NONE + sound $4, $0, 0 endchannel ; f1e66 @@ -4242,7 +4242,7 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66 soundinput $22 sound $2, $f1, $0500 soundinput $8 - sound $1, $0, NONE + sound $1, $0, 0 endchannel ; f1e7b @@ -4319,18 +4319,18 @@ Sfx_Wrong_Ch5: ; f1f05 soundinput $5a sound $4, $f0, $0500 soundinput $8 - sound $4, $0, NONE + sound $4, $0, 0 sound $f, $f0, $0500 - sound $1, $0, NONE + sound $1, $0, 0 endchannel ; f1f1c Sfx_Wrong_Ch6: ; f1f1c dutycycle $3 sound $4, $f0, $0401 - sound $4, $0, NONE + sound $4, $0, 0 sound $f, $f0, $0401 - sound $1, $0, NONE + sound $1, $0, 0 endchannel ; f1f2f @@ -4357,7 +4357,7 @@ Sfx_Strength_Ch8: ; f1f3a Sfx_Boat_Ch5: ; f1f53 dutycycle $2 sound $f, $f0, $0500 - sound $4, $0, NONE + sound $4, $0, 0 sound $f, $f0, $0500 sound $f, $f0, $0500 sound $f, $f0, $0500 @@ -4369,7 +4369,7 @@ Sfx_Boat_Ch5: ; f1f53 Sfx_Boat_Ch6: ; f1f72 dutycycle $3 sound $f, $f0, $0482 - sound $4, $0, NONE + sound $4, $0, 0 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, $07c0 sound $a, $e1, $07e0 - sound $1, $0, NONE + sound $1, $0, 0 endchannel ; f1ff4 @@ -4493,7 +4493,7 @@ Sfx_Call_Ch5: ; f2052 sound $4, $f7, $07a0 sound $4, $f7, $07a0 soundinput $8 - sound $4, $0, NONE + sound $4, $0, 0 endchannel ; f206f @@ -5483,13 +5483,13 @@ Sfx_HangUp_Ch5: ; f26f1 dutycycle $2 sound $4, $b8, $077b sound $2, $21, $077b - sound $10, $0, NONE + sound $10, $0, 0 Sfx_HangUp_branch_f26ff: ; f26ff Sfx_NoSignal_Ch5: ; f26ff Sfx_NoSignal_branch_f26ff: ; f26ff dutycycle $2 sound $14, $e8, $070b - sound $1c, $0, NONE + sound $1c, $0, 0 loopchannel 3, Sfx_HangUp_branch_f26ff endchannel ; f270e @@ -5526,8 +5526,8 @@ Sfx_Elevator_branch_f2726: ; f2726 Sfx_Elevator_Ch6: ; f274b Sfx_Elevator_Ch7: ; f274b - sound $60, $0, NONE - sound $53, $0, NONE + sound $60, $0, 0 + sound $53, $0, 0 endchannel ; f2754 diff --git a/audio/sfx_crystal.asm b/audio/sfx_crystal.asm index 797032251..59f4a50ee 100644 --- a/audio/sfx_crystal.asm +++ b/audio/sfx_crystal.asm @@ -84,7 +84,7 @@ Sfx_IntroPichu_Ch5: ; 1798ad dutycycle $3 soundinput $4d sound $1, $88, $0770 - sound $3, $0, NONE + sound $3, $0, 0 soundinput $17 sound $2, $88, $0776 endchannel diff --git a/audio/trainer_encounters.asm b/audio/trainer_encounters.asm index 622ba4a34..e909c96e6 100644 --- a/audio/trainer_encounters.asm +++ b/audio/trainer_encounters.asm @@ -7,7 +7,7 @@ PlayTrainerEncounterMusic:: ; e900a ld [MusicFade], a ; play nothing for one frame push de - ld de, NONE ; id: Music_Nothing + ld de, 0 ; id: Music_Nothing call PlayMusic call DelayFrame ; play new song diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm index 21707f14c..f4aea5163 100644 --- a/battle/anim_objects.asm +++ b/battle/anim_objects.asm @@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1) Functioncc9bd: ; cc9bd - ld hl, NONE + ld hl, 0 add hl, bc ld [hl], $0 ret diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm index 23beebc16..a337d458b 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -1,5 +1,5 @@ - dw NONE ; padding + dw 0 ; padding BattleCommandPointers: ; 3fd28 dw BattleCommand01 ; 34084 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index d333a5114..d8e5fc9e5 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -1,4 +1,3 @@ -NONE EQU 0 PARTY_LENGTH EQU 6 MAX_ITEMS EQU 20 diff --git a/data/battle_tower.asm b/data/battle_tower.asm index 281c359d7..b0455eb10 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -773,7 +773,7 @@ BattleTowerMons1: db UNOWN db BERRY - db HIDDEN_POWER, NONE, NONE, NONE + db HIDDEN_POWER, 0, 0, 0 dw 0 ; OT ID dt 1000 ; Exp ; Stat exp diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm index 37a63f476..96a6717b9 100644 --- a/data/odd_eggs.asm +++ b/data/odd_eggs.asm @@ -125,7 +125,7 @@ OddEggs: ; 1fb56e OddEgg1: db PICHU db NO_ITEM - db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE + db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 dw 02048 ; OT ID dt 125 ; Exp ; Stat exp @@ -152,7 +152,7 @@ OddEgg1: OddEgg2: db PICHU db NO_ITEM - db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE + db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 dw 00256 ; OT ID dt 125 ; Exp ; Stat exp @@ -178,7 +178,7 @@ OddEgg2: db CLEFFA db NO_ITEM - db POUND, CHARM, DIZZY_PUNCH, NONE + db POUND, CHARM, DIZZY_PUNCH, 0 dw 04096 ; OT ID dt 125 ; Exp ; Stat exp @@ -204,7 +204,7 @@ OddEgg2: db CLEFFA db NO_ITEM - db POUND, CHARM, DIZZY_PUNCH, NONE + db POUND, CHARM, DIZZY_PUNCH, 0 dw 00768 ; OT ID dt 125 ; Exp ; Stat exp @@ -230,7 +230,7 @@ OddEgg2: db IGGLYBUFF db NO_ITEM - db SING, CHARM, DIZZY_PUNCH, NONE + db SING, CHARM, DIZZY_PUNCH, 0 dw 04096 ; OT ID dt 125 ; Exp ; Stat exp @@ -256,7 +256,7 @@ OddEgg2: db IGGLYBUFF db NO_ITEM - db SING, CHARM, DIZZY_PUNCH, NONE + db SING, CHARM, DIZZY_PUNCH, 0 dw 00768 ; OT ID dt 125 ; Exp ; Stat exp @@ -282,7 +282,7 @@ OddEgg2: db SMOOCHUM db NO_ITEM - db POUND, LICK, DIZZY_PUNCH, NONE + db POUND, LICK, DIZZY_PUNCH, 0 dw 03584 ; OT ID dt 125 ; Exp ; Stat exp @@ -308,7 +308,7 @@ OddEgg2: db SMOOCHUM db NO_ITEM - db POUND, LICK, DIZZY_PUNCH, NONE + db POUND, LICK, DIZZY_PUNCH, 0 dw 00512 ; OT ID dt 125 ; Exp ; Stat exp @@ -334,7 +334,7 @@ OddEgg2: db MAGBY db NO_ITEM - db EMBER, DIZZY_PUNCH, NONE, NONE + db EMBER, DIZZY_PUNCH, 0, 0 dw 02560 ; OT ID dt 125 ; Exp ; Stat exp @@ -360,7 +360,7 @@ OddEgg2: db MAGBY db NO_ITEM - db EMBER, DIZZY_PUNCH, NONE, NONE + db EMBER, DIZZY_PUNCH, 0, 0 dw 00512 ; OT ID dt 125 ; Exp ; Stat exp @@ -386,7 +386,7 @@ OddEgg2: db ELEKID db NO_ITEM - db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE + db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0 dw 03072 ; OT ID dt 125 ; Exp ; Stat exp @@ -412,7 +412,7 @@ OddEgg2: db ELEKID db NO_ITEM - db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE + db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0 dw 00512 ; OT ID dt 125 ; Exp ; Stat exp @@ -438,7 +438,7 @@ OddEgg2: db TYROGUE db NO_ITEM - db TACKLE, DIZZY_PUNCH, NONE, NONE + db TACKLE, DIZZY_PUNCH, 0, 0 dw 02560 ; OT ID dt 125 ; Exp ; Stat exp @@ -464,7 +464,7 @@ OddEgg2: db TYROGUE db NO_ITEM - db TACKLE, DIZZY_PUNCH, NONE, NONE + db TACKLE, DIZZY_PUNCH, 0, 0 dw 00256 ; OT ID dt 125 ; Exp ; Stat exp diff --git a/engine/events_2.asm b/engine/events_2.asm index 16739d9f3..9dd604a47 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -441,14 +441,14 @@ Function97e5c:: ; 97e5c ; 97e72 Function97e72: ; 97e72 - ld hl, NONE + ld hl, 0 add hl, bc ld [hl], 0 ret ; 97e79 Function97e79: ; 97e79 - ld hl, NONE + ld hl, 0 add hl, bc ld a, [hl] cp 5 @@ -620,7 +620,7 @@ Function97f42: ; 97f42 .asm_97f47 push af - ld hl, NONE + ld hl, 0 add hl, de ld a, [hl] and a diff --git a/engine/map_objects.asm b/engine/map_objects.asm index ee5727f37..a5d792204 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -3103,7 +3103,7 @@ Function57e2: ; 57e2 ld a, d and %10000000 ret z - ld bc, NONE ; debug? + ld bc, 0 ; debug? ld hl, OBJECT_FACING add hl, bc ld a, [hl] diff --git a/event/battle_tower.asm b/event/battle_tower.asm index 6865830e7..03d24a972 100644 --- a/event/battle_tower.asm +++ b/event/battle_tower.asm @@ -117,7 +117,7 @@ JumpText_YouCantTakeAnEgg: ; 0x8b256 ; 0x8b25b Function8b25b: ; 8b25b - ld bc, NONE + ld bc, 0 .asm_8b25e call Function8b26c call c, Function8b28e diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index f973c0abd..695999e82 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -445,7 +445,7 @@ PokeAnim_End: ; d02a8 Functiond02ae: ; d02ae ld c, a ld b, $0 - ld hl, NONE + ld hl, 0 ld a, [w2_d173] call AddNTimes ld a, h diff --git a/home/map.asm b/home/map.asm index a15e32893..d2a5b1771 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29 GetAnyMapBank:: ; 2c31 push hl push de - ld de, NONE + ld de, 0 call GetAnyMapHeaderMember ld a, c pop de diff --git a/home/menu.asm b/home/menu.asm index a88545713..a42b29cd1 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75 db $40 ; tile backup db 0, 0 ; start coords db 17, 19 ; end coords - dw NONE + dw 0 db 1 ; default option ; 1d7d diff --git a/items/item_attributes.asm b/items/item_attributes.asm index a4db95f63..b0ba5febf 100644 --- a/items/item_attributes.asm +++ b/items/item_attributes.asm @@ -8,222 +8,222 @@ ENDM Item1Attributes: ; MASTER BALL - item_attribute 0, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE Item2Attributes: ; ULTRA BALL - item_attribute 1200, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 1200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; BRIGHTPOWDER item_attribute 10, HELD_BRIGHTPOWDER, 20, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; GREAT BALL - item_attribute 600, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 600, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; # BALL - item_attribute 200, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BICYCLE - item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; MOON STONE - item_attribute 0, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ANTIDOTE - item_attribute 100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; BURN HEAL - item_attribute 250, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ICE HEAL - item_attribute 250, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; AWAKENING - item_attribute 250, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; PARLYZ HEAL - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; FULL RESTORE - item_attribute 3000, NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 3000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; MAX POTION - item_attribute 2500, NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 2500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; HYPER POTION - item_attribute 1200, NONE, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 1200, 0, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; SUPER POTION - item_attribute 700, NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 700, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; POTION - item_attribute 300, NONE, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ESCAPE ROPE - item_attribute 550, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; REPEL - item_attribute 350, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; MAX ELIXER - item_attribute 4500, NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 4500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; FIRE STONE - item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; THUNDERSTONE - item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; WATER STONE - item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; HP UP - item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; PROTEIN - item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; IRON - item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; CARBOS - item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; LUCKY PUNCH - item_attribute 10, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CALCIUM - item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; RARE CANDY - item_attribute 4800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 4800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; X ACCURACY - item_attribute 950, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 950, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; LEAF STONE - item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; METAL POWDER item_attribute 10, HELD_METAL_POWDER, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; NUGGET - item_attribute 10000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 10000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; # DOLL - item_attribute 1000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; FULL HEAL - item_attribute 600, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 600, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; REVIVE - item_attribute 1500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 1500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; MAX REVIVE - item_attribute 4000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 4000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; GUARD SPEC. - item_attribute 700, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; SUPER REPEL - item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; MAX REPEL - item_attribute 700, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; DIRE HIT - item_attribute 650, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 650, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; FRESH WATER - item_attribute 200, NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 200, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; SODA POP - item_attribute 300, NONE, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 300, 0, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; LEMONADE - item_attribute 350, NONE, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 350, 0, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; X ATTACK - item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; X DEFEND - item_attribute 550, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; X SPEED - item_attribute 350, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; X SPECIAL - item_attribute 350, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; COIN CASE - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; ITEMFINDER - item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EXP.SHARE - item_attribute 3000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; OLD ROD - item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; GOOD ROD - item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; SILVER LEAF - item_attribute 1000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SUPER ROD - item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; PP UP - item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ETHER - item_attribute 1200, NONE, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 1200, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; MAX ETHER - item_attribute 2000, NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 2000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ELIXER - item_attribute 3000, NONE, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 3000, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; RED SCALE - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SECRETPOTION - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; S.S.TICKET - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MYSTERY EGG - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CLEAR BELL - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SILVER WING - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MOOMOO MILK - item_attribute 500, NONE, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 500, 0, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; QUICK CLAW item_attribute 100, HELD_QUICK_CLAW, 60, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE @@ -232,7 +232,7 @@ Item2Attributes: item_attribute 10, HELD_HEAL_POISON, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; GOLD LEAF - item_attribute 1000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SOFT SAND item_attribute 100, HELD_GROUND_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE @@ -262,31 +262,31 @@ Item2Attributes: item_attribute 10, HELD_HEAL_SLEEP, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; RED APRICORN - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TINYMUSHROOM - item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BIG MUSHROOM - item_attribute 5000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 5000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SILVERPOWDER item_attribute 100, HELD_BUG_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLU APRICORN - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; AMULET COIN item_attribute 100, HELD_AMULET_COIN, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; YLW APRICORN - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; GRN APRICORN - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CLEANSE TAG item_attribute 200, HELD_CLEANSE_TAG, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE @@ -298,31 +298,31 @@ Item2Attributes: item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; WHT APRICORN - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLACKBELT item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLK APRICORN - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PNK APRICORN - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLACKGLASSES item_attribute 100, HELD_DARK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SLOWPOKETAIL - item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PINK BOW item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STICK - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SMOKE BALL item_attribute 200, HELD_ESCAPE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE @@ -337,88 +337,88 @@ Item2Attributes: item_attribute 10, HELD_HEAL_STATUS, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; PEARL - item_attribute 1400, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 1400, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BIG PEARL - item_attribute 7500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 7500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EVERSTONE - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SPELL TAG item_attribute 100, HELD_GHOST_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; RAGECANDYBAR - item_attribute 300, NONE, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; GS BALL - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLUE CARD - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; MIRACLE SEED item_attribute 100, HELD_GRASS_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; THICK CLUB - item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; FOCUS BAND item_attribute 200, HELD_FOCUS_BAND, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ENERGYPOWDER - item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ENERGY ROOT - item_attribute 800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; HEAL POWDER - item_attribute 450, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 450, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; REVIVAL HERB - item_attribute 2800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 2800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; HARD STONE item_attribute 100, HELD_ROCK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LUCKY EGG - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CARD KEY - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; MACHINE PART - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EGG TICKET - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LOST ITEM - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STARDUST - item_attribute 2000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STAR PIECE - item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BASEMENT KEY - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; PASS - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CHARCOAL item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE @@ -430,31 +430,31 @@ Item2Attributes: item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; METAL COAT item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; DRAGON FANG - item_attribute 100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LEFTOVERS item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MYSTERYBERRY item_attribute 10, HELD_RESTORE_PP, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY @@ -463,67 +463,67 @@ Item2Attributes: item_attribute 2100, HELD_DRAGON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BERSERK GENE - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SACRED ASH - item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; HEAVY BALL - item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; FLOWER MAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LEVEL BALL - item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; LURE BALL - item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; FAST BALL - item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LIGHT BALL - item_attribute 100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; FRIEND BALL - item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; MOON BALL - item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; LOVE BALL - item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; NORMAL BOX - item_attribute 10, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; GORGEOUS BOX - item_attribute 10, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; SUN STONE - item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; POLKADOT BOW item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; UP-GRADE - item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BERRY item_attribute 10, HELD_BERRY, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY @@ -532,247 +532,247 @@ Item2Attributes: item_attribute 10, HELD_BERRY, 30, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; SQUIRTBOTTLE - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PARK BALL - item_attribute 0, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; RAINBOW WING - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BRICK PIECE - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SURF MAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LITEBLUEMAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PORTRAITMAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LOVELY MAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EON MAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MORPH MAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLUESKY MAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MUSIC MAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MIRAGE MAIL - item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM01 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM02 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM03 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM04 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM05 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM06 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM07 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM08 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM09 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM10 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM11 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM12 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM13 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM14 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM15 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM16 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM17 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM18 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM19 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM20 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM21 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM22 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM23 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM24 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM25 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM26 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM27 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM28 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM29 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM30 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM31 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM32 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM33 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM34 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM35 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM36 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM37 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM38 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM39 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM40 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM41 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM42 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM43 - item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM44 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM45 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM46 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM47 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM48 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM49 - item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM50 - item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM01 - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM02 - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM03 - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM04 - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM05 - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM06 - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM07 - item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TERU-SAMA - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ? - item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index d70434b33..8e53a4cb6 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -1,7 +1,6 @@ ; A library included as part of the Mobile Adapter GB SDK. INCLUDE "gbhw.asm" -NONE EQU 0 SECTION "Main", ROMX @@ -258,7 +257,7 @@ Function110115: ; 110115 cp $0 jr z, .asm_11015d .asm_110158 - ld hl, NONE + ld hl, 0 .asm_11015b ld a, e ret @@ -684,14 +683,14 @@ rept 2 inc de endr pop hl - ld bc, NONE + ld bc, 0 call Function110007 ld a, c ld [$cb7a], a ld [$c86b], a push de inc de - ld bc, NONE + ld bc, 0 ld a, $20 call Function11000f ld l, e @@ -1021,7 +1020,7 @@ Function110615: ; 110615 push de inc de ld a, b - ld bc, NONE + ld bc, 0 call Function11000f ld a, c pop hl @@ -4810,7 +4809,7 @@ Function111f07: ; 111f07 (44:5f07) Function111f63: ; 111f63 push de - ld hl, NONE + ld hl, 0 ld c, b xor a cp b @@ -5233,7 +5232,7 @@ Function112271: ; 112271 cp $41 jr nz, .asm_1122f5 ld b, $be - ld de, NONE + ld de, 0 .asm_1122b3 ld a, [hli] add e @@ -6506,8 +6505,8 @@ Function112aac: ; 112aac push af ld a, [$c874] push af - ld bc, NONE - ld de, NONE + ld bc, 0 + ld de, 0 .asm_112abe ld a, [hli] cp $d @@ -6584,7 +6583,7 @@ Function112b11: ; 112b11 .asm_112b36 push hl ld hl, $c872 - ld de, NONE + ld de, 0 ld a, b or a jr z, .asm_112b49 @@ -8226,7 +8225,7 @@ Function113519: ; 113519 cp $41 jr nz, .asm_113586 ld b, $be - ld de, NONE + ld de, 0 .asm_113551 ld a, [hli] add e @@ -1421,12 +1421,12 @@ endr ; 63ca Data63ca: ; 63ca - dw $505c, NONE + dw $505c, 0 dw $685c, $585c dw $685c, $785c dw $885c, $785c - dw NONE, $785c - dw NONE, $585c + dw 0, $785c + dw 0, $585c ; 63e2 Copyright: ; 63e2 @@ -3236,7 +3236,7 @@ PlayerObjectTemplate: ; 8071 ; A dummy map object used to initialize the player object. ; Shorter than the actual amount copied by two bytes. ; Said bytes seem to be unused. - person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_0B, 15, 15, -1, -1, 0, 0, 0, NONE, -1 + person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_0B, 15, 15, -1, -1, 0, 0, 0, 0, -1 ; 807e CopyDECoordsToMapObject:: ; 807e @@ -5695,7 +5695,7 @@ Script_UsedStrength: ; 0xcd2d callasm Functioncd12 writetext UnknownText_0xcd41 copybytetovar wd1ef - cry NONE + cry 0 pause 3 writetext UnknownText_0xcd46 loadmovesprites @@ -7872,7 +7872,7 @@ Functiond839: ; d839 ld a, [Buffer1] ld c, a ld b, $0 - ld hl, NONE + ld hl, 0 ld a, [wd1f1] cp $30 jr nc, .asm_d885 @@ -10045,7 +10045,7 @@ Functione5d9: ; unreferenced push hl push bc ld a, c - ld bc, NONE + ld bc, 0 add hl, bc ld bc, $0020 call AddNTimes @@ -19940,7 +19940,7 @@ Function1686d: ; 1686d ld de, StringBuffer1 ld bc, $000b call CopyBytes - ld hl, NONE + ld hl, 0 ld bc, $0064 ld a, [StringBuffer2 + 1] call AddNTimes @@ -24169,7 +24169,7 @@ MenuDataHeader_0x24d3f: ; 24d3f db $40 ; tile backup db 00, 06 ; start coords db 17, 19 ; end coords - dw NONE + dw 0 db 1 ; default option ; 24d47 @@ -24501,7 +24501,7 @@ MenuData_0x24f34: ; 0x24f34 dn 2, 2 ; rows, columns db 6 ; spacing dba Strings24f3d - dbw $09, NONE + dbw $09, 0 ; 0x24f3d Strings24f3d: ; 0x24f3d @@ -27842,7 +27842,7 @@ endr jr nz, .asm_28457 ld hl, wc818 ld de, wc608 + 10 - ld bc, NONE + ld bc, 0 .asm_28464 inc c ld a, c @@ -32524,7 +32524,7 @@ Function2b995: ; 2b995 ; 2b9a6 Function2b9a6: ; 2b9a6 - ld de, NONE + ld de, 0 ld c, $3 .asm_2b9ab ld a, [hli] @@ -43106,7 +43106,7 @@ ClockResetPassword: ; 4d41e .CalculatePassword: ; 4d50f ld a, BANK(sPlayerData) call GetSRAMBank - ld de, NONE + ld de, 0 ld hl, sPlayerData + (PlayerID - wPlayerData) ld c, $2 call .ComponentFromNumber @@ -55314,7 +55314,7 @@ rept 3 endr ld e, l ld d, h - ld hl, NONE + ld hl, 0 add hl, bc ld a, [wc3b4] ld [hli], a @@ -55359,7 +55359,7 @@ endr ; 8d036 Function8d036: ; 8d036 - ld hl, NONE + ld hl, 0 add hl, bc ld [hl], $0 ret @@ -55867,7 +55867,7 @@ endr .four_zero: ; 8d30a call Function8d6d8 - ld hl, NONE + ld hl, 0 add hl, bc ld a, [hl] ld hl, $000d @@ -60013,7 +60013,7 @@ Function9102f: ; 9102f (24:502f) Function9106a: ; 9106a push af - ld de, NONE + ld de, 0 ld b, $a ld a, [PlayerGender] bit 0, a @@ -60042,7 +60042,7 @@ Function9106a: ; 9106a Function91098: ; 91098 push af - ld de, NONE + ld de, 0 ld a, $d call Function3b2a ld hl, $0003 @@ -61870,7 +61870,7 @@ TownMapMon: ; 91f7b callba GetSpeciesIcon ; Animation/palette - ld de, NONE + ld de, 0 ld a, $0 call Function3b2a @@ -61905,7 +61905,7 @@ TownMapPlayerIcon: ; 91fa6 call Request2bpp ; Animation/palette - ld de, NONE + ld de, 0 ld b, $0a ; Male ld a, [PlayerGender] bit 0, a @@ -62954,7 +62954,7 @@ Function92c3a: ; 92c3a ld hl, $0005 add hl, bc ld [hl], $0 - ld hl, NONE + ld hl, 0 add hl, bc ld [hl], $1 ld hl, $000f @@ -62971,7 +62971,7 @@ Function92c4c: ; 92c4c ret .asm_92c56 - ld hl, NONE + ld hl, 0 add hl, bc ld a, $0 ld [hl], a @@ -63079,7 +63079,7 @@ Function92cd2: ; 92cd2 .asm_92ce1 ld a, SFX_STOP_SLOT call Function9331e - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld hl, $000a @@ -63103,7 +63103,7 @@ Function92cf8: ; 92cf8 .asm_92d02 ld a, SFX_THROW_BALL call Function9331e - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld hl, $0005 @@ -63128,7 +63128,7 @@ Function92d20: ; 92d20 ld a, SFX_STOP_SLOT call Function9331e call Function93316 - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld hl, $0005 @@ -63162,7 +63162,7 @@ Function92d4f: ; 92d4f ret .asm_92d62 - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld hl, $0005 @@ -63174,7 +63174,7 @@ Function92d4f: ; 92d4f Function92d6e: ; 92d6e xor a ld [wcf64], a - ld hl, NONE + ld hl, 0 add hl, bc dec [hl] ld hl, $0005 @@ -63189,7 +63189,7 @@ Function92d7e: ; 92d7e ld a, SFX_STOP_SLOT call Function9331e call Function93316 - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld hl, $0005 @@ -63209,7 +63209,7 @@ Function92da4: ; 92da4 ld a, [wcf64] and a ret z - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld a, $2 @@ -63219,7 +63219,7 @@ Function92db3: ; 92db3 ld a, [wcf64] cp $4 ret c - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld hl, $0005 @@ -63252,7 +63252,7 @@ Function92dca: ; 92dca ld hl, $0005 add hl, bc ld [hl], $0 - ld hl, NONE + ld hl, 0 add hl, bc rept 2 dec [hl] @@ -63268,7 +63268,7 @@ Function92df7: ; 92df7 ld a, SFX_STOP_SLOT call Function9331e call Function93316 - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] call Function92fc0 @@ -63288,7 +63288,7 @@ Function92e10: ; 92e10 .asm_92e1f dec [hl] - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld hl, $000b @@ -63308,7 +63308,7 @@ Function92e31: ; 92e31 ret .asm_92e3b - ld hl, NONE + ld hl, 0 add hl, bc dec [hl] ld hl, $0005 @@ -63326,7 +63326,7 @@ Function92e47: ; 92e47 ld hl, $0005 add hl, bc ld [hl], $1 - ld hl, NONE + ld hl, 0 add hl, bc inc [hl] ld hl, $000a @@ -66460,7 +66460,7 @@ Functione0000: ; e0000 xor a call GetSRAMBank ld hl, sScratch - ld bc, NONE + ld bc, 0 .asm_e000b push bc push hl @@ -66950,7 +66950,7 @@ Functione0366: ; e0366 ; e0398 Functione0398: ; e0398 - ld hl, NONE + ld hl, 0 ld bc, $0006 ld a, [wcf64] call AddNTimes @@ -81004,7 +81004,7 @@ Function10616e: ; 10616e ld hl, $a001 ld bc, $0080 xor a - ld de, NONE + ld de, 0 .asm_106179 ld a, e add [hl] diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index face5140c..cd22312ae 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -13,7 +13,7 @@ BugsyScript: writetext BugsyText_INeverLose closetext loadmovesprites - winlosstext BugsyText_ResearchIncomplete, NONE + winlosstext BugsyText_ResearchIncomplete, 0 loadtrainer BUGSY, 1 startbattle returnafterbattle @@ -61,7 +61,7 @@ AzaleaGymTriggerRockets: jumpstd radiotowerrockets TrainerTwinsAmyandmay1: - trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, NONE, .AfterScript + trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript .AfterScript: talkaftercancel @@ -72,7 +72,7 @@ TrainerTwinsAmyandmay1: end TrainerTwinsAmyandmay2: - trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, NONE, .AfterScript + trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript .AfterScript: talkaftercancel @@ -83,7 +83,7 @@ TrainerTwinsAmyandmay2: end TrainerBug_catcherbenny: - trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, NONE, .AfterScript + trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript .AfterScript: talkaftercancel @@ -94,7 +94,7 @@ TrainerBug_catcherbenny: end TrainerBug_catcherAl: - trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, NONE, .AfterScript + trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript .AfterScript: talkaftercancel @@ -105,7 +105,7 @@ TrainerBug_catcherAl: end TrainerBug_catcherJosh: - trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, NONE, .AfterScript + trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript .AfterScript: talkaftercancel diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 046762fc3..9ef009d48 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -3,7 +3,7 @@ AzaleaPokeCenter1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x18db27, NONE + dw UnknownScript_0x18db27, 0 .MapCallbacks: db 0 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 8e3f7a96e..bbc574c4b 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -3,9 +3,9 @@ AzaleaTown_MapScriptHeader: db 3 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE - dw .Trigger3, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 + dw .Trigger3, 0 .MapCallbacks: db 1 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 6a4e5d310..83b8e002b 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -3,8 +3,8 @@ BattleTower1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9e39d, NONE - dw UnknownScript_0x9e3d3, NONE + dw UnknownScript_0x9e39d, 0 + dw UnknownScript_0x9e3d3, 0 .MapCallbacks: db 0 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index b57c07f5a..82966d56a 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -3,8 +3,8 @@ BattleTowerBattleRoom_MapScriptHeader: db 2 ; triggers - dw Script_EnterBattleRoom, NONE - dw UnknownScript_0x9f420, NONE + dw Script_EnterBattleRoom, 0 + dw UnknownScript_0x9f420, 0 .MapCallbacks: db 0 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index a7e19f13f..8ba599340 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -3,8 +3,8 @@ BattleTowerElevator_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9f562, NONE - dw UnknownScript_0x9f567, NONE + dw UnknownScript_0x9f562, 0 + dw UnknownScript_0x9f567, 0 .MapCallbacks: db 0 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 7fa2df63a..d0b80362f 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -3,8 +3,8 @@ BattleTowerHallway_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9f5bb, NONE - dw UnknownScript_0x9f5c0, NONE + dw UnknownScript_0x9f5bb, 0 + dw UnknownScript_0x9f5c0, 0 .MapCallbacks: db 0 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 231ddf366..ca810cf23 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -33,7 +33,7 @@ ClairScript_0x194e24: writetext UnknownText_0x194efa closetext loadmovesprites - winlosstext UnknownText_0x194fd6, NONE + winlosstext UnknownText_0x194fd6, 0 loadtrainer CLAIR, 1 startbattle returnafterbattle @@ -87,7 +87,7 @@ UnknownScript_0x194e94: end TrainerCooltrainermPaul: - trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, NONE, CooltrainermPaulScript + trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript CooltrainermPaulScript: talkaftercancel @@ -98,7 +98,7 @@ CooltrainermPaulScript: end TrainerCooltrainermMike: - trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, NONE, CooltrainermMikeScript + trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript CooltrainermMikeScript: talkaftercancel @@ -109,7 +109,7 @@ CooltrainermMikeScript: end TrainerCooltrainerfLola: - trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, NONE, CooltrainerfLolaScript + trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript CooltrainerfLolaScript: talkaftercancel diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 0ec038ef6..77624204f 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -59,7 +59,7 @@ BlackthornGymBoulder: jumpstd strengthboulder TrainerCooltrainermCody: - trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, NONE, CooltrainermCodyScript + trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript CooltrainermCodyScript: talkaftercancel @@ -70,7 +70,7 @@ CooltrainermCodyScript: end TrainerCooltrainerfFran: - trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, NONE, CooltrainerfFranScript + trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript CooltrainerfFranScript: talkaftercancel diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index f514a7e3c..73b74be4e 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -3,8 +3,8 @@ BrunosRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x180993, NONE - dw UnknownScript_0x180997, NONE + dw UnknownScript_0x180993, 0 + dw UnknownScript_0x180997, 0 .MapCallbacks: db 1 @@ -52,7 +52,7 @@ BrunoScript_0x1809c5: writetext UnknownText_0x1809fe closetext loadmovesprites - winlosstext UnknownText_0x180b23, NONE + winlosstext UnknownText_0x180b23, 0 loadtrainer BRUNO, 1 startbattle returnafterbattle diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 1f707df2f..6c1136b33 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -3,9 +3,9 @@ BurnedTower1F_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x185bf2, NONE - dw UnknownScript_0x185bf6, NONE - dw UnknownScript_0x185bf7, NONE + dw UnknownScript_0x185bf2, 0 + dw UnknownScript_0x185bf6, 0 + dw UnknownScript_0x185bf7, 0 .MapCallbacks: db 1 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 27f74106f..c3c0e387b 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -3,8 +3,8 @@ BurnedTowerB1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x18615e, NONE - dw UnknownScript_0x18615f, NONE + dw UnknownScript_0x18615e, 0 + dw UnknownScript_0x18615f, 0 .MapCallbacks: db 1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index fc92e66ae..db63741b8 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -13,7 +13,7 @@ ErikaScript_0x72a6a: writetext UnknownText_0x72b28 closetext loadmovesprites - winlosstext UnknownText_0x72c3e, NONE + winlosstext UnknownText_0x72c3e, 0 loadtrainer ERIKA, 1 startbattle returnafterbattle @@ -42,7 +42,7 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, NONE, LassMichelleScript + trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript LassMichelleScript: talkaftercancel @@ -53,7 +53,7 @@ LassMichelleScript: end TrainerPicnickerTanya: - trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, NONE, PicnickerTanyaScript + trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript PicnickerTanyaScript: talkaftercancel @@ -64,7 +64,7 @@ PicnickerTanyaScript: end TrainerBeautyJulia: - trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, NONE, BeautyJuliaScript + trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript BeautyJuliaScript: talkaftercancel @@ -75,7 +75,7 @@ BeautyJuliaScript: end TrainerTwinsJoandzoe1: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, NONE, TwinsJoandzoe1Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script TwinsJoandzoe1Script: talkaftercancel @@ -86,7 +86,7 @@ TwinsJoandzoe1Script: end TrainerTwinsJoandzoe2: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, NONE, TwinsJoandzoe2Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script TwinsJoandzoe2Script: talkaftercancel diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 44df5b0c6..a272b6472 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -3,8 +3,8 @@ CeruleanGym_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1883d9, NONE - dw UnknownScript_0x1883da, NONE + dw UnknownScript_0x1883d9, 0 + dw UnknownScript_0x1883da, 0 .MapCallbacks: db 0 @@ -60,7 +60,7 @@ MistyScript_0x188432: writetext UnknownText_0x188674 closetext loadmovesprites - winlosstext UnknownText_0x18870c, NONE + winlosstext UnknownText_0x18870c, 0 loadtrainer MISTY, 1 startbattle returnafterbattle @@ -80,7 +80,7 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, NONE, SwimmerfDianaScript + trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript SwimmerfDianaScript: talkaftercancel @@ -91,7 +91,7 @@ SwimmerfDianaScript: end TrainerSwimmerfBriana: - trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, NONE, SwimmerfBrianaScript + trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript SwimmerfBrianaScript: talkaftercancel @@ -102,7 +102,7 @@ SwimmerfBrianaScript: end TrainerSwimmermParker: - trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, NONE, SwimmermParkerScript + trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript SwimmermParkerScript: talkaftercancel diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 049c48b19..0aec4b65e 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -3,8 +3,8 @@ CherrygroveCity_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 69769b163..f2425138a 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -9,7 +9,7 @@ ClerkScript_0x19680a: loadfont checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196817 - pokemart $0, NONE + pokemart $0, 0 loadmovesprites end diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 5c9c86625..7829b0960 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -3,8 +3,8 @@ CianwoodCity_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 @@ -52,7 +52,7 @@ UnknownScript_0x1a001e: writetext UnknownText_0x1a0433 closetext loadmovesprites - winlosstext UnknownText_0x1a05a1, NONE + winlosstext UnknownText_0x1a05a1, 0 setlasttalked $c loadtrainer MYSTICALMAN, EUSINE startbattle diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 1f3331e08..26f4654a3 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -28,7 +28,7 @@ ChuckScript_0x9d60f: writetext UnknownText_0x9d78a closetext loadmovesprites - winlosstext UnknownText_0x9d7f6, NONE + winlosstext UnknownText_0x9d7f6, 0 loadtrainer CHUCK, 1 startbattle returnafterbattle @@ -76,7 +76,7 @@ CianwoodGymTriggerRockets: jumpstd radiotowerrockets TrainerBlackbeltYoshi: - trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, NONE, BlackbeltYoshiScript + trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, BlackbeltYoshiScript BlackbeltYoshiScript: talkaftercancel @@ -87,7 +87,7 @@ BlackbeltYoshiScript: end TrainerBlackbeltLao: - trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, NONE, BlackbeltLaoScript + trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, BlackbeltLaoScript BlackbeltLaoScript: talkaftercancel @@ -98,7 +98,7 @@ BlackbeltLaoScript: end TrainerBlackbeltNob: - trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, NONE, BlackbeltNobScript + trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, BlackbeltNobScript BlackbeltNobScript: talkaftercancel @@ -109,7 +109,7 @@ BlackbeltNobScript: end TrainerBlackbeltLung: - trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, NONE, BlackbeltLungScript + trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, BlackbeltLungScript BlackbeltLungScript: talkaftercancel diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 971ce491b..df3f30453 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -3,7 +3,7 @@ CianwoodPharmacy_MapScriptHeader: db 1 ; triggers - dw CianwoodPharmacyTrigger, NONE + dw CianwoodPharmacyTrigger, 0 .MapCallbacks: db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 48cb6f7ea..52feffa09 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,9 +3,9 @@ Colosseum_MapScriptHeader: db 3 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE - dw .Trigger3, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 + dw .Trigger3, 0 .MapCallbacks: db 2 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 8d387b899..397b2beea 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -6,7 +6,7 @@ DanceTheatre_MapScriptHeader: db 0 TrainerKimono_girlNaoko2: - trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, NONE, Kimono_girlNaoko2Script + trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, Kimono_girlNaoko2Script Kimono_girlNaoko2Script: talkaftercancel @@ -17,7 +17,7 @@ Kimono_girlNaoko2Script: end TrainerKimono_girlSayo: - trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, NONE, Kimono_girlSayoScript + trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, Kimono_girlSayoScript Kimono_girlSayoScript: talkaftercancel @@ -28,7 +28,7 @@ Kimono_girlSayoScript: end TrainerKimono_girlZuki: - trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, NONE, Kimono_girlZukiScript + trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, Kimono_girlZukiScript Kimono_girlZukiScript: talkaftercancel @@ -39,7 +39,7 @@ Kimono_girlZukiScript: end TrainerKimono_girlKuni: - trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, NONE, Kimono_girlKuniScript + trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, Kimono_girlKuniScript Kimono_girlKuniScript: talkaftercancel @@ -50,7 +50,7 @@ Kimono_girlKuniScript: end TrainerKimono_girlMiki: - trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, NONE, Kimono_girlMikiScript + trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, Kimono_girlMikiScript Kimono_girlMikiScript: talkaftercancel diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 2f865fc50..3a46472e4 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -3,8 +3,8 @@ DragonShrine_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 8eac5af7b..7fb28360a 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -3,8 +3,8 @@ DragonsDenB1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x18c89d, NONE - dw UnknownScript_0x18c89e, NONE + dw UnknownScript_0x18c89d, 0 + dw UnknownScript_0x18c89e, 0 .MapCallbacks: db 1 @@ -78,7 +78,7 @@ UnknownScript_0x18c8f9: end TrainerCooltrainermDarin: - trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, NONE, CooltrainermDarinScript + trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript CooltrainermDarinScript: talkaftercancel @@ -89,7 +89,7 @@ CooltrainermDarinScript: end TrainerCooltrainerfCara: - trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, NONE, CooltrainerfCaraScript + trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript CooltrainerfCaraScript: talkaftercancel @@ -100,7 +100,7 @@ CooltrainerfCaraScript: end TrainerTwinsLeaandpia1: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, NONE, TwinsLeaandpia1Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script TwinsLeaandpia1Script: talkaftercancel @@ -111,7 +111,7 @@ TwinsLeaandpia1Script: end TrainerTwinsLeaandpia2: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, NONE, TwinsLeaandpia2Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script TwinsLeaandpia2Script: talkaftercancel diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index aaea482cf..64128c160 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -106,7 +106,7 @@ AcademyBlackboard: dn 3, 2 ; rows, columns db 5 ; spacing dbw BANK(.Text), .Text - dbw $1a, NONE + dbw $1a, 0 .Text db "PSN@" diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index ec6d6ac75..4cd1a2a58 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -3,8 +3,8 @@ EcruteakGym_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x99d53, NONE - dw UnknownScript_0x99d57, NONE + dw UnknownScript_0x99d53, 0 + dw UnknownScript_0x99d57, 0 .MapCallbacks: db 0 @@ -24,7 +24,7 @@ MortyScript_0x99d58: writetext UnknownText_0x99e65 closetext loadmovesprites - winlosstext UnknownText_0x9a00a, NONE + winlosstext UnknownText_0x9a00a, 0 loadtrainer MORTY, 1 startbattle returnafterbattle @@ -91,7 +91,7 @@ UnknownScript_0x99dc6: end TrainerSageJeffrey: - trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, NONE, SageJeffreyScript + trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, SageJeffreyScript SageJeffreyScript: talkaftercancel @@ -102,7 +102,7 @@ SageJeffreyScript: end TrainerSagePing: - trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, NONE, SagePingScript + trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, SagePingScript SagePingScript: talkaftercancel @@ -113,7 +113,7 @@ SagePingScript: end TrainerMediumMartha: - trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, NONE, MediumMarthaScript + trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, MediumMarthaScript MediumMarthaScript: talkaftercancel @@ -124,7 +124,7 @@ MediumMarthaScript: end TrainerMediumGrace: - trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, NONE, MediumGraceScript + trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, MediumGraceScript MediumGraceScript: talkaftercancel diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 9d32adf7f..f04446014 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -3,8 +3,8 @@ EcruteakHouse_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index e137a1dc0..0cde69101 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -3,8 +3,8 @@ EcruteakPokeCenter1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x98e5f, NONE - dw UnknownScript_0x98e63, NONE + dw UnknownScript_0x98e5f, 0 + dw UnknownScript_0x98e63, 0 .MapCallbacks: db 0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 451c75d15..11ab81dfb 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -3,12 +3,12 @@ ElmsLab_MapScriptHeader: db 6 ; triggers - dw UnknownScript_0x78b7a, NONE - dw UnknownScript_0x78b7e, NONE - dw UnknownScript_0x78b7f, NONE - dw UnknownScript_0x78b80, NONE - dw UnknownScript_0x78b81, NONE - dw UnknownScript_0x78b82, NONE + dw UnknownScript_0x78b7a, 0 + dw UnknownScript_0x78b7e, 0 + dw UnknownScript_0x78b7f, 0 + dw UnknownScript_0x78b80, 0 + dw UnknownScript_0x78b81, 0 + dw UnknownScript_0x78b82, 0 .MapCallbacks: db 1 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index eaae90220..832ab3d1d 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -3,9 +3,9 @@ FastShip1F_MapScriptHeader: db 3 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE - dw .Trigger3, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 + dw .Trigger3, 0 .MapCallbacks: db 0 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 30377a7f3..ddb2586a0 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -3,8 +3,8 @@ FastShipB1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x7673a, NONE - dw UnknownScript_0x7673b, NONE + dw UnknownScript_0x7673a, 0 + dw UnknownScript_0x7673b, 0 .MapCallbacks: db 0 @@ -82,7 +82,7 @@ UnknownScript_0x767a0: end TrainerSailorJeff: - trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, NONE, SailorJeffScript + trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript SailorJeffScript: talkaftercancel @@ -93,7 +93,7 @@ SailorJeffScript: end TrainerPicnickerDebra: - trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, NONE, PicnickerDebraScript + trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript PicnickerDebraScript: talkaftercancel @@ -104,7 +104,7 @@ PicnickerDebraScript: end TrainerJugglerFritz: - trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, NONE, JugglerFritzScript + trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript JugglerFritzScript: talkaftercancel @@ -115,7 +115,7 @@ JugglerFritzScript: end TrainerSailorGarrett: - trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, NONE, SailorGarrettScript + trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript SailorGarrettScript: talkaftercancel @@ -126,7 +126,7 @@ SailorGarrettScript: end TrainerFisherJonah: - trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, NONE, FisherJonahScript + trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript FisherJonahScript: talkaftercancel @@ -137,7 +137,7 @@ FisherJonahScript: end TrainerBlackbeltWai: - trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, NONE, BlackbeltWaiScript + trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript BlackbeltWaiScript: talkaftercancel @@ -148,7 +148,7 @@ BlackbeltWaiScript: end TrainerSailorKenneth: - trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, NONE, SailorKennethScript + trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript SailorKennethScript: talkaftercancel @@ -159,7 +159,7 @@ SailorKennethScript: end TrainerTeacherShirley: - trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, NONE, TeacherShirleyScript + trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript TeacherShirleyScript: talkaftercancel @@ -170,7 +170,7 @@ TeacherShirleyScript: end TrainerSchoolboyNate: - trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, NONE, SchoolboyNateScript + trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript SchoolboyNateScript: talkaftercancel @@ -181,7 +181,7 @@ SchoolboyNateScript: end TrainerSchoolboyRicky: - trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, NONE, SchoolboyRickyScript + trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript SchoolboyRickyScript: talkaftercancel diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index bd4496d4c..cb9643a7e 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -6,7 +6,7 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader: db 0 TrainerCooltrainermSean: - trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, NONE, CooltrainermSeanScript + trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, CooltrainermSeanScript CooltrainermSeanScript: talkaftercancel @@ -17,7 +17,7 @@ CooltrainermSeanScript: end TrainerCooltrainerfCarol: - trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, NONE, CooltrainerfCarolScript + trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, CooltrainerfCarolScript CooltrainerfCarolScript: talkaftercancel @@ -28,7 +28,7 @@ CooltrainerfCarolScript: end TrainerPokemaniacEthan: - trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, NONE, PokemaniacEthanScript + trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, PokemaniacEthanScript PokemaniacEthanScript: talkaftercancel @@ -39,7 +39,7 @@ PokemaniacEthanScript: end TrainerHikerNoland: - trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, NONE, HikerNolandScript + trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, HikerNolandScript HikerNolandScript: talkaftercancel @@ -50,7 +50,7 @@ HikerNolandScript: end TrainerGentlemanEdward: - trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, NONE, GentlemanEdwardScript + trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, GentlemanEdwardScript GentlemanEdwardScript: talkaftercancel @@ -61,7 +61,7 @@ GentlemanEdwardScript: end TrainerBurglarCorey: - trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, NONE, BurglarCoreyScript + trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, BurglarCoreyScript BurglarCoreyScript: talkaftercancel @@ -78,7 +78,7 @@ SailorScript_0x755f1: writetext UnknownText_0x75812 closetext loadmovesprites - winlosstext UnknownText_0x75897, NONE + winlosstext UnknownText_0x75897, 0 loadtrainer SAILOR, STANLY startbattle reloadmap diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index f2ff26390..70ac3449e 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -128,7 +128,7 @@ TwinScript_0x75f6d: end TrainerPokefanmColin: - trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, NONE, PokefanmColinScript + trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript PokefanmColinScript: talkaftercancel @@ -139,7 +139,7 @@ PokefanmColinScript: end TrainerTwinsMegandpeg1: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, NONE, TwinsMegandpeg1Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script TwinsMegandpeg1Script: talkaftercancel @@ -150,7 +150,7 @@ TwinsMegandpeg1Script: end TrainerTwinsMegandpeg2: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, NONE, TwinsMegandpeg2Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script TwinsMegandpeg2Script: talkaftercancel @@ -161,7 +161,7 @@ TwinsMegandpeg2Script: end TrainerPsychicRodney: - trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, NONE, PsychicRodneyScript + trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript PsychicRodneyScript: talkaftercancel @@ -172,7 +172,7 @@ PsychicRodneyScript: end TrainerPokefanmJeremy: - trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, NONE, PokefanmJeremyScript + trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript PokefanmJeremyScript: talkaftercancel @@ -183,7 +183,7 @@ PokefanmJeremyScript: end TrainerPokefanfGeorgia: - trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, NONE, PokefanfGeorgiaScript + trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript PokefanfGeorgiaScript: talkaftercancel @@ -194,7 +194,7 @@ PokefanfGeorgiaScript: end TrainerSupernerdShawn: - trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, NONE, SupernerdShawnScript + trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript SupernerdShawnScript: talkaftercancel diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 2b2c4da71..9fdcdbb43 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -6,7 +6,7 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader: db 0 TrainerFirebreatherLyle: - trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, NONE, FirebreatherLyleScript + trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript FirebreatherLyleScript: talkaftercancel @@ -17,7 +17,7 @@ FirebreatherLyleScript: end TrainerBug_catcherKen: - trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, NONE, Bug_catcherKenScript + trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript Bug_catcherKenScript: talkaftercancel @@ -28,7 +28,7 @@ Bug_catcherKenScript: end TrainerBeautyCassie: - trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, NONE, BeautyCassieScript + trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript BeautyCassieScript: talkaftercancel @@ -39,7 +39,7 @@ BeautyCassieScript: end TrainerGuitaristClyde: - trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, NONE, GuitaristClydeScript + trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript GuitaristClydeScript: talkaftercancel diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index e85040035..d69a3f435 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -14,7 +14,7 @@ JanineScript_0x195db9: writetext UnknownText_0x195f35 closetext loadmovesprites - winlosstext UnknownText_0x195fa1, NONE + winlosstext UnknownText_0x195fa1, 0 loadtrainer JANINE, 1 startbattle returnafterbattle @@ -66,7 +66,7 @@ UnknownScript_0x195e2c: writetext UnknownText_0x1960e6 closetext loadmovesprites - winlosstext UnknownText_0x196126, NONE + winlosstext UnknownText_0x196126, 0 loadtrainer LASS, ALICE startbattle iftrue UnknownScript_0x195e4a @@ -100,7 +100,7 @@ UnknownScript_0x195e66: writetext UnknownText_0x196166 closetext loadmovesprites - winlosstext UnknownText_0x19617b, NONE + winlosstext UnknownText_0x19617b, 0 loadtrainer LASS, LINDA startbattle iftrue UnknownScript_0x195e84 @@ -134,7 +134,7 @@ UnknownScript_0x195ea0: writetext UnknownText_0x1961bb closetext loadmovesprites - winlosstext UnknownText_0x1961f1, NONE + winlosstext UnknownText_0x1961f1, 0 loadtrainer PICNICKER, CINDY startbattle iftrue UnknownScript_0x195ebe @@ -168,7 +168,7 @@ UnknownScript_0x195eda: writetext UnknownText_0x196228 closetext loadmovesprites - winlosstext UnknownText_0x19624a, NONE + winlosstext UnknownText_0x19624a, 0 loadtrainer CAMPER, BARRY startbattle iftrue UnknownScript_0x195ef8 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index d39a0eb05..536f6e042 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -3,7 +3,7 @@ FuchsiaPokeCenter1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x196458, NONE + dw UnknownScript_0x196458, 0 .MapCallbacks: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 09f362205..8e4beeee4 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -35,7 +35,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader: ClerkScript_0x5673f: loadfont - pokemart $4, NONE + pokemart $4, 0 loadmovesprites end diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 09c1bed61..bdaed919b 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -3,8 +3,8 @@ GoldenrodGym_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x5400a, NONE - dw UnknownScript_0x5400b, NONE + dw UnknownScript_0x5400a, 0 + dw UnknownScript_0x5400b, 0 .MapCallbacks: db 0 @@ -23,7 +23,7 @@ WhitneyScript_0x5400c: writetext UnknownText_0x54122 closetext loadmovesprites - winlosstext UnknownText_0x541a5, NONE + winlosstext UnknownText_0x541a5, 0 loadtrainer WHITNEY, 1 startbattle returnafterbattle @@ -87,7 +87,7 @@ GoldenrodGymTriggerRockets: jumpstd radiotowerrockets TrainerLassCarrie: - trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, NONE, LassCarrieScript + trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript LassCarrieScript: talkaftercancel @@ -111,7 +111,7 @@ WhitneyCriesScript: end TrainerLassBridget: - trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, NONE, LassBridgetScript + trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript LassBridgetScript: talkaftercancel @@ -122,7 +122,7 @@ LassBridgetScript: end TrainerBeautyVictoria: - trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, NONE, BeautyVictoriaScript + trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript BeautyVictoriaScript: talkaftercancel @@ -133,7 +133,7 @@ BeautyVictoriaScript: end TrainerBeautySamantha: - trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, NONE, BeautySamanthaScript + trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript BeautySamanthaScript: talkaftercancel diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index edec4d23c..cdf7a8c1d 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -3,7 +3,7 @@ GoldenrodMagnetTrainStation_MapScriptHeader: db 1 ; triggers - dw .Trigger1, NONE + dw .Trigger1, 0 .MapCallbacks: db 0 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 8c3f34fae..f07322211 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -3,8 +3,8 @@ HallOfFame_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 0 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 6fe143ebf..bf625052e 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -376,7 +376,7 @@ UnknownScript_0x6edf7: end TrainerBug_catcherWayne: - trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, NONE, Bug_catcherWayneScript + trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, Bug_catcherWayneScript Bug_catcherWayneScript: talkaftercancel diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index eac927099..52c818492 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -3,7 +3,7 @@ IndigoPlateauPokeCenter1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x180009, NONE + dw UnknownScript_0x180009, 0 .MapCallbacks: db 1 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 7d8f2371c..eb7171b9a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -3,8 +3,8 @@ KarensRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x180bbc, NONE - dw UnknownScript_0x180bc0, NONE + dw UnknownScript_0x180bbc, 0 + dw UnknownScript_0x180bc0, 0 .MapCallbacks: db 1 @@ -52,7 +52,7 @@ KarenScript_0x180bee: writetext UnknownText_0x180c27 closetext loadmovesprites - winlosstext UnknownText_0x180cf8, NONE + winlosstext UnknownText_0x180cf8, 0 loadtrainer KAREN, 1 startbattle returnafterbattle diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 3e2718d0b..7d3ce2c62 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -3,8 +3,8 @@ KogasRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x180728, NONE - dw UnknownScript_0x18072c, NONE + dw UnknownScript_0x180728, 0 + dw UnknownScript_0x18072c, 0 .MapCallbacks: db 1 @@ -52,7 +52,7 @@ KogaScript_0x18075a: writetext UnknownText_0x180793 closetext loadmovesprites - winlosstext UnknownText_0x1808a9, NONE + winlosstext UnknownText_0x1808a9, 0 loadtrainer KOGA, 1 startbattle returnafterbattle diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index e7314f400..2863583f8 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -3,8 +3,8 @@ KrissHouse1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x7a4d6, NONE - dw UnknownScript_0x7a4d7, NONE + dw UnknownScript_0x7a4d6, 0 + dw UnknownScript_0x7a4d7, 0 .MapCallbacks: db 0 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 81a29573d..3ecc820cb 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -3,8 +3,8 @@ LakeofRage_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 2 @@ -137,7 +137,7 @@ UnknownScript_0x700b8: end TrainerFisherAndre: - trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, NONE, FisherAndreScript + trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, FisherAndreScript FisherAndreScript: talkaftercancel @@ -148,7 +148,7 @@ FisherAndreScript: end TrainerFisherRaymond: - trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, NONE, FisherRaymondScript + trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, FisherRaymondScript FisherRaymondScript: talkaftercancel @@ -159,7 +159,7 @@ FisherRaymondScript: end TrainerCooltrainermAaron: - trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, NONE, CooltrainermAaronScript + trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, CooltrainermAaronScript CooltrainermAaronScript: talkaftercancel @@ -170,7 +170,7 @@ CooltrainermAaronScript: end TrainerCooltrainerfLois: - trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, NONE, CooltrainerfLoisScript + trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, CooltrainerfLoisScript CooltrainerfLoisScript: talkaftercancel diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 3bd848095..0b8fa2d02 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -3,8 +3,8 @@ LancesRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x180e39, NONE - dw UnknownScript_0x180e3d, NONE + dw UnknownScript_0x180e39, 0 + dw UnknownScript_0x180e3d, 0 .MapCallbacks: db 1 @@ -57,7 +57,7 @@ LanceScript_0x180e7b: writetext UnknownText_0x180f67 closetext loadmovesprites - winlosstext UnknownText_0x1810a4, NONE + winlosstext UnknownText_0x1810a4, 0 setlasttalked $2 loadtrainer CHAMPION, LANCE startbattle diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 16d00af51..2603c66e5 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -3,7 +3,7 @@ LavenderNameRater_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x7eaf1, NONE + dw UnknownScript_0x7eaf1, 0 .MapCallbacks: db 0 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index f4fda7441..7888001fd 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -13,7 +13,7 @@ PryceScript_0x199a9e: writetext UnknownText_0x199b8d closetext loadmovesprites - winlosstext UnknownText_0x199cb3, NONE + winlosstext UnknownText_0x199cb3, 0 loadtrainer PRYCE, 1 startbattle returnafterbattle @@ -62,7 +62,7 @@ MahoganyGymTriggerRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: - trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, NONE, SkierRoxanneScript + trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, SkierRoxanneScript SkierRoxanneScript: talkaftercancel @@ -73,7 +73,7 @@ SkierRoxanneScript: end TrainerSkierClarissa: - trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, NONE, SkierClarissaScript + trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, SkierClarissaScript SkierClarissaScript: talkaftercancel @@ -84,7 +84,7 @@ SkierClarissaScript: end TrainerBoarderRonald: - trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, NONE, BoarderRonaldScript + trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, BoarderRonaldScript BoarderRonaldScript: talkaftercancel @@ -95,7 +95,7 @@ BoarderRonaldScript: end TrainerBoarderBrad: - trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, NONE, BoarderBradScript + trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, BoarderBradScript BoarderBradScript: talkaftercancel @@ -106,7 +106,7 @@ BoarderBradScript: end TrainerBoarderDouglas: - trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, NONE, BoarderDouglasScript + trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, BoarderDouglasScript BoarderDouglasScript: talkaftercancel diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 2a7e48589..1a07867dd 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -3,8 +3,8 @@ MahoganyMart1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x6c356, NONE - dw UnknownScript_0x6c357, NONE + dw UnknownScript_0x6c356, 0 + dw UnknownScript_0x6c357, 0 .MapCallbacks: db 1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 05af9f97a..f7c1bcc08 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -3,8 +3,8 @@ MahoganyTown_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index cd792b483..ba54d2a5d 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -3,8 +3,8 @@ MobileBattleRoom_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 09837e1f5..5b6ce591e 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -3,8 +3,8 @@ MobileTradeRoomMobile_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 77012a872..cf1600416 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -3,8 +3,8 @@ MountMoon_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x74089, NONE - dw UnknownScript_0x7408d, NONE + dw UnknownScript_0x74089, 0 + dw UnknownScript_0x7408d, 0 .MapCallbacks: db 0 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 2390ff3c7..17ebdb9b3 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -3,7 +3,7 @@ MountMoonSquare_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x77092, NONE + dw UnknownScript_0x77092, 0 .MapCallbacks: db 2 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 3035009ee..81745abdd 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -6,7 +6,7 @@ MountMortar1FInside_MapScriptHeader: db 0 TrainerPokemaniacMiller: - trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, NONE, PokemaniacMillerScript + trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript PokemaniacMillerScript: talkaftercancel @@ -17,7 +17,7 @@ PokemaniacMillerScript: end TrainerSupernerdMarkus: - trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, NONE, SupernerdMarkusScript + trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript SupernerdMarkusScript: talkaftercancel diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index c1c597ddd..2b86c064a 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -6,7 +6,7 @@ MountMortar2FInside_MapScriptHeader: db 0 TrainerSupernerdHugh: - trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, NONE, SupernerdHughScript + trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, SupernerdHughScript SupernerdHughScript: talkaftercancel diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 0b65e39f3..a2363a7f5 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -15,7 +15,7 @@ BlackBeltScript_0x7e1f6: writetext UnknownText_0x7e24d closetext loadmovesprites - winlosstext UnknownText_0x7e2a9, NONE + winlosstext UnknownText_0x7e2a9, 0 loadtrainer BLACKBELT_T, KIYO startbattle returnafterbattle diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index a1d4e2df9..604b74022 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -3,8 +3,8 @@ MrPokemonsHouse_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x196e51, NONE - dw UnknownScript_0x196e55, NONE + dw UnknownScript_0x196e51, 0 + dw UnknownScript_0x196e55, 0 .MapCallbacks: db 0 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 72556f526..8010c3d08 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -56,7 +56,7 @@ GameboyKidScript_0x5c037: end TrainerSchoolboyJack1: - trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, NONE, SchoolboyJack1Script + trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, SchoolboyJack1Script SchoolboyJack1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK @@ -86,7 +86,7 @@ UnknownScript_0x5c074: UnknownScript_0x5c088: scall UnknownScript_0x5c114 - winlosstext SchoolboyJack1BeatenText, NONE + winlosstext SchoolboyJack1BeatenText, 0 copybytetovar wJackFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -173,7 +173,7 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, NONE, PokefanmWilliamScript + trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript PokefanmWilliamScript: talkaftercancel @@ -184,7 +184,7 @@ PokefanmWilliamScript: end TrainerPokefanfBeverly1: - trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, NONE, PokefanfBeverly1Script + trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, PokefanfBeverly1Script PokefanfBeverly1Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY @@ -263,7 +263,7 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, NONE, LassKriseScript + trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript LassKriseScript: talkaftercancel diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 683e2289e..c3477f179 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -3,8 +3,8 @@ NewBarkTown_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 000049011..966063893 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -3,8 +3,8 @@ OlivineCity_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index a6b1e8fee..8b259b46b 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -13,7 +13,7 @@ JasmineScript_0x9c12f: writetext UnknownText_0x9c1b9 closetext loadmovesprites - winlosstext UnknownText_0x9c2bb, NONE + winlosstext UnknownText_0x9c2bb, 0 loadtrainer JASMINE, 1 startbattle returnafterbattle diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index f9b542f57..3062d615f 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -6,7 +6,7 @@ OlivineLighthouse2F_MapScriptHeader: db 0 TrainerGentlemanAlfred: - trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, NONE, GentlemanAlfredScript + trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, GentlemanAlfredScript GentlemanAlfredScript: talkaftercancel @@ -17,7 +17,7 @@ GentlemanAlfredScript: end TrainerSailorHuey1: - trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, NONE, SailorHuey1Script + trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, SailorHuey1Script SailorHuey1Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY @@ -45,7 +45,7 @@ UnknownScript_0x5afb3: UnknownScript_0x5afc7: scall UnknownScript_0x5b06b - winlosstext SailorHuey1BeatenText, NONE + winlosstext SailorHuey1BeatenText, 0 copybytetovar wHueyFightCount if_equal 3, .Fight3 if_equal 2, .Fight2 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 6ce78a46b..266c38cc7 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -6,7 +6,7 @@ OlivineLighthouse3F_MapScriptHeader: db 0 TrainerBird_keeperTheo: - trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, NONE, Bird_keeperTheoScript + trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript Bird_keeperTheoScript: talkaftercancel @@ -17,7 +17,7 @@ Bird_keeperTheoScript: end TrainerGentlemanPreston: - trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, NONE, GentlemanPrestonScript + trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript GentlemanPrestonScript: talkaftercancel @@ -28,7 +28,7 @@ GentlemanPrestonScript: end TrainerSailorTerrell: - trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, NONE, SailorTerrellScript + trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript SailorTerrellScript: talkaftercancel diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index c10245a31..5aaabdee7 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -6,7 +6,7 @@ OlivineLighthouse4F_MapScriptHeader: db 0 TrainerLassConnie: - trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, NONE, LassConnie1Script + trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, LassConnie1Script LassConnie1Script: talkaftercancel @@ -17,7 +17,7 @@ LassConnie1Script: end TrainerSailorKent: - trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, NONE, SailorKentScript + trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, SailorKentScript SailorKentScript: talkaftercancel diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 5d17a3002..e27b30593 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -6,7 +6,7 @@ OlivineLighthouse5F_MapScriptHeader: db 0 TrainerBird_keeperDenis: - trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, NONE, Bird_keeperDenisScript + trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, Bird_keeperDenisScript Bird_keeperDenisScript: talkaftercancel @@ -17,7 +17,7 @@ Bird_keeperDenisScript: end TrainerSailorErnest: - trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, NONE, SailorErnestScript + trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, SailorErnestScript SailorErnestScript: talkaftercancel diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 6efbb2b9d..35343fa91 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -3,8 +3,8 @@ OlivinePort_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x748ac, NONE - dw UnknownScript_0x748ad, NONE + dw UnknownScript_0x748ac, 0 + dw UnknownScript_0x748ad, 0 .MapCallbacks: db 0 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 94d7f8979..79aed4f84 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -13,7 +13,7 @@ BrockScript_0x1a2864: writetext UnknownText_0x1a28d0 closetext loadmovesprites - winlosstext UnknownText_0x1a29bb, NONE + winlosstext UnknownText_0x1a29bb, 0 loadtrainer BROCK, 1 startbattle returnafterbattle @@ -36,7 +36,7 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, NONE, CamperJerryScript + trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript CamperJerryScript: talkaftercancel diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 60e3596ca..93fc07a2f 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -3,12 +3,12 @@ PokeCenter2F_MapScriptHeader: db 6 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE - dw .Trigger3, NONE - dw .Trigger4, NONE - dw .Trigger5, NONE - dw .Trigger6, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 + dw .Trigger3, 0 + dw .Trigger4, 0 + dw .Trigger5, 0 + dw .Trigger6, 0 .MapCallbacks: db 0 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 556ad4397..ac334e530 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -3,8 +3,8 @@ PowerPlant_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x188dc3, NONE - dw UnknownScript_0x188dc4, NONE + dw UnknownScript_0x188dc3, 0 + dw UnknownScript_0x188dc4, 0 .MapCallbacks: db 0 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 3beca4fb1..dd3d4e2d0 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -178,7 +178,7 @@ YoungsterScript_0x5ce54: jumptextfaceplayer UnknownText_0x5d4ac TrainerGruntM3: - trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, NONE, GruntM3Script + trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script GruntM3Script: talkaftercancel diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 980e7b3e7..bf99ee5fb 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -42,7 +42,7 @@ BlackBeltScript_0x5d722: jumptextfaceplayer UnknownText_0x5da44 TrainerGruntM4: - trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, NONE, GruntM4Script + trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script GruntM4Script: talkaftercancel @@ -53,7 +53,7 @@ GruntM4Script: end TrainerGruntM5: - trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, NONE, GruntM5Script + trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script GruntM5Script: talkaftercancel @@ -64,7 +64,7 @@ GruntM5Script: end TrainerGruntM6: - trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, NONE, GruntM6Script + trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script GruntM6Script: talkaftercancel @@ -75,7 +75,7 @@ GruntM6Script: end TrainerGruntF2: - trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, NONE, GruntF2Script + trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script GruntF2Script: talkaftercancel diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index de02c47aa..164a22c6b 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -77,7 +77,7 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, NONE, GruntM7Script + trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script GruntM7Script: talkaftercancel @@ -88,7 +88,7 @@ GruntM7Script: end TrainerGruntM8: - trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, NONE, GruntM8Script + trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script GruntM8Script: talkaftercancel @@ -99,7 +99,7 @@ GruntM8Script: end TrainerGruntM9: - trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, NONE, GruntM9Script + trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script GruntM9Script: talkaftercancel @@ -110,7 +110,7 @@ GruntM9Script: end TrainerScientistMarc: - trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, NONE, ScientistMarcScript + trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, ScientistMarcScript ScientistMarcScript: talkaftercancel diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index b4b3f61d5..2fb0b6875 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -47,7 +47,7 @@ GrowlitheScript_0x5ebb2: end TrainerGruntM10: - trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, NONE, GruntM10Script + trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script GruntM10Script: talkaftercancel @@ -58,7 +58,7 @@ GruntM10Script: end TrainerExecutivem2: - trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, NONE, Executivem2Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, 0, Executivem2Script Executivem2Script: talkaftercancel @@ -69,7 +69,7 @@ Executivem2Script: end TrainerGruntF4: - trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, NONE, GruntF4Script + trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script GruntF4Script: talkaftercancel @@ -80,7 +80,7 @@ GruntF4Script: end TrainerScientistRich: - trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, NONE, ScientistRichScript + trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, ScientistRichScript ScientistRichScript: talkaftercancel diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index f9e0235b8..a7516aa10 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -3,9 +3,9 @@ RadioTower5F_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x6000e, NONE - dw UnknownScript_0x6000f, NONE - dw UnknownScript_0x60010, NONE + dw UnknownScript_0x6000e, 0 + dw UnknownScript_0x6000f, 0 + dw UnknownScript_0x60010, 0 .MapCallbacks: db 0 @@ -32,7 +32,7 @@ UnknownScript_0x60011: writetext UnknownText_0x60147 closetext loadmovesprites - winlosstext UnknownText_0x60223, NONE + winlosstext UnknownText_0x60223, 0 setlasttalked $2 loadtrainer EXECUTIVEM, 3 startbattle @@ -63,7 +63,7 @@ UnknownScript_0x60054: end TrainerExecutivef1: - trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, NONE, Executivef1Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, 0, Executivef1Script Executivef1Script: talkaftercancel @@ -81,7 +81,7 @@ UnknownScript_0x6006e: writetext UnknownText_0x603d1 closetext loadmovesprites - winlosstext UnknownText_0x604f3, NONE + winlosstext UnknownText_0x604f3, 0 setlasttalked $3 loadtrainer EXECUTIVEM, 1 startbattle diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index b6745ff40..c1bfe2806 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -3,7 +3,7 @@ RedsHouse1F_MapScriptHeader: db 1 ; triggers - dw .Trigger, NONE + dw .Trigger, 0 .MapCallbacks: db 0 diff --git a/maps/Route1.asm b/maps/Route1.asm index c693f9e51..7416bd196 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -6,7 +6,7 @@ Route1_MapScriptHeader: db 0 TrainerSchoolboyDanny: - trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, NONE, SchoolboyDannyScript + trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript SchoolboyDannyScript: talkaftercancel @@ -17,7 +17,7 @@ SchoolboyDannyScript: end TrainerCooltrainerfQuinn: - trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, NONE, CooltrainerfQuinnScript + trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript CooltrainerfQuinnScript: talkaftercancel diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 3b462306c..88c71fc00 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -6,7 +6,7 @@ Route10South_MapScriptHeader: db 0 TrainerHikerJim: - trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, NONE, HikerJimScript + trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript HikerJimScript: talkaftercancel @@ -17,7 +17,7 @@ HikerJimScript: end TrainerPokefanmRobert: - trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, NONE, PokefanmRobertScript + trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript PokefanmRobertScript: talkaftercancel diff --git a/maps/Route11.asm b/maps/Route11.asm index 414663758..6c16ef7b1 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,7 +6,7 @@ Route11_MapScriptHeader: db 0 TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, NONE, YoungsterOwenScript + trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, YoungsterOwenScript YoungsterOwenScript: talkaftercancel @@ -17,7 +17,7 @@ YoungsterOwenScript: end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, NONE, YoungsterJasonScript + trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, YoungsterJasonScript YoungsterJasonScript: talkaftercancel @@ -28,7 +28,7 @@ YoungsterJasonScript: end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, NONE, PsychicHermanScript + trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, PsychicHermanScript PsychicHermanScript: talkaftercancel @@ -39,7 +39,7 @@ PsychicHermanScript: end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, NONE, PsychicFidelScript + trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, PsychicFidelScript PsychicFidelScript: talkaftercancel diff --git a/maps/Route12.asm b/maps/Route12.asm index 1b5e3c01a..251128b38 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -6,7 +6,7 @@ Route12_MapScriptHeader: db 0 TrainerFisherKyle: - trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, NONE, FisherKyleScript + trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript FisherKyleScript: talkaftercancel @@ -17,7 +17,7 @@ FisherKyleScript: end TrainerFisherMartin: - trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, NONE, FisherMartinScript + trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript FisherMartinScript: talkaftercancel @@ -28,7 +28,7 @@ FisherMartinScript: end TrainerFisherStephen: - trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, NONE, FisherStephenScript + trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript FisherStephenScript: talkaftercancel @@ -39,7 +39,7 @@ FisherStephenScript: end TrainerFisherBarney: - trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, NONE, FisherBarneyScript + trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript FisherBarneyScript: talkaftercancel diff --git a/maps/Route13.asm b/maps/Route13.asm index 4484edf8e..ff6292440 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,7 +6,7 @@ Route13_MapScriptHeader: db 0 TrainerPokefanmAlex: - trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, NONE, PokefanmAlexScript + trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, PokefanmAlexScript PokefanmAlexScript: talkaftercancel @@ -17,7 +17,7 @@ PokefanmAlexScript: end TrainerPokefanmJoshua: - trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, NONE, PokefanmJoshuaScript + trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, PokefanmJoshuaScript PokefanmJoshuaScript: talkaftercancel @@ -28,7 +28,7 @@ PokefanmJoshuaScript: end TrainerBird_keeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, NONE, Bird_keeperPerryScript + trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, Bird_keeperPerryScript Bird_keeperPerryScript: talkaftercancel @@ -39,7 +39,7 @@ Bird_keeperPerryScript: end TrainerBird_keeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, NONE, Bird_keeperBretScript + trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, Bird_keeperBretScript Bird_keeperBretScript: talkaftercancel @@ -50,7 +50,7 @@ Bird_keeperBretScript: end TrainerHikerKenny: - trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, NONE, HikerKennyScript + trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, HikerKennyScript HikerKennyScript: talkaftercancel diff --git a/maps/Route14.asm b/maps/Route14.asm index adc6d1dcc..9c4698b1c 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -14,7 +14,7 @@ TeacherScript_0x1ad47f: end TrainerPokefanmCarter: - trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, NONE, PokefanmCarterScript + trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, PokefanmCarterScript PokefanmCarterScript: talkaftercancel @@ -25,7 +25,7 @@ PokefanmCarterScript: end TrainerBird_keeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, NONE, Bird_keeperRoyScript + trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, Bird_keeperRoyScript Bird_keeperRoyScript: talkaftercancel @@ -36,7 +36,7 @@ Bird_keeperRoyScript: end TrainerPokefanmTrevor: - trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, NONE, PokefanmTrevorScript + trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, PokefanmTrevorScript PokefanmTrevorScript: talkaftercancel diff --git a/maps/Route15.asm b/maps/Route15.asm index 107905b78..0aeea3666 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -6,7 +6,7 @@ Route15_MapScriptHeader: db 0 TrainerTeacherColette: - trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, NONE, TeacherColetteScript + trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, TeacherColetteScript TeacherColetteScript: talkaftercancel @@ -17,7 +17,7 @@ TeacherColetteScript: end TrainerTeacherHillary: - trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, NONE, TeacherHillaryScript + trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, TeacherHillaryScript TeacherHillaryScript: talkaftercancel @@ -28,7 +28,7 @@ TeacherHillaryScript: end TrainerSchoolboyKipp: - trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, NONE, SchoolboyKippScript + trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, SchoolboyKippScript SchoolboyKippScript: talkaftercancel @@ -39,7 +39,7 @@ SchoolboyKippScript: end TrainerSchoolboyTommy: - trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, NONE, SchoolboyTommyScript + trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, SchoolboyTommyScript SchoolboyTommyScript: talkaftercancel @@ -50,7 +50,7 @@ SchoolboyTommyScript: end TrainerSchoolboyJohnny: - trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, NONE, SchoolboyJohnnyScript + trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, SchoolboyJohnnyScript SchoolboyJohnnyScript: talkaftercancel @@ -61,7 +61,7 @@ SchoolboyJohnnyScript: end TrainerSchoolboyBilly: - trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, NONE, SchoolboyBillyScript + trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, SchoolboyBillyScript SchoolboyBillyScript: talkaftercancel diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 4e8bc6ade..085afbf2a 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -3,7 +3,7 @@ Route16Gate_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x733e9, NONE + dw UnknownScript_0x733e9, 0 .MapCallbacks: db 0 diff --git a/maps/Route17.asm b/maps/Route17.asm index a54ca9276..925748ae6 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -15,7 +15,7 @@ UnknownScript_0x1ad0ab: return TrainerBikerCharles: - trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, NONE, BikerCharlesScript + trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, BikerCharlesScript BikerCharlesScript: talkaftercancel @@ -26,7 +26,7 @@ BikerCharlesScript: end TrainerBikerRiley: - trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, NONE, BikerRileyScript + trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, BikerRileyScript BikerRileyScript: talkaftercancel @@ -37,7 +37,7 @@ BikerRileyScript: end TrainerBikerJoel: - trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, NONE, BikerJoelScript + trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, BikerJoelScript BikerJoelScript: talkaftercancel @@ -48,7 +48,7 @@ BikerJoelScript: end TrainerBikerGlenn: - trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, NONE, BikerGlennScript + trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, BikerGlennScript BikerGlennScript: talkaftercancel diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index c3d8e44af..2558d5a5f 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -3,7 +3,7 @@ Route1718Gate_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x7360d, NONE + dw UnknownScript_0x7360d, 0 .MapCallbacks: db 0 diff --git a/maps/Route18.asm b/maps/Route18.asm index cafa45b0d..f11e06b5d 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -6,7 +6,7 @@ Route18_MapScriptHeader: db 0 TrainerBird_keeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, NONE, Bird_keeperBorisScript + trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript Bird_keeperBorisScript: talkaftercancel @@ -17,7 +17,7 @@ Bird_keeperBorisScript: end TrainerBird_keeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, NONE, Bird_keeperBobScript + trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript Bird_keeperBobScript: talkaftercancel diff --git a/maps/Route19.asm b/maps/Route19.asm index 8dba6fb59..029ebbede 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -22,7 +22,7 @@ Route19_MapScriptHeader: return TrainerSwimmerfDawn: - trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, NONE, SwimmerfDawnScript + trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, SwimmerfDawnScript SwimmerfDawnScript: talkaftercancel @@ -33,7 +33,7 @@ SwimmerfDawnScript: end TrainerSwimmermHarold: - trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, NONE, SwimmermHaroldScript + trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, SwimmermHaroldScript SwimmermHaroldScript: talkaftercancel @@ -44,7 +44,7 @@ SwimmermHaroldScript: end TrainerSwimmermJerome: - trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, NONE, SwimmermJeromeScript + trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, SwimmermJeromeScript SwimmermJeromeScript: talkaftercancel @@ -55,7 +55,7 @@ SwimmermJeromeScript: end TrainerSwimmermTucker: - trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, NONE, SwimmermTuckerScript + trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, SwimmermTuckerScript SwimmermTuckerScript: talkaftercancel diff --git a/maps/Route2.asm b/maps/Route2.asm index c51488257..c122fd9a1 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -6,7 +6,7 @@ Route2_MapScriptHeader: db 0 TrainerBug_catcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, NONE, Bug_catcherRobScript + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript Bug_catcherRobScript: talkaftercancel @@ -17,7 +17,7 @@ Bug_catcherRobScript: end TrainerBug_catcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, NONE, Bug_catcherEdScript + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript Bug_catcherEdScript: talkaftercancel @@ -28,7 +28,7 @@ Bug_catcherEdScript: end TrainerBug_catcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, NONE, Bug_catcherDougScript + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript Bug_catcherDougScript: talkaftercancel diff --git a/maps/Route20.asm b/maps/Route20.asm index 55d65b213..a0947ab7a 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -14,7 +14,7 @@ Route20_MapScriptHeader: return TrainerSwimmerfNicole: - trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, NONE, SwimmerfNicoleScript + trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, SwimmerfNicoleScript SwimmerfNicoleScript: talkaftercancel @@ -25,7 +25,7 @@ SwimmerfNicoleScript: end TrainerSwimmerfLori: - trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, NONE, SwimmerfLoriScript + trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, SwimmerfLoriScript SwimmerfLoriScript: talkaftercancel @@ -36,7 +36,7 @@ SwimmerfLoriScript: end TrainerSwimmermCameron: - trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, NONE, SwimmermCameronScript + trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, SwimmermCameronScript SwimmermCameronScript: talkaftercancel diff --git a/maps/Route21.asm b/maps/Route21.asm index 5c07713c8..9c01de42d 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -6,7 +6,7 @@ Route21_MapScriptHeader: db 0 TrainerSwimmermSeth: - trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, NONE, SwimmermSethScript + trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, SwimmermSethScript SwimmermSethScript: talkaftercancel @@ -17,7 +17,7 @@ SwimmermSethScript: end TrainerSwimmerfNikki: - trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, NONE, SwimmerfNikkiScript + trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, SwimmerfNikkiScript SwimmerfNikkiScript: talkaftercancel @@ -28,7 +28,7 @@ SwimmerfNikkiScript: end TrainerFisherArnold: - trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, NONE, FisherArnoldScript + trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, FisherArnoldScript FisherArnoldScript: talkaftercancel diff --git a/maps/Route25.asm b/maps/Route25.asm index 91fa51535..a99538b90 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -3,8 +3,8 @@ Route25_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x19ee9e, NONE - dw UnknownScript_0x19ee9f, NONE + dw UnknownScript_0x19ee9e, 0 + dw UnknownScript_0x19ee9f, 0 .MapCallbacks: db 0 @@ -68,7 +68,7 @@ UnknownScript_0x19eee0: end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, NONE, SchoolboyDudleyScript + trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, SchoolboyDudleyScript SchoolboyDudleyScript: talkaftercancel @@ -79,7 +79,7 @@ SchoolboyDudleyScript: end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, NONE, LassEllenScript + trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, LassEllenScript LassEllenScript: talkaftercancel @@ -90,7 +90,7 @@ LassEllenScript: end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, NONE, SchoolboyJoeScript + trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, SchoolboyJoeScript SchoolboyJoeScript: talkaftercancel @@ -101,7 +101,7 @@ SchoolboyJoeScript: end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, NONE, LassLauraScript + trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, LassLauraScript LassLauraScript: talkaftercancel @@ -112,7 +112,7 @@ LassLauraScript: end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, NONE, CamperLloydScript + trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, CamperLloydScript CamperLloydScript: talkaftercancel @@ -123,7 +123,7 @@ CamperLloydScript: end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, NONE, LassShannonScript + trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, LassShannonScript LassShannonScript: talkaftercancel @@ -134,7 +134,7 @@ LassShannonScript: end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, NONE, SupernerdPatScript + trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, SupernerdPatScript SupernerdPatScript: talkaftercancel @@ -160,7 +160,7 @@ UnknownScript_0x19efc7: writetext UnknownText_0x19f49d closetext loadmovesprites - winlosstext UnknownText_0x19f4fd, NONE + winlosstext UnknownText_0x19f4fd, 0 loadtrainer COOLTRAINERM, KEVIN startbattle returnafterbattle diff --git a/maps/Route26.asm b/maps/Route26.asm index d50064346..913910eb2 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -6,7 +6,7 @@ Route26_MapScriptHeader: db 0 TrainerCooltrainermJake: - trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, NONE, CooltrainermJakeScript + trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, CooltrainermJakeScript CooltrainermJakeScript: talkaftercancel @@ -17,7 +17,7 @@ CooltrainermJakeScript: end TrainerCooltrainermGaven3: - trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, NONE, CooltrainermGaven3Script + trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, CooltrainermGaven3Script CooltrainermGaven3Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN @@ -47,7 +47,7 @@ UnknownScript_0x1a4d65: UnknownScript_0x1a4d79: scall UnknownScript_0x1a4dd7 - winlosstext CooltrainermGaven3BeatenText, NONE + winlosstext CooltrainermGaven3BeatenText, 0 copybytetovar wGavenFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -110,7 +110,7 @@ UnknownScript_0x1a4dd7: end TrainerCooltrainerfJoyce: - trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, NONE, CooltrainerfJoyceScript + trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, CooltrainerfJoyceScript CooltrainerfJoyceScript: talkaftercancel @@ -121,7 +121,7 @@ CooltrainerfJoyceScript: end TrainerCooltrainerfBeth1: - trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, NONE, CooltrainerfBeth1Script + trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, CooltrainerfBeth1Script CooltrainerfBeth1Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH @@ -151,7 +151,7 @@ UnknownScript_0x1a4e21: UnknownScript_0x1a4e35: scall UnknownScript_0x1a4e93 - winlosstext CooltrainerfBeth1BeatenText, NONE + winlosstext CooltrainerfBeth1BeatenText, 0 copybytetovar wBethFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -214,7 +214,7 @@ UnknownScript_0x1a4e93: end TrainerPsychicRichard: - trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, NONE, PsychicRichardScript + trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, PsychicRichardScript PsychicRichardScript: talkaftercancel @@ -225,7 +225,7 @@ PsychicRichardScript: end TrainerFisherScott: - trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, NONE, FisherScottScript + trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, FisherScottScript FisherScottScript: talkaftercancel diff --git a/maps/Route27.asm b/maps/Route27.asm index 565d987e4..6a1f52f8d 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -3,8 +3,8 @@ Route27_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1a0871, NONE - dw UnknownScript_0x1a0872, NONE + dw UnknownScript_0x1a0871, 0 + dw UnknownScript_0x1a0872, 0 .MapCallbacks: db 0 @@ -40,7 +40,7 @@ FisherScript_0x1a089c: jumptextfaceplayer UnknownText_0x1a0a71 TrainerPsychicGilbert: - trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, NONE, PsychicGilbertScript + trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, PsychicGilbertScript PsychicGilbertScript: talkaftercancel @@ -51,7 +51,7 @@ PsychicGilbertScript: end TrainerBird_keeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, NONE, Bird_keeperJose2Script + trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, Bird_keeperJose2Script Bird_keeperJose2Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE @@ -83,7 +83,7 @@ UnknownScript_0x1a08eb: UnknownScript_0x1a08ff: scall UnknownScript_0x1a096f - winlosstext Bird_keeperJose2BeatenText, NONE + winlosstext Bird_keeperJose2BeatenText, 0 copybytetovar wJoseFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -164,7 +164,7 @@ UnknownScript_0x1a0977: end TrainerCooltrainermBlake: - trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, NONE, CooltrainermBlakeScript + trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, CooltrainermBlakeScript CooltrainermBlakeScript: talkaftercancel @@ -175,7 +175,7 @@ CooltrainermBlakeScript: end TrainerCooltrainermBrian: - trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, NONE, CooltrainermBrianScript + trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, CooltrainermBrianScript CooltrainermBrianScript: talkaftercancel @@ -186,7 +186,7 @@ CooltrainermBrianScript: end TrainerCooltrainerfReena: - trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, NONE, CooltrainerfReena1Script + trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, CooltrainerfReena1Script CooltrainerfReena1Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA @@ -216,7 +216,7 @@ UnknownScript_0x1a09d5: UnknownScript_0x1a09e9: scall UnknownScript_0x1a0a47 - winlosstext CooltrainerfReena1BeatenText, NONE + winlosstext CooltrainerfReena1BeatenText, 0 copybytetovar wReenaFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -279,7 +279,7 @@ UnknownScript_0x1a0a47: end TrainerCooltrainerfMegan: - trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, NONE, CooltrainerfMeganScript + trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, CooltrainerfMeganScript CooltrainerfMeganScript: talkaftercancel diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 8f9ff0201..add88ec34 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -3,7 +3,7 @@ Route28FamousSpeechHouse_MapScriptHeader: db 1 ; triggers - dw .Trigger, NONE + dw .Trigger, 0 .MapCallbacks: db 0 diff --git a/maps/Route29.asm b/maps/Route29.asm index 5489dc683..a50f02aba 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -3,8 +3,8 @@ Route29_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1a0f59, NONE - dw UnknownScript_0x1a0f5a, NONE + dw UnknownScript_0x1a0f59, 0 + dw UnknownScript_0x1a0f5a, 0 .MapCallbacks: db 1 diff --git a/maps/Route3.asm b/maps/Route3.asm index 46e67e771..4d8899970 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -6,7 +6,7 @@ Route3_MapScriptHeader: db 0 TrainerFirebreatherOtis: - trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, NONE, FirebreatherOtisScript + trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript FirebreatherOtisScript: talkaftercancel @@ -17,7 +17,7 @@ FirebreatherOtisScript: end TrainerYoungsterWarren: - trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, NONE, YoungsterWarrenScript + trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript YoungsterWarrenScript: talkaftercancel @@ -28,7 +28,7 @@ YoungsterWarrenScript: end TrainerYoungsterJimmy: - trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, NONE, YoungsterJimmyScript + trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript YoungsterJimmyScript: talkaftercancel @@ -39,7 +39,7 @@ YoungsterJimmyScript: end TrainerFirebreatherBurt: - trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, NONE, FirebreatherBurtScript + trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript FirebreatherBurtScript: talkaftercancel diff --git a/maps/Route30.asm b/maps/Route30.asm index f46dabcbd..362337b8b 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -26,7 +26,7 @@ YoungsterScript_0x1a1673: end TrainerYoungsterJoey: - trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, NONE, YoungsterJoey1Script + trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, YoungsterJoey1Script YoungsterJoey1Script: writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY @@ -56,7 +56,7 @@ UnknownScript_0x1a16cc: UnknownScript_0x1a16e0: scall UnknownScript_0x1a179b - winlosstext YoungsterJoey1BeatenText, NONE + winlosstext YoungsterJoey1BeatenText, 0 copybytetovar wJoeyFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -173,7 +173,7 @@ UnknownScript_0x1a17a6: end TrainerYoungsterMikey: - trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, NONE, YoungsterMikeyScript + trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, YoungsterMikeyScript YoungsterMikeyScript: talkaftercancel @@ -184,7 +184,7 @@ YoungsterMikeyScript: end TrainerBug_catcherDon: - trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, NONE, Bug_catcherDonScript + trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, 0, Bug_catcherDonScript Bug_catcherDonScript: talkaftercancel diff --git a/maps/Route31.asm b/maps/Route31.asm index 7ec2ae9b8..a68f1af06 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -19,7 +19,7 @@ UnknownScript_0x1a5443: return TrainerBug_catcherWade1: - trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, NONE, Bug_catcherWade1Script + trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, 0, Bug_catcherWade1Script Bug_catcherWade1Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE @@ -51,7 +51,7 @@ UnknownScript_0x1a547f: UnknownScript_0x1a5493: scall UnknownScript_0x1a5564 - winlosstext Bug_catcherWade1BeatenText, NONE + winlosstext Bug_catcherWade1BeatenText, 0 copybytetovar wWadeFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 diff --git a/maps/Route32.asm b/maps/Route32.asm index 2b1fb534f..a3d9ecdb6 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -3,9 +3,9 @@ Route32_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x190460, NONE - dw UnknownScript_0x190461, NONE - dw UnknownScript_0x190462, NONE + dw UnknownScript_0x190460, 0 + dw UnknownScript_0x190461, 0 + dw UnknownScript_0x190462, 0 .MapCallbacks: db 1 @@ -133,7 +133,7 @@ UnknownScript_0x190503: end TrainerCamperRoland: - trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, NONE, CamperRolandScript + trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, CamperRolandScript CamperRolandScript: talkaftercancel @@ -144,7 +144,7 @@ CamperRolandScript: end TrainerFisherJustin: - trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, NONE, FisherJustinScript + trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, FisherJustinScript FisherJustinScript: talkaftercancel @@ -155,7 +155,7 @@ FisherJustinScript: end TrainerFisherRalph1: - trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, NONE, FisherRalph1Script + trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, 0, FisherRalph1Script FisherRalph1Script: writecode VAR_CALLERID, PHONE_FISHER_RALPH @@ -187,7 +187,7 @@ UnknownScript_0x190569: UnknownScript_0x19057d: scall UnknownScript_0x19060f - winlosstext FisherRalph1BeatenText, NONE + winlosstext FisherRalph1BeatenText, 0 copybytetovar wRalphFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -280,7 +280,7 @@ UnknownScript_0x19060f: end TrainerFisherHenry: - trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, NONE, FisherHenryScript + trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, FisherHenryScript FisherHenryScript: talkaftercancel @@ -291,7 +291,7 @@ FisherHenryScript: end TrainerPicnickerLiz1: - trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, NONE, PicnickerLiz1Script + trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, PicnickerLiz1Script PicnickerLiz1Script: writecode VAR_CALLERID, PHONE_PICNICKER_LIZ @@ -321,7 +321,7 @@ UnknownScript_0x190659: UnknownScript_0x19066d: scall UnknownScript_0x1906f9 - winlosstext PicnickerLiz1BeatenText, NONE + winlosstext PicnickerLiz1BeatenText, 0 copybytetovar wLizFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -408,7 +408,7 @@ UnknownScript_0x1906f9: end TrainerYoungsterAlbert: - trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, NONE, YoungsterAlbertScript + trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, YoungsterAlbertScript YoungsterAlbertScript: talkaftercancel @@ -419,7 +419,7 @@ YoungsterAlbertScript: end TrainerYoungsterGordon: - trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, NONE, YoungsterGordonScript + trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, YoungsterGordonScript YoungsterGordonScript: talkaftercancel @@ -430,7 +430,7 @@ YoungsterGordonScript: end TrainerBird_keeperPeter: - trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, NONE, Bird_keeperPeterScript + trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, 0, Bird_keeperPeterScript Bird_keeperPeterScript: talkaftercancel diff --git a/maps/Route33.asm b/maps/Route33.asm index 66e6851de..c1746ce7f 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -9,7 +9,7 @@ LassScript_0x1ac002: jumptextfaceplayer UnknownText_0x1ac1e7 TrainerHikerAnthony: - trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, NONE, HikerAnthony2Script + trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, HikerAnthony2Script HikerAnthony2Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY @@ -41,7 +41,7 @@ UnknownScript_0x1ac03d: UnknownScript_0x1ac051: scall UnknownScript_0x1ac0e3 - winlosstext HikerAnthony2BeatenText, NONE + winlosstext HikerAnthony2BeatenText, 0 copybytetovar wAnthonyFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 diff --git a/maps/Route34.asm b/maps/Route34.asm index 659e88c74..39edd9560 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -76,7 +76,7 @@ DaycareMon2Script_0x7806b: end TrainerCamperTodd1: - trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, NONE, CamperTodd1Script + trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, CamperTodd1Script CamperTodd1Script: writecode VAR_CALLERID, PHONE_CAMPER_TODD @@ -108,7 +108,7 @@ UnknownScript_0x780a9: UnknownScript_0x780bd: scall UnknownScript_0x7814f - winlosstext CamperTodd1BeatenText, NONE + winlosstext CamperTodd1BeatenText, 0 copybytetovar wToddFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -201,7 +201,7 @@ UnknownScript_0x7814f: end TrainerPicnickerGina1: - trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, NONE, PicnickerGina1Script + trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, PicnickerGina1Script PicnickerGina1Script: writecode VAR_CALLERID, PHONE_PICNICKER_GINA @@ -233,7 +233,7 @@ UnknownScript_0x7818b: UnknownScript_0x7819f: scall UnknownScript_0x78240 - winlosstext PicnickerGina1BeatenText, NONE + winlosstext PicnickerGina1BeatenText, 0 copybytetovar wGinaFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -349,7 +349,7 @@ OfficerScript_0x7824c: writetext UnknownText_0x785e4 closetext loadmovesprites - winlosstext UnknownText_0x78609, NONE + winlosstext UnknownText_0x78609, 0 loadtrainer OFFICER, KEITH startbattle returnafterbattle @@ -370,7 +370,7 @@ UnknownScript_0x78276: end TrainerYoungsterSamuel: - trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, NONE, YoungsterSamuelScript + trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, YoungsterSamuelScript YoungsterSamuelScript: talkaftercancel @@ -381,7 +381,7 @@ YoungsterSamuelScript: end TrainerYoungsterIan: - trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, NONE, YoungsterIanScript + trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, YoungsterIanScript YoungsterIanScript: talkaftercancel @@ -392,7 +392,7 @@ YoungsterIanScript: end TrainerPokefanmBrandon: - trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, NONE, PokefanmBrandonScript + trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, PokefanmBrandonScript PokefanmBrandonScript: talkaftercancel @@ -403,7 +403,7 @@ PokefanmBrandonScript: end TrainerCooltrainerfIrene: - trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, NONE, CooltrainerfIreneScript + trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, CooltrainerfIreneScript CooltrainerfIreneScript: talkaftercancel @@ -422,7 +422,7 @@ UnknownScript_0x782d2: end TrainerCooltrainerfJenn: - trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, NONE, CooltrainerfJennScript + trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, CooltrainerfJennScript CooltrainerfJennScript: talkaftercancel @@ -441,7 +441,7 @@ UnknownScript_0x782f2: end TrainerCooltrainerfKate: - trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, NONE, CooltrainerfKateScript + trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, CooltrainerfKateScript CooltrainerfKateScript: talkaftercancel diff --git a/maps/Route35.asm b/maps/Route35.asm index 4d5e880d6..715dbc187 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -6,7 +6,7 @@ Route35_MapScriptHeader: db 0 TrainerBird_keeperBryan: - trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, NONE, Bird_keeperBryanScript + trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, Bird_keeperBryanScript Bird_keeperBryanScript: talkaftercancel @@ -17,7 +17,7 @@ Bird_keeperBryanScript: end TrainerJugglerIrwin: - trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, NONE, JugglerIrwin1Script + trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, JugglerIrwin1Script JugglerIrwin1Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN @@ -72,7 +72,7 @@ UnknownScript_0x19c91b: end TrainerCamperIvan: - trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, NONE, CamperIvanScript + trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, CamperIvanScript CamperIvanScript: talkaftercancel @@ -83,7 +83,7 @@ CamperIvanScript: end TrainerCamperElliot: - trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, NONE, CamperElliotScript + trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, CamperElliotScript CamperElliotScript: talkaftercancel @@ -94,7 +94,7 @@ CamperElliotScript: end TrainerPicnickerBrooke: - trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, NONE, PicnickerBrookeScript + trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, PicnickerBrookeScript PicnickerBrookeScript: talkaftercancel @@ -105,7 +105,7 @@ PicnickerBrookeScript: end TrainerPicnickerKim: - trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, NONE, PicnickerKimScript + trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, PicnickerKimScript PicnickerKimScript: talkaftercancel @@ -116,7 +116,7 @@ PicnickerKimScript: end TrainerBug_catcherArnie1: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, NONE, Bug_catcherArnie1Script + trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, Bug_catcherArnie1Script Bug_catcherArnie1Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE @@ -148,7 +148,7 @@ UnknownScript_0x19c9a7: UnknownScript_0x19c9bb: scall UnknownScript_0x19c91b - winlosstext Bug_catcherArnie1BeatenText, NONE + winlosstext Bug_catcherArnie1BeatenText, 0 copybytetovar wArnieFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -213,7 +213,7 @@ UnknownScript_0x19ca2f: end TrainerFirebreatherWalt: - trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, NONE, FirebreatherWaltScript + trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, FirebreatherWaltScript FirebreatherWaltScript: talkaftercancel @@ -234,7 +234,7 @@ OfficerScript_0x19ca49: writetext UnknownText_0x19ceea closetext loadmovesprites - winlosstext UnknownText_0x19cf06, NONE + winlosstext UnknownText_0x19cf06, 0 loadtrainer OFFICER, DIRK startbattle returnafterbattle diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 3111dd612..e061aff66 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -3,9 +3,9 @@ Route35NationalParkgate_MapScriptHeader: db 3 ; triggers - dw Route35NationalParkgate_Trigger1, NONE - dw Route35NationalParkgate_Trigger2, NONE - dw Route35NationalParkgate_Trigger3, NONE + dw Route35NationalParkgate_Trigger1, 0 + dw Route35NationalParkgate_Trigger2, 0 + dw Route35NationalParkgate_Trigger3, 0 .MapCallbacks: db 2 diff --git a/maps/Route36.asm b/maps/Route36.asm index 96fb96389..e7693cfbe 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -3,8 +3,8 @@ Route36_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x19400d, NONE - dw UnknownScript_0x19400e, NONE + dw UnknownScript_0x19400d, 0 + dw UnknownScript_0x19400e, 0 .MapCallbacks: db 1 @@ -162,7 +162,7 @@ UnknownScript_0x1940ee: end TrainerSchoolboyAlan1: - trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, NONE, SchoolboyAlan1Script + trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, SchoolboyAlan1Script SchoolboyAlan1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN @@ -194,7 +194,7 @@ UnknownScript_0x19412c: UnknownScript_0x194140: scall UnknownScript_0x1941e1 - winlosstext SchoolboyAlan1BeatenText, NONE + winlosstext SchoolboyAlan1BeatenText, 0 copybytetovar wAlanFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -300,7 +300,7 @@ UnknownScript_0x1941e9: end TrainerPsychicMark: - trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, NONE, PsychicMarkScript + trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, PsychicMarkScript PsychicMarkScript: talkaftercancel diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 8a357b0ff..87d6cf897 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -3,9 +3,9 @@ Route36NationalParkgate_MapScriptHeader: db 3 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE - dw .Trigger3, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 + dw .Trigger3, 0 .MapCallbacks: db 2 diff --git a/maps/Route37.asm b/maps/Route37.asm index fe3552936..d2dc3e11f 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -20,7 +20,7 @@ SunnyCallback: return TrainerTwinsAnnandanne1: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, NONE, TwinsAnnandanne1Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, TwinsAnnandanne1Script TwinsAnnandanne1Script: talkaftercancel @@ -31,7 +31,7 @@ TwinsAnnandanne1Script: end TrainerTwinsAnnandanne2: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, NONE, TwinsAnnandanne2Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, TwinsAnnandanne2Script TwinsAnnandanne2Script: talkaftercancel @@ -42,7 +42,7 @@ TwinsAnnandanne2Script: end TrainerPsychicGreg: - trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, NONE, PsychicGregScript + trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, PsychicGregScript PsychicGregScript: talkaftercancel diff --git a/maps/Route38.asm b/maps/Route38.asm index 596596c7c..54e209a16 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -6,7 +6,7 @@ Route38_MapScriptHeader: db 0 TrainerBird_keeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, NONE, Bird_keeperTobyScript + trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, Bird_keeperTobyScript Bird_keeperTobyScript: talkaftercancel @@ -17,7 +17,7 @@ Bird_keeperTobyScript: end TrainerSailorHarry: - trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, NONE, SailorHarryScript + trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, SailorHarryScript SailorHarryScript: talkaftercancel @@ -28,7 +28,7 @@ SailorHarryScript: end TrainerLassDana1: - trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, NONE, LassDana1Script + trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, LassDana1Script LassDana1Script: writecode VAR_CALLERID, PHONE_LASS_DANA @@ -60,7 +60,7 @@ UnknownScript_0x1a1d6e: UnknownScript_0x1a1d82: scall UnknownScript_0x1a1e23 - winlosstext LassDana1BeatenText, NONE + winlosstext LassDana1BeatenText, 0 copybytetovar wDanaFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -166,7 +166,7 @@ UnknownScript_0x1a1e2b: end TrainerSchoolboyChad1: - trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, NONE, SchoolboyChad1Script + trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, SchoolboyChad1Script SchoolboyChad1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD @@ -196,7 +196,7 @@ UnknownScript_0x1a1e61: UnknownScript_0x1a1e75: scall UnknownScript_0x1a1f01 - winlosstext SchoolboyChad1BeatenText, NONE + winlosstext SchoolboyChad1BeatenText, 0 copybytetovar wChadFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -283,7 +283,7 @@ UnknownScript_0x1a1f01: end TrainerBeautyValerie: - trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, NONE, BeautyValerieScript + trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, BeautyValerieScript BeautyValerieScript: talkaftercancel @@ -294,7 +294,7 @@ BeautyValerieScript: end TrainerBeautyOlivia: - trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, NONE, BeautyOliviaScript + trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, BeautyOliviaScript BeautyOliviaScript: talkaftercancel diff --git a/maps/Route39.asm b/maps/Route39.asm index a73edfd32..174830ffa 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -14,7 +14,7 @@ TaurosScript_0x1a5af5: end TrainerPokefanmDerek1: - trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, NONE, PokefanmDerek1Script + trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, PokefanmDerek1Script PokefanmDerek1Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK @@ -93,7 +93,7 @@ UnknownScript_0x1a5b7e: end TrainerPokefanfRuth: - trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, NONE, PokefanfRuthScript + trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, PokefanfRuthScript PokefanfRuthScript: talkaftercancel @@ -104,7 +104,7 @@ PokefanfRuthScript: end TrainerSailorEugene: - trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, NONE, SailorEugeneScript + trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, SailorEugeneScript SailorEugeneScript: talkaftercancel @@ -115,7 +115,7 @@ SailorEugeneScript: end TrainerPsychicNorman: - trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, NONE, PsychicNormanScript + trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, PsychicNormanScript PsychicNormanScript: talkaftercancel @@ -135,7 +135,7 @@ PokefanFScript_0x1a5bbe: writetext UnknownText_0x1a5ee8 closetext loadmovesprites - winlosstext UnknownText_0x1a5f17, NONE + winlosstext UnknownText_0x1a5f17, 0 loadtrainer POKEFANF, JAIME startbattle returnafterbattle diff --git a/maps/Route4.asm b/maps/Route4.asm index 429a31852..623cc0124 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -6,7 +6,7 @@ Route4_MapScriptHeader: db 0 TrainerBird_keeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, NONE, Bird_keeperHankScript + trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, Bird_keeperHankScript Bird_keeperHankScript: talkaftercancel @@ -17,7 +17,7 @@ Bird_keeperHankScript: end TrainerPicnickerHope: - trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, NONE, PicnickerHopeScript + trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, PicnickerHopeScript PicnickerHopeScript: talkaftercancel @@ -28,7 +28,7 @@ PicnickerHopeScript: end TrainerPicnickerSharon: - trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, NONE, PicnickerSharonScript + trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, PicnickerSharonScript PicnickerSharonScript: talkaftercancel diff --git a/maps/Route40.asm b/maps/Route40.asm index 89f980659..b8cd1bc88 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -21,7 +21,7 @@ MonicaCallback: return TrainerSwimmerfElaine: - trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, NONE, SwimmerfElaineScript + trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, SwimmerfElaineScript SwimmerfElaineScript: talkaftercancel @@ -32,7 +32,7 @@ SwimmerfElaineScript: end TrainerSwimmerfPaula: - trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, NONE, SwimmerfPaulaScript + trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, SwimmerfPaulaScript SwimmerfPaulaScript: talkaftercancel @@ -43,7 +43,7 @@ SwimmerfPaulaScript: end TrainerSwimmermSimon: - trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, NONE, SwimmermSimonScript + trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, SwimmermSimonScript SwimmermSimonScript: talkaftercancel @@ -54,7 +54,7 @@ SwimmermSimonScript: end TrainerSwimmermRandall: - trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, NONE, SwimmermRandallScript + trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, SwimmermRandallScript SwimmermRandallScript: talkaftercancel diff --git a/maps/Route41.asm b/maps/Route41.asm index bcaac7fa1..81b16e240 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -6,7 +6,7 @@ Route41_MapScriptHeader: db 0 TrainerSwimmerfKaylee: - trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, NONE, SwimmerfKayleeScript + trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, SwimmerfKayleeScript SwimmerfKayleeScript: talkaftercancel @@ -17,7 +17,7 @@ SwimmerfKayleeScript: end TrainerSwimmerfSusie: - trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, NONE, SwimmerfSusieScript + trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, SwimmerfSusieScript SwimmerfSusieScript: talkaftercancel @@ -28,7 +28,7 @@ SwimmerfSusieScript: end TrainerSwimmerfDenise: - trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, NONE, SwimmerfDeniseScript + trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, SwimmerfDeniseScript SwimmerfDeniseScript: talkaftercancel @@ -39,7 +39,7 @@ SwimmerfDeniseScript: end TrainerSwimmerfKara: - trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, NONE, SwimmerfKaraScript + trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, SwimmerfKaraScript SwimmerfKaraScript: talkaftercancel @@ -50,7 +50,7 @@ SwimmerfKaraScript: end TrainerSwimmerfWendy: - trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, NONE, SwimmerfWendyScript + trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, SwimmerfWendyScript SwimmerfWendyScript: talkaftercancel @@ -61,7 +61,7 @@ SwimmerfWendyScript: end TrainerSwimmermCharlie: - trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, NONE, SwimmermCharlieScript + trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, SwimmermCharlieScript SwimmermCharlieScript: talkaftercancel @@ -72,7 +72,7 @@ SwimmermCharlieScript: end TrainerSwimmermGeorge: - trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, NONE, SwimmermGeorgeScript + trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, SwimmermGeorgeScript SwimmermGeorgeScript: talkaftercancel @@ -83,7 +83,7 @@ SwimmermGeorgeScript: end TrainerSwimmermBerke: - trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, NONE, SwimmermBerkeScript + trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, SwimmermBerkeScript SwimmermBerkeScript: talkaftercancel @@ -94,7 +94,7 @@ SwimmermBerkeScript: end TrainerSwimmermKirk: - trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, NONE, SwimmermKirkScript + trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, SwimmermKirkScript SwimmermKirkScript: talkaftercancel @@ -105,7 +105,7 @@ SwimmermKirkScript: end TrainerSwimmermMathew: - trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, NONE, SwimmermMathewScript + trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, SwimmermMathewScript SwimmermMathewScript: talkaftercancel diff --git a/maps/Route42.asm b/maps/Route42.asm index 66cfcec80..2a3582b24 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -3,8 +3,8 @@ Route42_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1a9216, NONE - dw UnknownScript_0x1a9217, NONE + dw UnknownScript_0x1a9216, 0 + dw UnknownScript_0x1a9217, 0 .MapCallbacks: db 0 @@ -28,7 +28,7 @@ UnknownScript_0x1a9218: end TrainerFisherTully1: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, NONE, FisherTully1Script + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, FisherTully1Script FisherTully1Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY @@ -60,7 +60,7 @@ UnknownScript_0x1a926b: UnknownScript_0x1a927f: scall UnknownScript_0x1a9309 - winlosstext FisherTully1BeatenText, NONE + winlosstext FisherTully1BeatenText, 0 copybytetovar wTullyFightCount if_equal 3, .Fight3 if_equal 2, .Fight2 @@ -154,7 +154,7 @@ UnknownScript_0x1a9311: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, NONE, PokemaniacShaneScript + trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript PokemaniacShaneScript: talkaftercancel @@ -165,7 +165,7 @@ PokemaniacShaneScript: end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, NONE, HikerBenjaminScript + trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript HikerBenjaminScript: talkaftercancel diff --git a/maps/Route43.asm b/maps/Route43.asm index 5716f2189..7be3e3ebc 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -20,7 +20,7 @@ UnknownScript_0x19d05c: return TrainerCamperSpencer: - trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, NONE, CamperSpencerScript + trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, CamperSpencerScript CamperSpencerScript: talkaftercancel @@ -31,7 +31,7 @@ CamperSpencerScript: end TrainerPokemaniacBen: - trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, NONE, PokemaniacBenScript + trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, PokemaniacBenScript PokemaniacBenScript: talkaftercancel @@ -42,7 +42,7 @@ PokemaniacBenScript: end TrainerPokemaniacBrent1: - trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, NONE, PokemaniacBrent1Script + trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, PokemaniacBrent1Script PokemaniacBrent1Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT @@ -72,7 +72,7 @@ UnknownScript_0x19d0bb: UnknownScript_0x19d0cf: scall UnknownScript_0x19d144 - winlosstext PokemaniacBrent1BeatenText, NONE + winlosstext PokemaniacBrent1BeatenText, 0 copybytetovar wBrentFightCount if_equal 3, .Fight3 if_equal 2, .Fight2 @@ -147,7 +147,7 @@ UnknownScript_0x19d144: end TrainerPokemaniacRon: - trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, NONE, PokemaniacRonScript + trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, PokemaniacRonScript PokemaniacRonScript: talkaftercancel @@ -158,7 +158,7 @@ PokemaniacRonScript: end TrainerFisherMarvin: - trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, NONE, FisherMarvinScript + trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, FisherMarvinScript FisherMarvinScript: talkaftercancel @@ -169,7 +169,7 @@ FisherMarvinScript: end TrainerPicnickerTiffany3: - trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, NONE, PicnickerTiffany3Script + trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, PicnickerTiffany3Script PicnickerTiffany3Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY @@ -203,7 +203,7 @@ UnknownScript_0x19d1ad: UnknownScript_0x19d1c1: scall UnknownScript_0x19d251 - winlosstext PicnickerTiffany3BeatenText, NONE + winlosstext PicnickerTiffany3BeatenText, 0 copybytetovar wTiffanyFightCount if_equal 3, .Fight3 if_equal 2, .Fight2 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 52352fd7e..741ddaaf2 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -3,8 +3,8 @@ Route43Gate_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x19abc5, NONE - dw UnknownScript_0x19abc9, NONE + dw UnknownScript_0x19abc5, 0 + dw UnknownScript_0x19abc9, 0 .MapCallbacks: db 1 diff --git a/maps/Route44.asm b/maps/Route44.asm index 21791371a..43082d590 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -6,7 +6,7 @@ Route44_MapScriptHeader: db 0 TrainerBird_keeperVance1: - trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, NONE, Bird_keeperVance1Script + trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, Bird_keeperVance1Script Bird_keeperVance1Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE @@ -36,7 +36,7 @@ UnknownScript_0x19d856: UnknownScript_0x19d86a: scall UnknownScript_0x19d8f7 - winlosstext Bird_keeperVance1BeatenText, NONE + winlosstext Bird_keeperVance1BeatenText, 0 copybytetovar wVanceFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -137,7 +137,7 @@ UnknownScript_0x19d90a: end TrainerPsychicPhil: - trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, NONE, PsychicPhilScript + trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, PsychicPhilScript PsychicPhilScript: talkaftercancel @@ -148,7 +148,7 @@ PsychicPhilScript: end TrainerFisherWilton1: - trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, NONE, FisherWilton1Script + trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, FisherWilton1Script FisherWilton1Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON @@ -180,7 +180,7 @@ UnknownScript_0x19d95a: UnknownScript_0x19d96e: scall UnknownScript_0x19d8f7 - winlosstext FisherWilton1BeatenText, NONE + winlosstext FisherWilton1BeatenText, 0 copybytetovar wWiltonFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -243,7 +243,7 @@ UnknownScript_0x19d9e7: jump UnknownScript_0x19d8ff TrainerFisherEdgar: - trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, NONE, FisherEdgarScript + trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, FisherEdgarScript FisherEdgarScript: talkaftercancel @@ -254,7 +254,7 @@ FisherEdgarScript: end TrainerCooltrainerfCybil: - trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, NONE, CooltrainerfCybilScript + trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, CooltrainerfCybilScript CooltrainerfCybilScript: talkaftercancel @@ -265,7 +265,7 @@ CooltrainerfCybilScript: end TrainerPokemaniacZach: - trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, NONE, PokemaniacZachScript + trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, PokemaniacZachScript PokemaniacZachScript: talkaftercancel @@ -276,7 +276,7 @@ PokemaniacZachScript: end TrainerCooltrainermAllen: - trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, NONE, CooltrainermAllenScript + trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, CooltrainermAllenScript CooltrainermAllenScript: talkaftercancel diff --git a/maps/Route45.asm b/maps/Route45.asm index 3e63378d3..35c1c054e 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -6,7 +6,7 @@ Route45_MapScriptHeader: db 0 TrainerBlackbeltKenji: - trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, NONE, BlackbeltKenji3Script + trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, BlackbeltKenji3Script BlackbeltKenji3Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI @@ -110,7 +110,7 @@ UnknownScript_0x19e146: end TrainerHikerErik: - trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, NONE, HikerErikScript + trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, HikerErikScript HikerErikScript: talkaftercancel @@ -121,7 +121,7 @@ HikerErikScript: end TrainerHikerMichael: - trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, NONE, HikerMichaelScript + trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, HikerMichaelScript HikerMichaelScript: talkaftercancel @@ -132,7 +132,7 @@ HikerMichaelScript: end TrainerHikerParry: - trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, NONE, HikerParry3Script + trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, HikerParry3Script HikerParry3Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY @@ -162,7 +162,7 @@ UnknownScript_0x19e1a4: UnknownScript_0x19e1b8: scall UnknownScript_0x19e133 - winlosstext HikerParry3BeatenText, NONE + winlosstext HikerParry3BeatenText, 0 copybytetovar wParryFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -218,7 +218,7 @@ UnknownScript_0x19e219: jump UnknownScript_0x19e127 TrainerHikerTimothy: - trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, NONE, HikerTimothyScript + trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, HikerTimothyScript HikerTimothyScript: talkaftercancel @@ -229,7 +229,7 @@ HikerTimothyScript: end TrainerCooltrainermRyan: - trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, NONE, CooltrainermRyanScript + trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, CooltrainermRyanScript CooltrainermRyanScript: talkaftercancel @@ -240,7 +240,7 @@ CooltrainermRyanScript: end TrainerCooltrainerfKelly: - trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, NONE, CooltrainerfKellyScript + trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, CooltrainerfKellyScript CooltrainerfKellyScript: talkaftercancel @@ -258,7 +258,7 @@ YoungsterScript_0x19e269: writetext UnknownText_0x19e87f closetext loadmovesprites - winlosstext UnknownText_0x19e899, NONE + winlosstext UnknownText_0x19e899, 0 loadtrainer CAMPER, QUENTIN startbattle returnafterbattle diff --git a/maps/Route46.asm b/maps/Route46.asm index 69736691e..968ddfb22 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -6,7 +6,7 @@ Route46_MapScriptHeader: db 0 TrainerCamperTed: - trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, NONE, CamperTedScript + trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, CamperTedScript CamperTedScript: talkaftercancel @@ -17,7 +17,7 @@ CamperTedScript: end TrainerPicnickerErin1: - trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, NONE, PicnickerErin1Script + trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, PicnickerErin1Script PicnickerErin1Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN @@ -47,7 +47,7 @@ UnknownScript_0x1a96c6: UnknownScript_0x1a96da: scall UnknownScript_0x1a9767 - winlosstext PicnickerErin1BeatenText, NONE + winlosstext PicnickerErin1BeatenText, 0 copybytetovar wErinFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -140,7 +140,7 @@ UnknownScript_0x1a9772: end TrainerHikerBailey: - trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, NONE, HikerBaileyScript + trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, HikerBaileyScript HikerBaileyScript: talkaftercancel diff --git a/maps/Route6.asm b/maps/Route6.asm index 74368fbd7..910669d54 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -6,7 +6,7 @@ Route6_MapScriptHeader: db 0 TrainerPokefanmRex: - trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, NONE, PokefanmRexScript + trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript PokefanmRexScript: talkaftercancel @@ -17,7 +17,7 @@ PokefanmRexScript: end TrainerPokefanmAllan: - trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, NONE, PokefanmAllanScript + trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript PokefanmAllanScript: talkaftercancel diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 513f0332d..4a6770211 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -3,7 +3,7 @@ Route6SaffronGate_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x1926e9, NONE + dw UnknownScript_0x1926e9, 0 .MapCallbacks: db 0 diff --git a/maps/Route8.asm b/maps/Route8.asm index e88725378..734c04003 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -6,7 +6,7 @@ Route8_MapScriptHeader: db 0 TrainerBikerDwayne: - trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, NONE, BikerDwayneScript + trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, BikerDwayneScript BikerDwayneScript: talkaftercancel @@ -17,7 +17,7 @@ BikerDwayneScript: end TrainerBikerHarris: - trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, NONE, BikerHarrisScript + trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, BikerHarrisScript BikerHarrisScript: talkaftercancel @@ -28,7 +28,7 @@ BikerHarrisScript: end TrainerBikerZeke: - trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, NONE, BikerZekeScript + trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, BikerZekeScript BikerZekeScript: talkaftercancel @@ -39,7 +39,7 @@ BikerZekeScript: end TrainerSupernerdSam: - trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, NONE, SupernerdSamScript + trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, SupernerdSamScript SupernerdSamScript: talkaftercancel @@ -50,7 +50,7 @@ SupernerdSamScript: end TrainerSupernerdTom: - trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, NONE, SupernerdTomScript + trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, SupernerdTomScript SupernerdTomScript: talkaftercancel diff --git a/maps/Route9.asm b/maps/Route9.asm index 1d81aad94..e939f7612 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -6,7 +6,7 @@ Route9_MapScriptHeader: db 0 TrainerCamperDean: - trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, NONE, CamperDeanScript + trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, CamperDeanScript CamperDeanScript: talkaftercancel @@ -17,7 +17,7 @@ CamperDeanScript: end TrainerPicnickerHeidi: - trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, NONE, PicnickerHeidiScript + trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, PicnickerHeidiScript PicnickerHeidiScript: talkaftercancel @@ -28,7 +28,7 @@ PicnickerHeidiScript: end TrainerCamperSid: - trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, NONE, CamperSidScript + trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, CamperSidScript CamperSidScript: talkaftercancel @@ -39,7 +39,7 @@ CamperSidScript: end TrainerPicnickerEdna: - trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, NONE, PicnickerEdnaScript + trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, PicnickerEdnaScript PicnickerEdnaScript: talkaftercancel @@ -50,7 +50,7 @@ PicnickerEdnaScript: end TrainerHikerTim: - trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, NONE, HikerTimScript + trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, HikerTimScript HikerTimScript: talkaftercancel @@ -61,7 +61,7 @@ HikerTimScript: end TrainerHikerSidney: - trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, NONE, HikerSidneyScript + trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, HikerSidneyScript HikerSidneyScript: talkaftercancel diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 397ef5815..506884841 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -3,8 +3,8 @@ RuinsofAlphAerodactylChamber_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x58dad, NONE - dw UnknownScript_0x58db8, NONE + dw UnknownScript_0x58dad, 0 + dw UnknownScript_0x58db8, 0 .MapCallbacks: db 1 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index dccd9664f..ff04d56f2 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -3,8 +3,8 @@ RuinsofAlphHoOhChamber_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x5856d, NONE - dw UnknownScript_0x5857b, NONE + dw UnknownScript_0x5856d, 0 + dw UnknownScript_0x5857b, 0 .MapCallbacks: db 1 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 44bc17b48..b8a350dc2 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -3,8 +3,8 @@ RuinsofAlphInnerChamber_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x58f69, NONE - dw UnknownScript_0x58f6a, NONE + dw UnknownScript_0x58f69, 0 + dw UnknownScript_0x58f6a, 0 .MapCallbacks: db 0 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 49d72f8e5..295117c8c 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -3,8 +3,8 @@ RuinsofAlphKabutoChamber_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x5872b, NONE - dw UnknownScript_0x58736, NONE + dw UnknownScript_0x5872b, 0 + dw UnknownScript_0x58736, 0 .MapCallbacks: db 1 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 4805ba937..29b96cdd2 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -3,8 +3,8 @@ RuinsofAlphOmanyteChamber_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x58be9, NONE - dw UnknownScript_0x58bf7, NONE + dw UnknownScript_0x58be9, 0 + dw UnknownScript_0x58bf7, 0 .MapCallbacks: db 1 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 631c7f58f..6e6fb96d3 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -3,8 +3,8 @@ RuinsofAlphOutside_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x5800d, NONE - dw UnknownScript_0x5800e, NONE + dw UnknownScript_0x5800d, 0 + dw UnknownScript_0x5800e, 0 .MapCallbacks: db 1 @@ -100,7 +100,7 @@ YoungsterScript_0x5807e: end TrainerPsychicNathan: - trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, NONE, PsychicNathanScript + trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, PsychicNathanScript PsychicNathanScript: talkaftercancel @@ -112,7 +112,7 @@ PsychicNathanScript: TrainerSuperNerdStan: - trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, NONE, UnknownScript_0x580a9 + trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, UnknownScript_0x580a9 UnknownScript_0x580a9: talkaftercancel diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 9fe427d78..ddf5e8e71 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -3,8 +3,8 @@ RuinsofAlphResearchCenter_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x59180, NONE - dw UnknownScript_0x59181, NONE + dw UnknownScript_0x59180, 0 + dw UnknownScript_0x59181, 0 .MapCallbacks: db 1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 8fb951480..8149aea1c 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -13,7 +13,7 @@ SabrinaScript_0x189c2e: writetext UnknownText_0x189cdf closetext loadmovesprites - winlosstext UnknownText_0x189df4, NONE + winlosstext UnknownText_0x189df4, 0 loadtrainer SABRINA, 1 startbattle returnafterbattle @@ -39,7 +39,7 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, NONE, MediumRebeccaScript + trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, MediumRebeccaScript MediumRebeccaScript: talkaftercancel @@ -50,7 +50,7 @@ MediumRebeccaScript: end TrainerPsychicFranklin: - trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, NONE, PsychicFranklinScript + trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, PsychicFranklinScript PsychicFranklinScript: talkaftercancel @@ -61,7 +61,7 @@ PsychicFranklinScript: end TrainerMediumDoris: - trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, NONE, MediumDorisScript + trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, MediumDorisScript MediumDorisScript: talkaftercancel @@ -72,7 +72,7 @@ MediumDorisScript: end TrainerPsychicJared: - trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, NONE, PsychicJaredScript + trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, PsychicJaredScript PsychicJaredScript: talkaftercancel diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 2675f0555..70b7834b4 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -3,7 +3,7 @@ SaffronTrainStation_MapScriptHeader: db 1 ; triggers - dw .Trigger1, NONE + dw .Trigger1, 0 .MapCallbacks: db 0 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index b9fa29bd0..420ef2d3b 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -3,7 +3,7 @@ SeafoamGym_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x1ab4fa, NONE + dw UnknownScript_0x1ab4fa, 0 .MapCallbacks: db 0 @@ -19,7 +19,7 @@ BlaineScript_0x1ab4fb: writetext UnknownText_0x1ab548 closetext loadmovesprites - winlosstext UnknownText_0x1ab646, NONE + winlosstext UnknownText_0x1ab646, 0 loadtrainer BLAINE, 1 startbattle iftrue .ReturnAfterBattle diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index b1054e329..6c9b1c8d8 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -9,7 +9,7 @@ KurtScript_0x5a5d5: jumptextfaceplayer UnknownText_0x5a6b5 TrainerGruntM29: - trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, NONE, GruntM29Script + trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script GruntM29Script: talkaftercancel @@ -20,7 +20,7 @@ GruntM29Script: end TrainerGruntM1: - trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, NONE, GruntM1Script + trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script GruntM1Script: loadfont @@ -63,7 +63,7 @@ GruntM1Script: end TrainerGruntM2: - trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, NONE, GruntM2Script + trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script GruntM2Script: talkaftercancel @@ -74,7 +74,7 @@ GruntM2Script: end TrainerGruntF1: - trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, NONE, GruntF1Script + trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script GruntF1Script: talkaftercancel diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 627cc25b4..c7252d33b 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -18,7 +18,7 @@ TeacherScript_0x184507: jumptextfaceplayer UnknownText_0x18469d TrainerSageChow: - trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, NONE, SageChowScript + trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, SageChowScript SageChowScript: talkaftercancel diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index e3a2dd684..bf0ccca8a 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -6,7 +6,7 @@ SproutTower2F_MapScriptHeader: db 0 TrainerSageNico: - trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, NONE, SageNicoScript + trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, SageNicoScript SageNicoScript: talkaftercancel @@ -17,7 +17,7 @@ SageNicoScript: end TrainerSageEdmond: - trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, NONE, SageEdmondScript + trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, SageEdmondScript SageEdmondScript: talkaftercancel diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 0f1737fa4..daeae5805 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -3,8 +3,8 @@ SproutTower3F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x184945, NONE - dw UnknownScript_0x184946, NONE + dw UnknownScript_0x184945, 0 + dw UnknownScript_0x184946, 0 .MapCallbacks: db 0 @@ -64,7 +64,7 @@ SageLiScript: writetext SageLiSeenText closetext loadmovesprites - winlosstext SageLiBeatenText, NONE + winlosstext SageLiBeatenText, 0 loadtrainer SAGE, LI startbattle returnafterbattle @@ -86,7 +86,7 @@ UnknownScript_0x1849d1: end TrainerSageJin: - trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, NONE, SageJinScript + trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, SageJinScript SageJinScript: talkaftercancel @@ -97,7 +97,7 @@ SageJinScript: end TrainerSageTroy: - trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, NONE, SageTroyScript + trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, SageTroyScript SageTroyScript: talkaftercancel @@ -108,7 +108,7 @@ SageTroyScript: end TrainerSageNeal: - trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, NONE, SageNealScript + trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, SageNealScript SageNealScript: talkaftercancel diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index d6715172a..ea250ae37 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -3,7 +3,7 @@ TeamRocketBaseB1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x6c65a, NONE + dw UnknownScript_0x6c65a, 0 .MapCallbacks: db 1 @@ -233,7 +233,7 @@ TrainerCameraGrunt1: writetext CameraGrunt1SeenText closetext loadmovesprites - winlosstext CameraGrunt1BeatenText, NONE + winlosstext CameraGrunt1BeatenText, 0 setlasttalked $2 loadtrainer GRUNTM, 20 startbattle @@ -246,7 +246,7 @@ TrainerCameraGrunt2: writetext CameraGrunt2SeenText closetext loadmovesprites - winlosstext CameraGrunt2BeatenText, NONE + winlosstext CameraGrunt2BeatenText, 0 setlasttalked $2 loadtrainer GRUNTM, 21 startbattle @@ -478,7 +478,7 @@ NoExplodingTrap: end TrainerScientistJed: - trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, NONE, ScientistJedScript + trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, ScientistJedScript ScientistJedScript: talkaftercancel @@ -489,7 +489,7 @@ ScientistJedScript: end TrainerGruntM16: - trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, NONE, GruntM16Script + trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script GruntM16Script: talkaftercancel diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index dc05d7030..7b6892d61 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -3,10 +3,10 @@ TeamRocketBaseB2F_MapScriptHeader: db 4 ; triggers - dw UnknownScript_0x6cf85, NONE - dw UnknownScript_0x6cf86, NONE - dw UnknownScript_0x6cf87, NONE - dw UnknownScript_0x6cf88, NONE + dw UnknownScript_0x6cf85, 0 + dw UnknownScript_0x6cf86, 0 + dw UnknownScript_0x6cf87, 0 + dw UnknownScript_0x6cf88, 0 .MapCallbacks: db 1 @@ -84,7 +84,7 @@ UnknownScript_0x6cfac: loadmovesprites applymovement $2, MovementData_0x6d24a applymovement $3, MovementData_0x6d248 - winlosstext UnknownText_0x6d45c, NONE + winlosstext UnknownText_0x6d45c, 0 setlasttalked $3 loadtrainer EXECUTIVEF, 2 startbattle @@ -178,7 +178,7 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, NONE, GruntM17Script + trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script GruntM17Script: talkaftercancel @@ -189,7 +189,7 @@ GruntM17Script: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, NONE, GruntM18Script + trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script GruntM18Script: talkaftercancel @@ -200,7 +200,7 @@ GruntM18Script: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, NONE, GruntM19Script + trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script GruntM19Script: talkaftercancel diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index d990aaafc..671ff9dd7 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -3,10 +3,10 @@ TeamRocketBaseB3F_MapScriptHeader: db 4 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE - dw .Trigger3, NONE - dw .Trigger4, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 + dw .Trigger3, 0 + dw .Trigger4, 0 .MapCallbacks: db 1 @@ -91,7 +91,7 @@ UnknownScript_0x6e056: closetext loadmovesprites applymovement $3, MovementData_0x6e142 - winlosstext UnknownText_0x6e511, NONE + winlosstext UnknownText_0x6e511, 0 setlasttalked $3 loadtrainer EXECUTIVEM, 4 startbattle @@ -117,7 +117,7 @@ MoltresScript_0x6e091: end TrainerGruntF5: - trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, NONE, GruntF5Script + trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script GruntF5Script: talkaftercancel @@ -129,7 +129,7 @@ GruntF5Script: end TrainerGruntM28: - trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, NONE, GruntM28Script + trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script GruntM28Script: talkaftercancel @@ -141,7 +141,7 @@ GruntM28Script: end TrainerScientistRoss: - trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, NONE, ScientistRossScript + trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, ScientistRossScript ScientistRossScript: talkaftercancel @@ -152,7 +152,7 @@ ScientistRossScript: end TrainerScientistMitch: - trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, NONE, ScientistMitchScript + trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, ScientistMitchScript ScientistMitchScript: talkaftercancel diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 6c7b34293..32d52bb77 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -3,8 +3,8 @@ TimeCapsule_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 05698f2c9..33e8674b8 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -3,8 +3,8 @@ TinTower1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x18502a, NONE - dw UnknownScript_0x18502e, NONE + dw UnknownScript_0x18502a, 0 + dw UnknownScript_0x18502e, 0 .MapCallbacks: db 2 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 5277c0d92..3fad7fb24 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -3,8 +3,8 @@ TradeCenter_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index da7df7dcb..e6dd1103a 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -3,7 +3,7 @@ TrainerHouseB1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x9b38a, NONE + dw UnknownScript_0x9b38a, 0 .MapCallbacks: db 0 @@ -42,14 +42,14 @@ UnknownScript_0x9b3aa: loadmovesprites special SpecialTrainerHouse iffalse UnknownScript_0x9b3dc - winlosstext UnknownText_0x9b578, NONE + winlosstext UnknownText_0x9b578, 0 setlasttalked $3 loadtrainer CAL, CAL2 startbattle returnafterbattle iffalse UnknownScript_0x9b3e8 UnknownScript_0x9b3dc: - winlosstext UnknownText_0x9b578, NONE + winlosstext UnknownText_0x9b578, 0 setlasttalked $3 loadtrainer CAL, CAL3 startbattle diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index c20d4a3e6..e3e23144a 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -3,8 +3,8 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x7c9f5, NONE - dw UnknownScript_0x7c9f6, NONE + dw UnknownScript_0x7c9f5, 0 + dw UnknownScript_0x7c9f6, 0 .MapCallbacks: db 1 @@ -166,7 +166,7 @@ UnknownScript_0x7cb29: end TrainerGruntM11: - trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, NONE, GruntM11Script + trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script GruntM11Script: talkaftercancel @@ -177,7 +177,7 @@ GruntM11Script: end TrainerGruntM25: - trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, NONE, GruntM25Script + trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script GruntM25Script: talkaftercancel @@ -188,7 +188,7 @@ GruntM25Script: end TrainerBurglarDuncan: - trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, NONE, BurglarDuncanScript + trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, BurglarDuncanScript BurglarDuncanScript: talkaftercancel @@ -199,7 +199,7 @@ BurglarDuncanScript: end TrainerBurglarEddie: - trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, NONE, BurglarEddieScript + trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, BurglarEddieScript BurglarEddieScript: talkaftercancel @@ -210,7 +210,7 @@ BurglarEddieScript: end TrainerGruntM13: - trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, NONE, GruntM13Script + trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script GruntM13Script: talkaftercancel @@ -221,7 +221,7 @@ GruntM13Script: end TrainerGruntF3: - trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, NONE, GruntF3Script + trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script GruntF3Script: talkaftercancel diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index cdf960edc..60f4a5656 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -30,7 +30,7 @@ UndergroundWarehouse_MapScriptHeader: return TrainerGruntM24: - trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, NONE, GruntM24Script + trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script GruntM24Script: talkaftercancel @@ -41,7 +41,7 @@ GruntM24Script: end TrainerGruntM14: - trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, NONE, GruntM14Script + trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script GruntM14Script: talkaftercancel @@ -52,7 +52,7 @@ GruntM14Script: end TrainerGruntM15: - trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, NONE, GruntM15Script + trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script GruntM15Script: talkaftercancel diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 838bb8fc4..f6544808d 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -6,7 +6,7 @@ UnionCave1F_MapScriptHeader: db 0 TrainerPokemaniacLarry: - trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, NONE, PokemaniacLarryScript + trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, PokemaniacLarryScript PokemaniacLarryScript: talkaftercancel @@ -17,7 +17,7 @@ PokemaniacLarryScript: end TrainerHikerRussell: - trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, NONE, HikerRussellScript + trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, HikerRussellScript HikerRussellScript: talkaftercancel @@ -28,7 +28,7 @@ HikerRussellScript: end TrainerHikerDaniel: - trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, NONE, HikerDanielScript + trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, HikerDanielScript HikerDanielScript: talkaftercancel @@ -39,7 +39,7 @@ HikerDanielScript: end TrainerFirebreatherBill: - trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, NONE, FirebreatherBillScript + trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, FirebreatherBillScript FirebreatherBillScript: talkaftercancel @@ -50,7 +50,7 @@ FirebreatherBillScript: end TrainerFirebreatherRay: - trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, NONE, FirebreatherRayScript + trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, FirebreatherRayScript FirebreatherRayScript: talkaftercancel diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 1f15e2704..5b6d0415a 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -6,7 +6,7 @@ UnionCaveB1F_MapScriptHeader: db 0 TrainerPokemaniacAndrew: - trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, NONE, PokemaniacAndrewScript + trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, PokemaniacAndrewScript PokemaniacAndrewScript: talkaftercancel @@ -17,7 +17,7 @@ PokemaniacAndrewScript: end TrainerPokemaniacCalvin: - trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, NONE, PokemaniacCalvinScript + trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, PokemaniacCalvinScript PokemaniacCalvinScript: talkaftercancel @@ -28,7 +28,7 @@ PokemaniacCalvinScript: end TrainerHikerPhillip: - trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, NONE, HikerPhillipScript + trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, HikerPhillipScript HikerPhillipScript: talkaftercancel @@ -39,7 +39,7 @@ HikerPhillipScript: end TrainerHikerLeonard: - trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, NONE, HikerLeonardScript + trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, HikerLeonardScript HikerLeonardScript: talkaftercancel diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 9d1ab9d4a..7d9bbf462 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -33,7 +33,7 @@ SurfScript_0x5a31f: end TrainerCooltrainermNick: - trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, NONE, CooltrainermNickScript + trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, CooltrainermNickScript CooltrainermNickScript: talkaftercancel @@ -44,7 +44,7 @@ CooltrainermNickScript: end TrainerCooltrainerfGwen: - trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, NONE, CooltrainerfGwenScript + trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, CooltrainerfGwenScript CooltrainerfGwenScript: talkaftercancel @@ -55,7 +55,7 @@ CooltrainerfGwenScript: end TrainerCooltrainerfEmma: - trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, NONE, CooltrainerfEmmaScript + trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, CooltrainerfEmmaScript CooltrainerfEmmaScript: talkaftercancel diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index e33e305a9..a0a5e76c4 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -13,7 +13,7 @@ SurgeScript_0x1920a5: writetext UnknownText_0x192142 closetext loadmovesprites - winlosstext UnknownText_0x192238, NONE + winlosstext UnknownText_0x192238, 0 loadtrainer LT_SURGE, 1 startbattle returnafterbattle @@ -38,7 +38,7 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, NONE, GentlemanGregoryScript + trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, GentlemanGregoryScript GentlemanGregoryScript: talkaftercancel @@ -49,7 +49,7 @@ GentlemanGregoryScript: end TrainerGuitaristVincent: - trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, NONE, GuitaristVincentScript + trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, GuitaristVincentScript GuitaristVincentScript: talkaftercancel @@ -60,7 +60,7 @@ GuitaristVincentScript: end TrainerJugglerHorton: - trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, NONE, JugglerHortonScript + trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, JugglerHortonScript JugglerHortonScript: talkaftercancel diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index a8bfaf6a0..de184c02a 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -3,8 +3,8 @@ VermilionPort_MapScriptHeader: db 2 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 461f67e3b..2c7d332f5 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -3,8 +3,8 @@ VictoryRoad_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x74490, NONE - dw UnknownScript_0x74491, NONE + dw UnknownScript_0x74490, 0 + dw UnknownScript_0x74491, 0 .MapCallbacks: db 0 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 26bc2925b..62c6ace9b 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -3,8 +3,8 @@ VictoryRoadGate_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9b9fb, NONE - dw UnknownScript_0x9b9fc, NONE + dw UnknownScript_0x9b9fb, 0 + dw UnknownScript_0x9b9fc, 0 .MapCallbacks: db 0 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index a41c8a081..3ba553ae2 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -13,7 +13,7 @@ FalknerScript_0x683c2: writetext UnknownText_0x68473 closetext loadmovesprites - winlosstext UnknownText_0x6854a, NONE + winlosstext UnknownText_0x6854a, 0 loadtrainer FALKNER, 1 startbattle returnafterbattle @@ -61,7 +61,7 @@ VioletGymTriggerRockets: jumpstd radiotowerrockets TrainerBird_keeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, NONE, Bird_keeperRodScript + trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, Bird_keeperRodScript Bird_keeperRodScript: talkaftercancel @@ -72,7 +72,7 @@ Bird_keeperRodScript: end TrainerBird_keeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, NONE, Bird_keeperAbeScript + trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, Bird_keeperAbeScript Bird_keeperAbeScript: talkaftercancel diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index b2a739883..ba12ffade 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -13,7 +13,7 @@ BlueScript_0x9aa26: writetext UnknownText_0x9aa7b closetext loadmovesprites - winlosstext UnknownText_0x9abae, NONE + winlosstext UnknownText_0x9abae, 0 loadtrainer BLUE, 1 startbattle returnafterbattle diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 4c22f6e08..8aacb4fe4 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -105,7 +105,7 @@ WarehouseEntrance_MapScriptHeader: return TrainerSupernerdEric: - trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, NONE, SupernerdEricScript + trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, SupernerdEricScript SupernerdEricScript: talkaftercancel @@ -116,7 +116,7 @@ SupernerdEricScript: end TrainerSupernerdTeru: - trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, NONE, SupernerdTeruScript + trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, SupernerdTeruScript SupernerdTeruScript: talkaftercancel @@ -127,7 +127,7 @@ SupernerdTeruScript: end TrainerPokemaniacIssac: - trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, NONE, PokemaniacIssacScript + trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, PokemaniacIssacScript PokemaniacIssacScript: talkaftercancel @@ -138,7 +138,7 @@ PokemaniacIssacScript: end TrainerPokemaniacDonald: - trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, NONE, PokemaniacDonaldScript + trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, PokemaniacDonaldScript PokemaniacDonaldScript: talkaftercancel @@ -171,7 +171,7 @@ GrampsScript_0x7c146: .CheckMorn: checkmorn iffalse WarehouseEntranceScript_ShopClosed - pokemart $2, NONE + pokemart $2, 0 loadmovesprites end diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 7cb04b41f..208e723da 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -3,8 +3,8 @@ WillsRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1804c6, NONE - dw UnknownScript_0x1804ca, NONE + dw UnknownScript_0x1804c6, 0 + dw UnknownScript_0x1804ca, 0 .MapCallbacks: db 1 @@ -52,7 +52,7 @@ WillScript_0x1804f8: writetext UnknownText_0x180531 closetext loadmovesprites - winlosstext UnknownText_0x18062c, NONE + winlosstext UnknownText_0x18062c, 0 loadtrainer WILL, 1 startbattle returnafterbattle diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 8f5e7ec14..9a0a68010 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -3,8 +3,8 @@ WiseTriosRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x98572, NONE - dw UnknownScript_0x98573, NONE + dw UnknownScript_0x98572, 0 + dw UnknownScript_0x98573, 0 .MapCallbacks: db 1 @@ -66,7 +66,7 @@ UnknownScript_0x985a3: end TrainerSageGaku: - trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, NONE, SageGakuScript + trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, SageGakuScript SageGakuScript: loadfont @@ -76,7 +76,7 @@ SageGakuScript: end TrainerSageMasa: - trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, NONE, SageMasaScript + trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, SageMasaScript SageMasaScript: loadfont @@ -86,7 +86,7 @@ SageMasaScript: end TrainerSageKoji: - trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, NONE, SageKojiScript + trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, SageKojiScript SageKojiScript: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 1ba749409..c79d02a33 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -277,323 +277,323 @@ connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH - map_header_2 Route23, ROUTE_23, $f, NONE - map_header_2 SproutTower1F, SPROUT_TOWER_1F, $0, NONE - map_header_2 SproutTower2F, SPROUT_TOWER_2F, $0, NONE - map_header_2 SproutTower3F, SPROUT_TOWER_3F, $0, NONE - map_header_2 TinTower1F, TIN_TOWER_1F, $0, NONE - map_header_2 TinTower2F, TIN_TOWER_2F, $0, NONE - map_header_2 TinTower3F, TIN_TOWER_3F, $0, NONE - map_header_2 TinTower4F, TIN_TOWER_4F, $0, NONE - map_header_2 TinTower5F, TIN_TOWER_5F, $0, NONE - map_header_2 TinTower6F, TIN_TOWER_6F, $0, NONE - map_header_2 TinTower7F, TIN_TOWER_7F, $0, NONE - map_header_2 TinTower8F, TIN_TOWER_8F, $0, NONE - map_header_2 TinTower9F, TIN_TOWER_9F, $0, NONE - map_header_2 BurnedTower1F, BURNED_TOWER_1F, $0, NONE - map_header_2 BurnedTowerB1F, BURNED_TOWER_B1F, $9, NONE - map_header_2 NationalPark, NATIONAL_PARK, $0, NONE - map_header_2 NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $0, NONE - map_header_2 RadioTower1F, RADIO_TOWER_1F, $0, NONE - map_header_2 RadioTower2F, RADIO_TOWER_2F, $0, NONE - map_header_2 RadioTower3F, RADIO_TOWER_3F, $0, NONE - map_header_2 RadioTower4F, RADIO_TOWER_4F, $0, NONE - map_header_2 RadioTower5F, RADIO_TOWER_5F, $0, NONE - map_header_2 RuinsofAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, NONE - map_header_2 RuinsofAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, NONE - map_header_2 RuinsofAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, NONE - map_header_2 RuinsofAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, NONE - map_header_2 RuinsofAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, NONE - map_header_2 RuinsofAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, NONE - map_header_2 RuinsofAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, NONE - map_header_2 RuinsofAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, NONE - map_header_2 RuinsofAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, NONE - map_header_2 RuinsofAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, NONE - map_header_2 RuinsofAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, NONE - map_header_2 RuinsofAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, NONE - map_header_2 RuinsofAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, NONE - map_header_2 RuinsofAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, NONE - map_header_2 RuinsofAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, NONE - map_header_2 UnionCave1F, UNION_CAVE_1F, $9, NONE - map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, NONE - map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, NONE - map_header_2 SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $9, NONE - map_header_2 SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $9, NONE - map_header_2 OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $0, NONE - map_header_2 OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $0, NONE - map_header_2 OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $0, NONE - map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, NONE - map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, NONE - map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, NONE - map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, NONE - map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, NONE - map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, NONE - map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, NONE - map_header_2 IlexForest, ILEX_FOREST, $5, NONE - map_header_2 WarehouseEntrance, WAREHOUSE_ENTRANCE, $0, NONE - map_header_2 UndergroundPathSwitchRoomEntrances, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, $0, NONE - map_header_2 GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $0, NONE - map_header_2 UndergroundWarehouse, UNDERGROUND_WAREHOUSE, $0, NONE - map_header_2 MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $9, NONE - map_header_2 MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $9, NONE - map_header_2 MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $9, NONE - map_header_2 MountMortarB1F, MOUNT_MORTAR_B1F, $9, NONE - map_header_2 IcePath1F, ICE_PATH_1F, $9, NONE - map_header_2 IcePathB1F, ICE_PATH_B1F, $19, NONE - map_header_2 IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, NONE - map_header_2 IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, NONE - map_header_2 IcePathB3F, ICE_PATH_B3F, $19, NONE - map_header_2 WhirlIslandNW, WHIRL_ISLAND_NW, $9, NONE - map_header_2 WhirlIslandNE, WHIRL_ISLAND_NE, $9, NONE - map_header_2 WhirlIslandSW, WHIRL_ISLAND_SW, $9, NONE - map_header_2 WhirlIslandCave, WHIRL_ISLAND_CAVE, $9, NONE - map_header_2 WhirlIslandSE, WHIRL_ISLAND_SE, $f, NONE - map_header_2 WhirlIslandB1F, WHIRL_ISLAND_B1F, $9, NONE - map_header_2 WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, NONE - map_header_2 WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $f, NONE - map_header_2 SilverCaveRoom1, SILVER_CAVE_ROOM_1, $9, NONE - map_header_2 SilverCaveRoom2, SILVER_CAVE_ROOM_2, $9, NONE - map_header_2 SilverCaveRoom3, SILVER_CAVE_ROOM_3, $9, NONE - map_header_2 SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $9, NONE - map_header_2 DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $9, NONE - map_header_2 DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $9, NONE - map_header_2 DragonsDen1F, DRAGONS_DEN_1F, $9, NONE - map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, NONE - map_header_2 DragonShrine, DRAGON_SHRINE, $0, NONE - map_header_2 TohjoFalls, TOHJO_FALLS, $9, NONE - map_header_2 OlivinePokeCenter1F, OLIVINE_POKECENTER_1F, $0, NONE - map_header_2 OlivineGym, OLIVINE_GYM, $0, NONE - map_header_2 OlivineVoltorbHouse, OLIVINE_VOLTORB_HOUSE, $0, NONE - map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, NONE - map_header_2 OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $0, NONE - map_header_2 OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $0, NONE - map_header_2 OlivineCafe, OLIVINE_CAFE, $0, NONE - map_header_2 OlivineMart, OLIVINE_MART, $0, NONE - map_header_2 Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $0, NONE - map_header_2 Route39Barn, ROUTE_39_BARN, $0, NONE - map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, NONE - map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, NONE - map_header_2 MahoganyGym, MAHOGANY_GYM, $0, NONE - map_header_2 MahoganyPokeCenter1F, MAHOGANY_POKECENTER_1F, $0, NONE - map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, NONE - map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, NONE - map_header_2 MountMoon, MOUNT_MOON, $9, NONE - map_header_2 Underground, UNDERGROUND, $0, NONE - map_header_2 RockTunnel1F, ROCK_TUNNEL_1F, $9, NONE - map_header_2 RockTunnelB1F, ROCK_TUNNEL_B1F, $9, NONE - map_header_2 SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $0, NONE - map_header_2 SafariZoneBeta, SAFARI_ZONE_BETA, $13, NONE - map_header_2 VictoryRoad, VICTORY_ROAD, $1d, NONE - map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, NONE - map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, NONE - map_header_2 EcruteakPokeCenter1F, ECRUTEAK_POKECENTER_1F, $0, NONE - map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, NONE - map_header_2 DanceTheatre, DANCE_THEATRE, $0, NONE - map_header_2 EcruteakMart, ECRUTEAK_MART, $0, NONE - map_header_2 EcruteakGym, ECRUTEAK_GYM, $0, NONE - map_header_2 EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $0, NONE - map_header_2 BlackthornGym1F, BLACKTHORN_GYM_1F, $0, NONE - map_header_2 BlackthornGym2F, BLACKTHORN_GYM_2F, $0, NONE - map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, NONE - map_header_2 BlackthornDodrioTradeHouse, BLACKTHORN_DODRIO_TRADE_HOUSE, $0, NONE - map_header_2 BlackthornMart, BLACKTHORN_MART, $0, NONE - map_header_2 BlackthornPokeCenter1F, BLACKTHORN_POKECENTER_1F, $0, NONE - map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, NONE - map_header_2 CinnabarPokeCenter1F, CINNABAR_POKECENTER_1F, $0, NONE - map_header_2 CinnabarPokeCenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, NONE - map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, NONE - map_header_2 SeafoamGym, SEAFOAM_GYM, $9, NONE - map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, NONE - map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, NONE - map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, NONE - map_header_2 CeruleanPokeCenter1F, CERULEAN_POKECENTER_1F, $0, NONE - map_header_2 CeruleanPokeCenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, NONE - map_header_2 CeruleanGym, CERULEAN_GYM, $0, NONE - map_header_2 CeruleanMart, CERULEAN_MART, $0, NONE - map_header_2 Route10PokeCenter1F, ROUTE_10_POKECENTER_1F, $0, NONE - map_header_2 Route10PokeCenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, NONE - map_header_2 PowerPlant, POWER_PLANT, $0, NONE - map_header_2 BillsHouse, BILLS_HOUSE, $0, NONE - map_header_2 AzaleaPokeCenter1F, AZALEA_POKECENTER_1F, $0, NONE - map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, NONE - map_header_2 AzaleaMart, AZALEA_MART, $0, NONE - map_header_2 KurtsHouse, KURTS_HOUSE, $0, NONE - map_header_2 AzaleaGym, AZALEA_GYM, $0, NONE - map_header_2 LakeofRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, NONE - map_header_2 LakeofRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, NONE - map_header_2 Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $0, NONE - map_header_2 Route43Gate, ROUTE_43_GATE, $0, NONE - map_header_2 VioletMart, VIOLET_MART, $0, NONE - map_header_2 VioletGym, VIOLET_GYM, $0, NONE - map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, NONE - map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, NONE - map_header_2 VioletPokeCenter1F, VIOLET_POKECENTER_1F, $0, NONE - map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, NONE - map_header_2 Route32RuinsofAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, NONE - map_header_2 Route32PokeCenter1F, ROUTE_32_POKECENTER_1F, $0, NONE - map_header_2 Route35Goldenrodgate, ROUTE_35_GOLDENROD_GATE, $0, NONE - map_header_2 Route35NationalParkgate, ROUTE_35_NATIONAL_PARK_GATE, $0, NONE - map_header_2 Route36RuinsofAlphgate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, NONE - map_header_2 Route36NationalParkgate, ROUTE_36_NATIONAL_PARK_GATE, $0, NONE - map_header_2 GoldenrodGym, GOLDENROD_GYM, $0, NONE - map_header_2 GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $0, NONE - map_header_2 GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $0, NONE - map_header_2 GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $0, NONE - map_header_2 GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $0, NONE - map_header_2 GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $0, NONE - map_header_2 GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $0, NONE - map_header_2 GoldenrodNameRatersHouse, GOLDENROD_NAME_RATERS_HOUSE, $0, NONE - map_header_2 GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $0, NONE - map_header_2 GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $0, NONE - map_header_2 GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $0, NONE - map_header_2 GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $0, NONE - map_header_2 GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $0, NONE - map_header_2 GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $0, NONE - map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, NONE - map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, NONE - map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, NONE - map_header_2 GoldenrodPokeCenter1F, GOLDENROD_POKECENTER_1F, $0, NONE - map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, NONE - map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, NONE - map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, NONE - map_header_2 DayCare, DAYCARE, $0, NONE - map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, NONE - map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, NONE - map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, NONE - map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, NONE - map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, NONE - map_header_2 VermilionMart, VERMILION_MART, $0, NONE - map_header_2 VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $0, NONE - map_header_2 VermilionGym, VERMILION_GYM, $0, NONE - map_header_2 Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $0, NONE - map_header_2 Route6UndergroundEntrance, ROUTE_6_UNDERGROUND_ENTRANCE, $0, NONE - map_header_2 RedsHouse1F, REDS_HOUSE_1F, $0, NONE - map_header_2 RedsHouse2F, REDS_HOUSE_2F, $0, NONE - map_header_2 BluesHouse, BLUES_HOUSE, $0, NONE - map_header_2 OaksLab, OAKS_LAB, $0, NONE - map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, NONE - map_header_2 PewterGym, PEWTER_GYM, $0, NONE - map_header_2 PewterMart, PEWTER_MART, $0, NONE - map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, NONE - map_header_2 PewterPokeCEnter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, NONE - map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, NONE - map_header_2 OlivinePort, OLIVINE_PORT, $a, NONE - map_header_2 VermilionPort, VERMILION_PORT, $a, NONE - map_header_2 FastShip1F, FAST_SHIP_1F, $0, NONE - map_header_2 FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $0, NONE - map_header_2 FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $0, NONE - map_header_2 FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $0, NONE - map_header_2 FastShipB1F, FAST_SHIP_B1F, $0, NONE - map_header_2 OlivinePortPassage, OLIVINE_PORT_PASSAGE, $0, NONE - map_header_2 VermilionPortPassage, VERMILION_PORT_PASSAGE, $0, NONE - map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, NONE - map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, NONE - map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, NONE - map_header_2 IndigoPlateauPokeCenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, NONE - map_header_2 WillsRoom, WILLS_ROOM, $0, NONE - map_header_2 KogasRoom, KOGAS_ROOM, $0, NONE - map_header_2 BrunosRoom, BRUNOS_ROOM, $0, NONE - map_header_2 KarensRoom, KARENS_ROOM, $0, NONE - map_header_2 LancesRoom, LANCES_ROOM, $0, NONE - map_header_2 HallOfFame, HALL_OF_FAME, $0, NONE - map_header_2 FuchsiaMart, FUCHSIA_MART, $0, NONE - map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, NONE - map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, NONE - map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, NONE - map_header_2 FuchsiaPokeCenter1F, FUCHSIA_POKECENTER_1F, $0, NONE - map_header_2 FuchsiaPokeCenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, NONE - map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, NONE - map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, NONE - map_header_2 LavenderPokeCenter1F, LAVENDER_POKECENTER_1F, $0, NONE - map_header_2 LavenderPokeCenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, NONE - map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, NONE - map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, NONE - map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, NONE - map_header_2 LavenderMart, LAVENDER_MART, $0, NONE - map_header_2 SoulHouse, SOUL_HOUSE, $0, NONE - map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, NONE - map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, NONE - map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, NONE - map_header_2 SilverCavePokeCenter1F, SILVER_CAVE_POKECENTER_1F, $0, NONE - map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, NONE - map_header_2 PokeCenter2F, POKECENTER_2F, $0, NONE - map_header_2 TradeCenter, TRADE_CENTER, $0, NONE - map_header_2 Colosseum, COLOSSEUM, $0, NONE - map_header_2 TimeCapsule, TIME_CAPSULE, $0, NONE - map_header_2 MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $0, NONE - map_header_2 MobileBattleRoom, MOBILE_BATTLE_ROOM, $0, NONE - map_header_2 CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $0, NONE - map_header_2 CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $0, NONE - map_header_2 CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $0, NONE - map_header_2 CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $0, NONE - map_header_2 CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $0, NONE - map_header_2 CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $0, NONE - map_header_2 CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $0, NONE - map_header_2 CeladonMansion1F, CELADON_MANSION_1F, $0, NONE - map_header_2 CeladonMansion2F, CELADON_MANSION_2F, $0, NONE - map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, NONE - map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, NONE - map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, NONE - map_header_2 CeladonPokeCenter1F, CELADON_POKECENTER_1F, $0, NONE - map_header_2 CeladonPokeCenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, NONE - map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, NONE - map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, NONE - map_header_2 CeladonGym, CELADON_GYM, $0, NONE - map_header_2 CeladonCafe, CELADON_CAFE, $0, NONE - map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, NONE - map_header_2 Route16Gate, ROUTE_16_GATE, $0, NONE - map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, NONE - map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, NONE - map_header_2 ManiasHouse, MANIAS_HOUSE, $0, NONE - map_header_2 CianwoodGym, CIANWOOD_GYM, $0, NONE - map_header_2 CianwoodPokeCenter1F, CIANWOOD_POKECENTER_1F, $0, NONE - map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, NONE - map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, NONE - map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, NONE - map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, NONE - map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, NONE - map_header_2 BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $0, NONE - map_header_2 BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $0, NONE - map_header_2 BattleTowerHallway, BATTLE_TOWER_HALLWAY, $0, NONE - map_header_2 Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $0, NONE - map_header_2 BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $5, NONE - map_header_2 ViridianGym, VIRIDIAN_GYM, $0, NONE - map_header_2 ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $0, NONE - map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, NONE - map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, NONE - map_header_2 ViridianMart, VIRIDIAN_MART, $0, NONE - map_header_2 ViridianPokeCenter1F, VIRIDIAN_POKECENTER_1F, $0, NONE - map_header_2 ViridianPokeCenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, NONE - map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, NONE - map_header_2 Route2Gate, ROUTE_2_GATE, $0, NONE - map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, NONE - map_header_2 ElmsLab, ELMS_LAB, $0, NONE - map_header_2 KrissHouse1F, KRISS_HOUSE_1F, $0, NONE - map_header_2 KrissHouse2F, KRISS_HOUSE_2F, $0, NONE - map_header_2 KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $0, NONE - map_header_2 ElmsHouse, ELMS_HOUSE, $0, NONE - map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, NONE - map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, NONE - map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, NONE - map_header_2 Route2946Gate, ROUTE_29_46_GATE, $0, NONE - map_header_2 FightingDojo, FIGHTING_DOJO, $0, NONE - map_header_2 SaffronGym, SAFFRON_GYM, $0, NONE - map_header_2 SaffronMart, SAFFRON_MART, $0, NONE - map_header_2 SaffronPokeCenter1F, SAFFRON_POKECENTER_1F, $0, NONE - map_header_2 SaffronPokeCenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, NONE - map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, NONE - map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, NONE - map_header_2 SilphCo1F, SILPH_CO_1F, $0, NONE - map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, NONE - map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, NONE - map_header_2 Route5UndergroundEntrance, ROUTE_5_UNDERGROUND_ENTRANCE, $0, NONE - map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, NONE - map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, NONE - map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, NONE - map_header_2 CherrygrovePokeCenter1F, CHERRYGROVE_POKECENTER_1F, $0, NONE - map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, NONE - map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, NONE - map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, NONE - map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, NONE - map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, NONE - map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, NONE + map_header_2 Route23, ROUTE_23, $f, 0 + map_header_2 SproutTower1F, SPROUT_TOWER_1F, $0, 0 + map_header_2 SproutTower2F, SPROUT_TOWER_2F, $0, 0 + map_header_2 SproutTower3F, SPROUT_TOWER_3F, $0, 0 + map_header_2 TinTower1F, TIN_TOWER_1F, $0, 0 + map_header_2 TinTower2F, TIN_TOWER_2F, $0, 0 + map_header_2 TinTower3F, TIN_TOWER_3F, $0, 0 + map_header_2 TinTower4F, TIN_TOWER_4F, $0, 0 + map_header_2 TinTower5F, TIN_TOWER_5F, $0, 0 + map_header_2 TinTower6F, TIN_TOWER_6F, $0, 0 + map_header_2 TinTower7F, TIN_TOWER_7F, $0, 0 + map_header_2 TinTower8F, TIN_TOWER_8F, $0, 0 + map_header_2 TinTower9F, TIN_TOWER_9F, $0, 0 + map_header_2 BurnedTower1F, BURNED_TOWER_1F, $0, 0 + map_header_2 BurnedTowerB1F, BURNED_TOWER_B1F, $9, 0 + map_header_2 NationalPark, NATIONAL_PARK, $0, 0 + map_header_2 NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $0, 0 + map_header_2 RadioTower1F, RADIO_TOWER_1F, $0, 0 + map_header_2 RadioTower2F, RADIO_TOWER_2F, $0, 0 + map_header_2 RadioTower3F, RADIO_TOWER_3F, $0, 0 + map_header_2 RadioTower4F, RADIO_TOWER_4F, $0, 0 + map_header_2 RadioTower5F, RADIO_TOWER_5F, $0, 0 + map_header_2 RuinsofAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, 0 + map_header_2 RuinsofAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, 0 + map_header_2 RuinsofAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, 0 + map_header_2 RuinsofAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, 0 + map_header_2 RuinsofAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, 0 + map_header_2 RuinsofAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, 0 + map_header_2 RuinsofAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, 0 + map_header_2 RuinsofAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, 0 + map_header_2 RuinsofAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, 0 + map_header_2 RuinsofAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, 0 + map_header_2 RuinsofAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, 0 + map_header_2 RuinsofAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, 0 + map_header_2 RuinsofAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, 0 + map_header_2 RuinsofAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, 0 + map_header_2 RuinsofAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, 0 + map_header_2 UnionCave1F, UNION_CAVE_1F, $9, 0 + map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, 0 + map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, 0 + map_header_2 SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $9, 0 + map_header_2 SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $9, 0 + map_header_2 OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $0, 0 + map_header_2 OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $0, 0 + map_header_2 OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $0, 0 + map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0 + map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0 + map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0 + map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, 0 + map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0 + map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0 + map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0 + map_header_2 IlexForest, ILEX_FOREST, $5, 0 + map_header_2 WarehouseEntrance, WAREHOUSE_ENTRANCE, $0, 0 + map_header_2 UndergroundPathSwitchRoomEntrances, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, $0, 0 + map_header_2 GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $0, 0 + map_header_2 UndergroundWarehouse, UNDERGROUND_WAREHOUSE, $0, 0 + map_header_2 MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $9, 0 + map_header_2 MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $9, 0 + map_header_2 MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $9, 0 + map_header_2 MountMortarB1F, MOUNT_MORTAR_B1F, $9, 0 + map_header_2 IcePath1F, ICE_PATH_1F, $9, 0 + map_header_2 IcePathB1F, ICE_PATH_B1F, $19, 0 + map_header_2 IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0 + map_header_2 IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0 + map_header_2 IcePathB3F, ICE_PATH_B3F, $19, 0 + map_header_2 WhirlIslandNW, WHIRL_ISLAND_NW, $9, 0 + map_header_2 WhirlIslandNE, WHIRL_ISLAND_NE, $9, 0 + map_header_2 WhirlIslandSW, WHIRL_ISLAND_SW, $9, 0 + map_header_2 WhirlIslandCave, WHIRL_ISLAND_CAVE, $9, 0 + map_header_2 WhirlIslandSE, WHIRL_ISLAND_SE, $f, 0 + map_header_2 WhirlIslandB1F, WHIRL_ISLAND_B1F, $9, 0 + map_header_2 WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0 + map_header_2 WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $f, 0 + map_header_2 SilverCaveRoom1, SILVER_CAVE_ROOM_1, $9, 0 + map_header_2 SilverCaveRoom2, SILVER_CAVE_ROOM_2, $9, 0 + map_header_2 SilverCaveRoom3, SILVER_CAVE_ROOM_3, $9, 0 + map_header_2 SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $9, 0 + map_header_2 DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $9, 0 + map_header_2 DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $9, 0 + map_header_2 DragonsDen1F, DRAGONS_DEN_1F, $9, 0 + map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0 + map_header_2 DragonShrine, DRAGON_SHRINE, $0, 0 + map_header_2 TohjoFalls, TOHJO_FALLS, $9, 0 + map_header_2 OlivinePokeCenter1F, OLIVINE_POKECENTER_1F, $0, 0 + map_header_2 OlivineGym, OLIVINE_GYM, $0, 0 + map_header_2 OlivineVoltorbHouse, OLIVINE_VOLTORB_HOUSE, $0, 0 + map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, 0 + map_header_2 OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $0, 0 + map_header_2 OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $0, 0 + map_header_2 OlivineCafe, OLIVINE_CAFE, $0, 0 + map_header_2 OlivineMart, OLIVINE_MART, $0, 0 + map_header_2 Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $0, 0 + map_header_2 Route39Barn, ROUTE_39_BARN, $0, 0 + map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, 0 + map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, 0 + map_header_2 MahoganyGym, MAHOGANY_GYM, $0, 0 + map_header_2 MahoganyPokeCenter1F, MAHOGANY_POKECENTER_1F, $0, 0 + map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, 0 + map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, 0 + map_header_2 MountMoon, MOUNT_MOON, $9, 0 + map_header_2 Underground, UNDERGROUND, $0, 0 + map_header_2 RockTunnel1F, ROCK_TUNNEL_1F, $9, 0 + map_header_2 RockTunnelB1F, ROCK_TUNNEL_B1F, $9, 0 + map_header_2 SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $0, 0 + map_header_2 SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 + map_header_2 VictoryRoad, VICTORY_ROAD, $1d, 0 + map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, 0 + map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, 0 + map_header_2 EcruteakPokeCenter1F, ECRUTEAK_POKECENTER_1F, $0, 0 + map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, 0 + map_header_2 DanceTheatre, DANCE_THEATRE, $0, 0 + map_header_2 EcruteakMart, ECRUTEAK_MART, $0, 0 + map_header_2 EcruteakGym, ECRUTEAK_GYM, $0, 0 + map_header_2 EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $0, 0 + map_header_2 BlackthornGym1F, BLACKTHORN_GYM_1F, $0, 0 + map_header_2 BlackthornGym2F, BLACKTHORN_GYM_2F, $0, 0 + map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, 0 + map_header_2 BlackthornDodrioTradeHouse, BLACKTHORN_DODRIO_TRADE_HOUSE, $0, 0 + map_header_2 BlackthornMart, BLACKTHORN_MART, $0, 0 + map_header_2 BlackthornPokeCenter1F, BLACKTHORN_POKECENTER_1F, $0, 0 + map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, 0 + map_header_2 CinnabarPokeCenter1F, CINNABAR_POKECENTER_1F, $0, 0 + map_header_2 CinnabarPokeCenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0 + map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, 0 + map_header_2 SeafoamGym, SEAFOAM_GYM, $9, 0 + map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, 0 + map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, 0 + map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, 0 + map_header_2 CeruleanPokeCenter1F, CERULEAN_POKECENTER_1F, $0, 0 + map_header_2 CeruleanPokeCenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0 + map_header_2 CeruleanGym, CERULEAN_GYM, $0, 0 + map_header_2 CeruleanMart, CERULEAN_MART, $0, 0 + map_header_2 Route10PokeCenter1F, ROUTE_10_POKECENTER_1F, $0, 0 + map_header_2 Route10PokeCenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0 + map_header_2 PowerPlant, POWER_PLANT, $0, 0 + map_header_2 BillsHouse, BILLS_HOUSE, $0, 0 + map_header_2 AzaleaPokeCenter1F, AZALEA_POKECENTER_1F, $0, 0 + map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, 0 + map_header_2 AzaleaMart, AZALEA_MART, $0, 0 + map_header_2 KurtsHouse, KURTS_HOUSE, $0, 0 + map_header_2 AzaleaGym, AZALEA_GYM, $0, 0 + map_header_2 LakeofRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, 0 + map_header_2 LakeofRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, 0 + map_header_2 Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $0, 0 + map_header_2 Route43Gate, ROUTE_43_GATE, $0, 0 + map_header_2 VioletMart, VIOLET_MART, $0, 0 + map_header_2 VioletGym, VIOLET_GYM, $0, 0 + map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0 + map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0 + map_header_2 VioletPokeCenter1F, VIOLET_POKECENTER_1F, $0, 0 + map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, 0 + map_header_2 Route32RuinsofAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 + map_header_2 Route32PokeCenter1F, ROUTE_32_POKECENTER_1F, $0, 0 + map_header_2 Route35Goldenrodgate, ROUTE_35_GOLDENROD_GATE, $0, 0 + map_header_2 Route35NationalParkgate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0 + map_header_2 Route36RuinsofAlphgate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0 + map_header_2 Route36NationalParkgate, ROUTE_36_NATIONAL_PARK_GATE, $0, 0 + map_header_2 GoldenrodGym, GOLDENROD_GYM, $0, 0 + map_header_2 GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $0, 0 + map_header_2 GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $0, 0 + map_header_2 GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $0, 0 + map_header_2 GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $0, 0 + map_header_2 GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $0, 0 + map_header_2 GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $0, 0 + map_header_2 GoldenrodNameRatersHouse, GOLDENROD_NAME_RATERS_HOUSE, $0, 0 + map_header_2 GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $0, 0 + map_header_2 GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $0, 0 + map_header_2 GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $0, 0 + map_header_2 GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $0, 0 + map_header_2 GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $0, 0 + map_header_2 GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $0, 0 + map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, 0 + map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 + map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, 0 + map_header_2 GoldenrodPokeCenter1F, GOLDENROD_POKECENTER_1F, $0, 0 + map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, 0 + map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, 0 + map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, 0 + map_header_2 DayCare, DAYCARE, $0, 0 + map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, 0 + map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, 0 + map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0 + map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, 0 + map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, 0 + map_header_2 VermilionMart, VERMILION_MART, $0, 0 + map_header_2 VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $0, 0 + map_header_2 VermilionGym, VERMILION_GYM, $0, 0 + map_header_2 Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $0, 0 + map_header_2 Route6UndergroundEntrance, ROUTE_6_UNDERGROUND_ENTRANCE, $0, 0 + map_header_2 RedsHouse1F, REDS_HOUSE_1F, $0, 0 + map_header_2 RedsHouse2F, REDS_HOUSE_2F, $0, 0 + map_header_2 BluesHouse, BLUES_HOUSE, $0, 0 + map_header_2 OaksLab, OAKS_LAB, $0, 0 + map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, 0 + map_header_2 PewterGym, PEWTER_GYM, $0, 0 + map_header_2 PewterMart, PEWTER_MART, $0, 0 + map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, 0 + map_header_2 PewterPokeCEnter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 + map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0 + map_header_2 OlivinePort, OLIVINE_PORT, $a, 0 + map_header_2 VermilionPort, VERMILION_PORT, $a, 0 + map_header_2 FastShip1F, FAST_SHIP_1F, $0, 0 + map_header_2 FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $0, 0 + map_header_2 FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $0, 0 + map_header_2 FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $0, 0 + map_header_2 FastShipB1F, FAST_SHIP_B1F, $0, 0 + map_header_2 OlivinePortPassage, OLIVINE_PORT_PASSAGE, $0, 0 + map_header_2 VermilionPortPassage, VERMILION_PORT_PASSAGE, $0, 0 + map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0 + map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, 0 + map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, 0 + map_header_2 IndigoPlateauPokeCenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0 + map_header_2 WillsRoom, WILLS_ROOM, $0, 0 + map_header_2 KogasRoom, KOGAS_ROOM, $0, 0 + map_header_2 BrunosRoom, BRUNOS_ROOM, $0, 0 + map_header_2 KarensRoom, KARENS_ROOM, $0, 0 + map_header_2 LancesRoom, LANCES_ROOM, $0, 0 + map_header_2 HallOfFame, HALL_OF_FAME, $0, 0 + map_header_2 FuchsiaMart, FUCHSIA_MART, $0, 0 + map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, 0 + map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, 0 + map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, 0 + map_header_2 FuchsiaPokeCenter1F, FUCHSIA_POKECENTER_1F, $0, 0 + map_header_2 FuchsiaPokeCenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0 + map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, 0 + map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, 0 + map_header_2 LavenderPokeCenter1F, LAVENDER_POKECENTER_1F, $0, 0 + map_header_2 LavenderPokeCenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0 + map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0 + map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, 0 + map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0 + map_header_2 LavenderMart, LAVENDER_MART, $0, 0 + map_header_2 SoulHouse, SOUL_HOUSE, $0, 0 + map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, 0 + map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, 0 + map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, 0 + map_header_2 SilverCavePokeCenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0 + map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, 0 + map_header_2 PokeCenter2F, POKECENTER_2F, $0, 0 + map_header_2 TradeCenter, TRADE_CENTER, $0, 0 + map_header_2 Colosseum, COLOSSEUM, $0, 0 + map_header_2 TimeCapsule, TIME_CAPSULE, $0, 0 + map_header_2 MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $0, 0 + map_header_2 MobileBattleRoom, MOBILE_BATTLE_ROOM, $0, 0 + map_header_2 CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $0, 0 + map_header_2 CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $0, 0 + map_header_2 CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $0, 0 + map_header_2 CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $0, 0 + map_header_2 CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $0, 0 + map_header_2 CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $0, 0 + map_header_2 CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $0, 0 + map_header_2 CeladonMansion1F, CELADON_MANSION_1F, $0, 0 + map_header_2 CeladonMansion2F, CELADON_MANSION_2F, $0, 0 + map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, 0 + map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, 0 + map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, 0 + map_header_2 CeladonPokeCenter1F, CELADON_POKECENTER_1F, $0, 0 + map_header_2 CeladonPokeCenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0 + map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, 0 + map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, 0 + map_header_2 CeladonGym, CELADON_GYM, $0, 0 + map_header_2 CeladonCafe, CELADON_CAFE, $0, 0 + map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, 0 + map_header_2 Route16Gate, ROUTE_16_GATE, $0, 0 + map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, 0 + map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, 0 + map_header_2 ManiasHouse, MANIAS_HOUSE, $0, 0 + map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0 + map_header_2 CianwoodPokeCenter1F, CIANWOOD_POKECENTER_1F, $0, 0 + map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0 + map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, 0 + map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0 + map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, 0 + map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, 0 + map_header_2 BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $0, 0 + map_header_2 BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $0, 0 + map_header_2 BattleTowerHallway, BATTLE_TOWER_HALLWAY, $0, 0 + map_header_2 Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $0, 0 + map_header_2 BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $5, 0 + map_header_2 ViridianGym, VIRIDIAN_GYM, $0, 0 + map_header_2 ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $0, 0 + map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, 0 + map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, 0 + map_header_2 ViridianMart, VIRIDIAN_MART, $0, 0 + map_header_2 ViridianPokeCenter1F, VIRIDIAN_POKECENTER_1F, $0, 0 + map_header_2 ViridianPokeCenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0 + map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, 0 + map_header_2 Route2Gate, ROUTE_2_GATE, $0, 0 + map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, 0 + map_header_2 ElmsLab, ELMS_LAB, $0, 0 + map_header_2 KrissHouse1F, KRISS_HOUSE_1F, $0, 0 + map_header_2 KrissHouse2F, KRISS_HOUSE_2F, $0, 0 + map_header_2 KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $0, 0 + map_header_2 ElmsHouse, ELMS_HOUSE, $0, 0 + map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, 0 + map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, 0 + map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, 0 + map_header_2 Route2946Gate, ROUTE_29_46_GATE, $0, 0 + map_header_2 FightingDojo, FIGHTING_DOJO, $0, 0 + map_header_2 SaffronGym, SAFFRON_GYM, $0, 0 + map_header_2 SaffronMart, SAFFRON_MART, $0, 0 + map_header_2 SaffronPokeCenter1F, SAFFRON_POKECENTER_1F, $0, 0 + map_header_2 SaffronPokeCenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0 + map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, 0 + map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, 0 + map_header_2 SilphCo1F, SILPH_CO_1F, $0, 0 + map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0 + map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0 + map_header_2 Route5UndergroundEntrance, ROUTE_5_UNDERGROUND_ENTRANCE, $0, 0 + map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, 0 + map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0 + map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0 + map_header_2 CherrygrovePokeCenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0 + map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, 0 + map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, 0 + map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, 0 + map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, 0 + map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, 0 + map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, 0 diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm index d8e60e6a6..af4e834a3 100644 --- a/misc/mobile_22_2.asm +++ b/misc/mobile_22_2.asm @@ -939,7 +939,7 @@ Function8b88c: ; 8b88c call Function8931b call Function8932d jr c, .asm_8b8a3 - ld hl, NONE + ld hl, 0 add hl, bc ld d, h ld e, l diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index ed0dc48d7..821a8eaf8 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -246,17 +246,17 @@ Function10016f: ; 10016f .asm_1001af ld a, $d7 - ld de, NONE + ld de, 0 jr .asm_1001d7 .asm_1001b6 ld a, $d5 - ld de, NONE + ld de, 0 jr .asm_1001d7 .asm_1001bd ld a, $d6 - ld de, NONE + ld de, 0 jr .asm_1001d7 .asm_1001c4 @@ -271,7 +271,7 @@ Function10016f: ; 10016f .asm_1001d2 ld a, $d0 - ld de, NONE + ld de, 0 .asm_1001d7 ld [wc300], a @@ -645,7 +645,7 @@ Function100406: ; 100406 Function10043a: ; 10043a push hl push bc - ld de, NONE + ld de, 0 .asm_10043f ld a, [hli] add e @@ -3637,7 +3637,7 @@ Function10177b: ; 10177b ld c, a ld b, $0 ld a, [wcd3a] - ld hl, NONE + ld hl, 0 call AddNTimes ld e, l ld d, h @@ -6667,7 +6667,7 @@ Function102cee: ; 102cee sub c ret z ld bc, $002f - ld hl, NONE + ld hl, 0 call AddNTimes push hl ld a, [wJumptableIndex] @@ -7474,7 +7474,7 @@ Function10343c: ; 10343c call Function1034e0 .asm_10345f - ld bc, NONE + ld bc, 0 call Function10350f ld bc, $0001 call Function103487 diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index cd8406cbd..1a891ce6c 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -15521,7 +15521,7 @@ Function11b3d9: ; 11b3d9 add [hl] cp e jr z, .asm_11b40d - ld hl, NONE + ld hl, 0 ld bc, $0070 call AddNTimes ld e, l diff --git a/trainers/attributes.asm b/trainers/attributes.asm index 40a07605c..c8cdcc100 100644 --- a/trainers/attributes.asm +++ b/trainers/attributes.asm @@ -1,43 +1,43 @@ TrainerClassAttributes: ; 3959c ; Falkner - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Whitney - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Bugsy - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Morty - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Pryce - db HYPER_POTION, NONE ; items + db HYPER_POTION, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Jasmine - db HYPER_POTION, NONE ; items + db HYPER_POTION, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Chuck - db FULL_HEAL, NONE ; items + db FULL_HEAL, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES @@ -49,31 +49,31 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; Rival1 - db NONE, NONE ; items + db 0, 0 ; items db 15 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Pokemon Prof - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_AGGRESSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Will - db MAX_POTION, NONE ; items + db MAX_POTION, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Cal - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Bruno - db MAX_POTION, NONE ; items + db MAX_POTION, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES @@ -97,175 +97,175 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; Brock - db HYPER_POTION, NONE ; items + db HYPER_POTION, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Misty - db FULL_HEAL, NONE ; items + db FULL_HEAL, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Lt Surge - db HYPER_POTION, NONE ; items + db HYPER_POTION, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Scientist - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Erika - db HYPER_POTION, NONE ; items + db HYPER_POTION, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Youngster - db NONE, NONE ; items + db 0, 0 ; items db 4 ; base reward dw AI_BASIC + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Schoolboy - db NONE, NONE ; items + db 0, 0 ; items db 8 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_OFTEN ; Bird Keeper - db NONE, NONE ; items + db 0, 0 ; items db 6 ; base reward dw AI_BASIC + AI_TYPES + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Lass - db NONE, NONE ; items + db 0, 0 ; items db 6 ; base reward dw AI_BASIC + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_OFTEN ; Janine - db DIRE_HIT, NONE ; items + db DIRE_HIT, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Cooltrainerm - db NONE, NONE ; items + db 0, 0 ; items db 12 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Cooltrainerf - db NONE, NONE ; items + db 0, 0 ; items db 12 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Beauty - db NONE, NONE ; items + db 0, 0 ; items db 22 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Pokemaniac - db NONE, NONE ; items + db 0, 0 ; items db 15 ; base reward dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_AGGRESSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Gruntm - db NONE, NONE ; items + db 0, 0 ; items db 10 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Gentleman - db NONE, NONE ; items + db 0, 0 ; items db 18 ; base reward dw AI_BASIC + AI_SETUP + AI_AGGRESSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Skier - db NONE, NONE ; items + db 0, 0 ; items db 18 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Teacher - db NONE, NONE ; items + db 0, 0 ; items db 18 ; base reward dw AI_BASIC + AI_OPPORTUNIST + AI_AGGRESSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Sabrina - db HYPER_POTION, NONE ; items + db HYPER_POTION, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Bug Catcher - db NONE, NONE ; items + db 0, 0 ; items db 4 ; base reward dw AI_BASIC + AI_SETUP + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Fisher - db NONE, NONE ; items + db 0, 0 ; items db 10 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_OFTEN ; Swimmerm - db NONE, NONE ; items + db 0, 0 ; items db 2 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OFFENSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Swimmerf - db NONE, NONE ; items + db 0, 0 ; items db 5 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Sailor - db NONE, NONE ; items + db 0, 0 ; items db 10 ; base reward dw AI_BASIC + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Super Nerd - db NONE, NONE ; items + db 0, 0 ; items db 8 ; base reward dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Rival2 - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Guitarist - db NONE, NONE ; items + db 0, 0 ; items db 8 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Hiker - db NONE, NONE ; items + db 0, 0 ; items db 8 ; base reward dw AI_BASIC + AI_OFFENSIVE + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Biker - db NONE, NONE ; items + db 0, 0 ; items db 8 ; base reward dw AI_BASIC + AI_TYPES + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES @@ -277,97 +277,97 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; Burglar - db NONE, NONE ; items + db 0, 0 ; items db 22 ; base reward dw AI_BASIC + AI_OFFENSIVE + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Firebreather - db NONE, NONE ; items + db 0, 0 ; items db 12 ; base reward dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Juggler - db NONE, NONE ; items + db 0, 0 ; items db 10 ; base reward dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Blackbelt T - db NONE, NONE ; items + db 0, 0 ; items db 6 ; base reward dw AI_BASIC + AI_OFFENSIVE + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Executivem - db NONE, NONE ; items + db 0, 0 ; items db 18 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Psychic T - db NONE, NONE ; items + db 0, 0 ; items db 8 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Picnicker - db NONE, NONE ; items + db 0, 0 ; items db 5 ; base reward dw AI_BASIC + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Camper - db NONE, NONE ; items + db 0, 0 ; items db 5 ; base reward dw AI_BASIC + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Executivef - db NONE, NONE ; items + db 0, 0 ; items db 18 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Sage - db NONE, NONE ; items + db 0, 0 ; items db 8 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Medium - db NONE, NONE ; items + db 0, 0 ; items db 10 ; base reward dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Boarder - db NONE, NONE ; items + db 0, 0 ; items db 18 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Pokefanm - db NONE, NONE ; items + db 0, 0 ; items db 20 ; base reward dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Kimono Girl - db NONE, NONE ; items + db 0, 0 ; items db 18 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Twins - db NONE, NONE ; items + db 0, 0 ; items db 5 ; base reward dw NO_AI dw CONTEXT_USE + SWITCH_OFTEN ; Pokefanf - db NONE, NONE ; items + db 0, 0 ; items db 20 ; base reward dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES @@ -385,19 +385,19 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; Officer - db NONE, NONE ; items + db 0, 0 ; items db 10 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS dw CONTEXT_USE + SWITCH_SOMETIMES ; Gruntf - db NONE, NONE ; items + db 0, 0 ; items db 10 ; base reward dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES ; Mysticalman - db NONE, NONE ; items + db 0, 0 ; items db 25 ; base reward dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY dw CONTEXT_USE + SWITCH_SOMETIMES diff --git a/trainers/trainers.asm b/trainers/trainers.asm index d5e3505e5..2b4a68475 100644 --- a/trainers/trainers.asm +++ b/trainers/trainers.asm @@ -26,14 +26,14 @@ FalknerGroup: db 7, PIDGEY db TACKLE db MUD_SLAP - db NONE - db NONE + db 0 + db 0 db 9, PIDGEOTTO db TACKLE db MUD_SLAP db GUST - db NONE + db 0 db $ff ; end @@ -83,19 +83,19 @@ BugsyGroup: db TACKLE db STRING_SHOT db HARDEN - db NONE + db 0 db 14, KAKUNA db POISON_STING db STRING_SHOT db HARDEN - db NONE + db 0 db 16, SCYTHER db QUICK_ATTACK db LEER db FURY_CUTTER - db NONE + db 0 db $ff ; end @@ -3414,7 +3414,7 @@ PokemaniacGroup: db LICK db SUPERSONIC db CUT - db NONE + db 0 db $ff ; end @@ -6935,7 +6935,7 @@ PsychicGroup: db HYPNOSIS db DISABLE db DREAM_EATER - db NONE + db 0 db $ff ; end @@ -6951,7 +6951,7 @@ PsychicGroup: db TACKLE db GROWL db WATER_GUN - db NONE + db 0 db 20, SLOWPOKE db CURSE @@ -6972,20 +6972,20 @@ PsychicGroup: db 13, ABRA db TELEPORT db FLASH - db NONE - db NONE + db 0 + db 0 db 13, ABRA db TELEPORT db FLASH - db NONE - db NONE + db 0 + db 0 db 15, KADABRA db TELEPORT db KINESIS db CONFUSION - db NONE + db 0 db $ff ; end @@ -7804,7 +7804,7 @@ ExecutiveFGroup: db PECK db PURSUIT db HAZE - db NONE + db 0 db $ff ; end |