From 179a6407e7be771593adfc2f476d3a8f0ca4375e Mon Sep 17 00:00:00 2001 From: evanonline <102846206+evanonline@users.noreply.github.com> Date: Tue, 2 May 2023 12:26:18 -0400 Subject: [PATCH] music, celadon events, cleanup gotta tackle some new houses, the pokemart scripts, and the game corner, and then i'm moving onto cerulean! --- MPlayDef.s | 466 ------ README.md | 10 - asm_defines.s | 3 +- assembly/overworld_scripts/celadon_city.s | 297 ++-- .../overworld_scripts/celadon_deptstore.s | 1305 ++++++++++++++++- assembly/overworld_scripts/route_16.s | 89 ++ eventscripts | 93 +- graphics/trainer_sprites/g002Whisk.png | Bin 9928 -> 1079 bytes graphics/trainer_sprites/g069JessieJames.png | Bin 17518 -> 1425 bytes include/constants/flags.h | 8 +- include/constants/items.h | 2 +- include/constants/opponents.h | 19 +- include/constants/songs.h | 13 +- include/constants/vars.h | 6 +- scripts/string.py | 102 +- src/Tables/music_tables.c | 4 + src/Tables/trainer_tables.c | 339 ++++- src/Tables/wild_encounter_tables.c | 136 +- strings/scripts/celadoncity.string | 43 +- strings/scripts/ceruleancity.string | 9 + strings/scripts/deptstore.string | 300 +++- strings/scripts/fuchsiacity.string | 20 + strings/scripts/mtmoon.string | 2 + strings/scripts/openingchoices.string | 36 +- strings/scripts/route11.string | 4 +- strings/scripts/route16.string | 35 +- strings/scripts/route6.string | 8 +- strings/scripts/vermilioncity.string | 44 +- strings/scripts/vermilionport.string | 4 +- test.cheats | 1 - 30 files changed, 2595 insertions(+), 803 deletions(-) delete mode 100644 MPlayDef.s create mode 100644 strings/scripts/fuchsiacity.string create mode 100644 strings/scripts/mtmoon.string diff --git a/MPlayDef.s b/MPlayDef.s deleted file mode 100644 index 21168a2a7..000000000 --- a/MPlayDef.s +++ /dev/null @@ -1,466 +0,0 @@ -@*** -@ -@ MusicPlayDef.s (MPlayDef.s) ver1.05 -@ -@ Copyright (C) 1999-2001 NINTENDO Co.,Ltd. -@**************************************************************@ - -@*** -@ MML (without running status) -@******************************************************@ - - .equ W00, 0x80 @ WAIT - .equ W01, W00+1 @ - .equ W02, W00+2 @ - .equ W03, W00+3 @ - .equ W04, W00+4 @ - .equ W05, W00+5 @ - .equ W06, W00+6 @ - .equ W07, W00+7 @ - .equ W08, W00+8 @ - .equ W09, W00+9 @ - .equ W10, W00+10 @ - .equ W11, W00+11 @ - .equ W12, W00+12 @ - .equ W13, W00+13 @ - .equ W14, W00+14 @ - .equ W15, W00+15 @ - .equ W16, W00+16 @ - .equ W17, W00+17 @ - .equ W18, W00+18 @ - .equ W19, W00+19 @ - .equ W20, W00+20 @ - .equ W21, W00+21 @ - .equ W22, W00+22 @ - .equ W23, W00+23 @ - .equ W24, W00+24 @ - .equ W28, W00+25 @ - .equ W30, W00+26 @ - .equ W32, W00+27 @ - .equ W36, W00+28 @ - .equ W40, W00+29 @ - .equ W42, W00+30 @ - .equ W44, W00+31 @ - .equ W48, W00+32 @ - .equ W52, W00+33 @ - .equ W54, W00+34 @ - .equ W56, W00+35 @ - .equ W60, W00+36 @ - .equ W64, W00+37 @ - .equ W66, W00+38 @ - .equ W68, W00+39 @ - .equ W72, W00+40 @ - .equ W76, W00+41 @ - .equ W78, W00+42 @ - .equ W80, W00+43 @ - .equ W84, W00+44 @ - .equ W88, W00+45 @ - .equ W90, W00+46 @ - .equ W92, W00+47 @ - .equ W96, W00+48 @ - - .equ FINE, 0xb1 @ fine - .equ GOTO, 0xb2 @ goto - .equ PATT, 0xb3 @ pattern play - .equ PEND, 0xb4 @ pattern end - .equ REPT, 0xb5 @ repeat - .equ MEMACC, 0xb9 @ memacc op adr dat ***lib - .equ PRIO, 0xba @ priority - .equ TEMPO, 0xbb @ tempo (BPM/2) - .equ KEYSH, 0xbc @ key shift - -@*** -@ MML (within running status) -@******************************************************@ - - .equ VOICE, 0xbd @ voice # - .equ VOL, 0xbe @ volume - .equ PAN, 0xbf @ panpot (c_v+??) - .equ BEND, 0xc0 @ pitch bend (c_v+??) - .equ BENDR, 0xc1 @ bend range - .equ LFOS, 0xc2 @ LFO speed - .equ LFODL, 0xc3 @ LFO delay - .equ MOD, 0xc4 @ modulation depth - .equ MODT, 0xc5 @ modulation type - .equ TUNE, 0xc8 @ micro tuning (c_v+??) - - .equ XCMD, 0xcd @ extend command ***lib - .equ xIECV, 0x08 @ imi.echo vol ***lib - .equ xIECL, 0x09 @ imi.echo len ***lib - - .equ EOT, 0xce @ End of Tie - .equ TIE, 0xcf @ - .equ N01, TIE+1 @ NOTE - .equ N02, N01+1 @ - .equ N03, N01+2 @ - .equ N04, N01+3 @ - .equ N05, N01+4 @ - .equ N06, N01+5 @ - .equ N07, N01+6 @ - .equ N08, N01+7 @ - .equ N09, N01+8 @ - .equ N10, N01+9 @ - .equ N11, N01+10 @ - .equ N12, N01+11 @ - .equ N13, N01+12 @ - .equ N14, N01+13 @ - .equ N15, N01+14 @ - .equ N16, N01+15 @ - .equ N17, N01+16 @ - .equ N18, N01+17 @ - .equ N19, N01+18 @ - .equ N20, N01+19 @ - .equ N21, N01+20 @ - .equ N22, N01+21 @ - .equ N23, N01+22 @ - .equ N24, N01+23 @ - .equ N28, N01+24 @ - .equ N30, N01+25 @ - .equ N32, N01+26 @ - .equ N36, N01+27 @ - .equ N40, N01+28 @ - .equ N42, N01+29 @ - .equ N44, N01+30 @ - .equ N48, N01+31 @ - .equ N52, N01+32 @ - .equ N54, N01+33 @ - .equ N56, N01+34 @ - .equ N60, N01+35 @ - .equ N64, N01+36 @ - .equ N66, N01+37 @ - .equ N68, N01+38 @ - .equ N72, N01+39 @ - .equ N76, N01+40 @ - .equ N78, N01+41 @ - .equ N80, N01+42 @ - .equ N84, N01+43 @ - .equ N88, N01+44 @ - .equ N90, N01+45 @ - .equ N92, N01+46 @ - .equ N96, N01+47 @ - -@*** -@ Max value of operators -@******************************************************@ - - .equ mxv, 0x7F @ - -@*** -@ center value of PAN, BEND, TUNE -@******************************************************@ - - .equ c_v, 0x40 @ -64 ~ +63 - -@*** -@ parameter of N??, TIE, EOT -@******************************************************@ - - .equ CnM2, 0 @ - .equ CsM2, 1 @ - .equ DnM2, 2 @ - .equ DsM2, 3 @ - .equ EnM2, 4 @ - .equ FnM2, 5 @ - .equ FsM2, 6 @ - .equ GnM2, 7 @ - .equ GsM2, 8 @ - .equ AnM2, 9 @ - .equ AsM2, 10 @ - .equ BnM2, 11 @ - .equ CnM1, 12 @ - .equ CsM1, 13 @ - .equ DnM1, 14 @ - .equ DsM1, 15 @ - .equ EnM1, 16 @ - .equ FnM1, 17 @ - .equ FsM1, 18 @ - .equ GnM1, 19 @ - .equ GsM1, 20 @ - .equ AnM1, 21 @ - .equ AsM1, 22 @ - .equ BnM1, 23 @ - .equ Cn0, 24 @ - .equ Cs0, 25 @ - .equ Dn0, 26 @ - .equ Ds0, 27 @ - .equ En0, 28 @ - .equ Fn0, 29 @ - .equ Fs0, 30 @ - .equ Gn0, 31 @ - .equ Gs0, 32 @ - .equ An0, 33 @ - .equ As0, 34 @ - .equ Bn0, 35 @ - .equ Cn1, 36 @ - .equ Cs1, 37 @ - .equ Dn1, 38 @ - .equ Ds1, 39 @ - .equ En1, 40 @ - .equ Fn1, 41 @ - .equ Fs1, 42 @ - .equ Gn1, 43 @ - .equ Gs1, 44 @ - .equ An1, 45 @ - .equ As1, 46 @ - .equ Bn1, 47 @ - .equ Cn2, 48 @ - .equ Cs2, 49 @ - .equ Dn2, 50 @ - .equ Ds2, 51 @ - .equ En2, 52 @ - .equ Fn2, 53 @ - .equ Fs2, 54 @ - .equ Gn2, 55 @ - .equ Gs2, 56 @ - .equ An2, 57 @ - .equ As2, 58 @ - .equ Bn2, 59 @ - .equ Cn3, 60 @ - .equ Cs3, 61 @ - .equ Dn3, 62 @ - .equ Ds3, 63 @ - .equ En3, 64 @ - .equ Fn3, 65 @ - .equ Fs3, 66 @ - .equ Gn3, 67 @ - .equ Gs3, 68 @ - .equ An3, 69 @ 440Hz - .equ As3, 70 @ - .equ Bn3, 71 @ - .equ Cn4, 72 @ - .equ Cs4, 73 @ - .equ Dn4, 74 @ - .equ Ds4, 75 @ - .equ En4, 76 @ - .equ Fn4, 77 @ - .equ Fs4, 78 @ - .equ Gn4, 79 @ - .equ Gs4, 80 @ - .equ An4, 81 @ - .equ As4, 82 @ - .equ Bn4, 83 @ - .equ Cn5, 84 @ - .equ Cs5, 85 @ - .equ Dn5, 86 @ - .equ Ds5, 87 @ - .equ En5, 88 @ - .equ Fn5, 89 @ - .equ Fs5, 90 @ - .equ Gn5, 91 @ - .equ Gs5, 92 @ - .equ An5, 93 @ - .equ As5, 94 @ - .equ Bn5, 95 @ - .equ Cn6, 96 @ - .equ Cs6, 97 @ - .equ Dn6, 98 @ - .equ Ds6, 99 @ - .equ En6, 100 @ - .equ Fn6, 101 @ - .equ Fs6, 102 @ - .equ Gn6, 103 @ - .equ Gs6, 104 @ - .equ An6, 105 @ - .equ As6, 106 @ - .equ Bn6, 107 @ - .equ Cn7, 108 @ - .equ Cs7, 109 @ - .equ Dn7, 110 @ - .equ Ds7, 111 @ - .equ En7, 112 @ - .equ Fn7, 113 @ - .equ Fs7, 114 @ - .equ Gn7, 115 @ - .equ Gs7, 116 @ - .equ An7, 117 @ - .equ As7, 118 @ - .equ Bn7, 119 @ - .equ Cn8, 120 @ - .equ Cs8, 121 @ - .equ Dn8, 122 @ - .equ Ds8, 123 @ - .equ En8, 124 @ - .equ Fn8, 125 @ - .equ Fs8, 126 @ - .equ Gn8, 127 @ - -@*** -@ parameter of velocity -@******************************************************@ - - .equ v000, 0 @ - .equ v001, 1 @ - .equ v002, 2 @ - .equ v003, 3 @ - .equ v004, 4 @ - .equ v005, 5 @ - .equ v006, 6 @ - .equ v007, 7 @ - .equ v008, 8 @ - .equ v009, 9 @ - .equ v010, 10 @ - .equ v011, 11 @ - .equ v012, 12 @ - .equ v013, 13 @ - .equ v014, 14 @ - .equ v015, 15 @ - .equ v016, 16 @ - .equ v017, 17 @ - .equ v018, 18 @ - .equ v019, 19 @ - .equ v020, 20 @ - .equ v021, 21 @ - .equ v022, 22 @ - .equ v023, 23 @ - .equ v024, 24 @ - .equ v025, 25 @ - .equ v026, 26 @ - .equ v027, 27 @ - .equ v028, 28 @ - .equ v029, 29 @ - .equ v030, 30 @ - .equ v031, 31 @ - .equ v032, 32 @ - .equ v033, 33 @ - .equ v034, 34 @ - .equ v035, 35 @ - .equ v036, 36 @ - .equ v037, 37 @ - .equ v038, 38 @ - .equ v039, 39 @ - .equ v040, 40 @ - .equ v041, 41 @ - .equ v042, 42 @ - .equ v043, 43 @ - .equ v044, 44 @ - .equ v045, 45 @ - .equ v046, 46 @ - .equ v047, 47 @ - .equ v048, 48 @ - .equ v049, 49 @ - .equ v050, 50 @ - .equ v051, 51 @ - .equ v052, 52 @ - .equ v053, 53 @ - .equ v054, 54 @ - .equ v055, 55 @ - .equ v056, 56 @ - .equ v057, 57 @ - .equ v058, 58 @ - .equ v059, 59 @ - .equ v060, 60 @ - .equ v061, 61 @ - .equ v062, 62 @ - .equ v063, 63 @ - .equ v064, 64 @ - .equ v065, 65 @ - .equ v066, 66 @ - .equ v067, 67 @ - .equ v068, 68 @ - .equ v069, 79 @ - .equ v070, 70 @ - .equ v071, 71 @ - .equ v072, 72 @ - .equ v073, 73 @ - .equ v074, 74 @ - .equ v075, 75 @ - .equ v076, 76 @ - .equ v077, 77 @ - .equ v078, 78 @ - .equ v079, 79 @ - .equ v080, 80 @ - .equ v081, 81 @ - .equ v082, 82 @ - .equ v083, 83 @ - .equ v084, 84 @ - .equ v085, 85 @ - .equ v086, 86 @ - .equ v087, 87 @ - .equ v088, 88 @ - .equ v089, 89 @ - .equ v090, 90 @ - .equ v091, 91 @ - .equ v092, 92 @ - .equ v093, 93 @ - .equ v094, 94 @ - .equ v095, 95 @ - .equ v096, 96 @ - .equ v097, 97 @ - .equ v098, 98 @ - .equ v099, 99 @ - .equ v100, 100 @ - .equ v101, 101 @ - .equ v102, 102 @ - .equ v103, 103 @ - .equ v104, 104 @ - .equ v105, 105 @ - .equ v106, 106 @ - .equ v107, 107 @ - .equ v108, 108 @ - .equ v109, 109 @ - .equ v110, 110 @ - .equ v111, 111 @ - .equ v112, 112 @ - .equ v113, 113 @ - .equ v114, 114 @ - .equ v115, 115 @ - .equ v116, 116 @ - .equ v117, 117 @ - .equ v118, 118 @ - .equ v119, 119 @ - .equ v120, 120 @ - .equ v121, 121 @ - .equ v122, 122 @ - .equ v123, 123 @ - .equ v124, 124 @ - .equ v125, 125 @ - .equ v126, 126 @ - .equ v127, 127 @ - -@*** -@ parameter of gate+ -@******************************************************@ - - .equ gtp1, 1 @ - .equ gtp2, 2 @ - .equ gtp3, 3 @ - -@*** -@ parameter of MODT, BRET -@******************************************************@ - - .equ mod_vib,0 @ vibrate - .equ mod_tre,1 @ tremolo - .equ mod_pan,2 @ auto-panpot - -@*** -@ parameter of MEMACC -@******************************************************@ - - .equ mem_set,0 @ - .equ mem_add,1 @ - .equ mem_sub,2 @ - .equ mem_mem_set,3 @ - .equ mem_mem_add,4 @ - .equ mem_mem_sub,5 @ - .equ mem_beq,6 @ - .equ mem_bne,7 @ - .equ mem_bhi,8 @ - .equ mem_bhs,9 @ - .equ mem_bls,10 @ - .equ mem_blo,11 @ - .equ mem_mem_beq,12 @ - .equ mem_mem_bne,13 @ - .equ mem_mem_bhi,14 @ - .equ mem_mem_bhs,15 @ - .equ mem_mem_bls,16 @ - .equ mem_mem_blo,17 @ - -@*** -@ etc. -@******************************************************@ - - .equ reverb_set,0x80 @ SOUND_MODE_REVERB_SET - .equ PAM, PAN @ - - .equ Voicegroup_HGSS, 0x915CA70 diff --git a/README.md b/README.md index 242d44e9d..5244497cf 100644 --- a/README.md +++ b/README.md @@ -11,16 +11,6 @@ This is my work in progress fork for a personal romhack project (tentatively "Po Generally, credits are listed in the files, or in notes for the individual commits, for who changed what - but my process is confessedly pretty messy and I may have made some mistakes! Please do not hesitate to point out any problems to me. -Trainer sprite sources: - -* Brandy & Sherry (our protags) created by Washy -* Ambassador design created with JillKatze -* "Junior Hexer" by Bombbity https://www.deviantart.com/bombbity/art/Hex-Maniac-Trainer-Sprite-First-Pass-704399414 -* "Bookworm"/Cassandra by Bombbity https://www.deviantart.com/bombbity/art/Cassandra-Trainer-Sprite-Second-Pass-698473514 -* Hex Maniac modified from Similation's sprite https://www.deviantart.com/similation/art/Hex-Maniac-837337841 as well as Kyledove's sprite https://www.deviantart.com/kyle-dove/art/All-Kalos-Trainer-Classes-892329880 -* Jessie and James by Kimba616 https://www.deviantart.com/kimba616/art/Jessie-and-James-145243037 -* Anything else is from the original games or by me! - Attack animation particles are free to use (most of the new ones are from me) but please don't use any other graphics I've created or am using; though I have done many, I didn't create all of the character sprites used here. (A more detailed graphics credits listing will come when I start adding more character graphics) **Vanilla CFRU info - read the documentation!!** diff --git a/asm_defines.s b/asm_defines.s index ef34874c2..a6e511d9e 100644 --- a/asm_defines.s +++ b/asm_defines.s @@ -3589,7 +3589,7 @@ .equ ITEM_TEACHY_TV, 366 .equ ITEM_TRI_PASS, 367 .equ ITEM_RAINBOW_PASS, 368 -.equ ITEM_TEA, 369 +.equ ITEM_ENERGY_DRINK, 369 .equ ITEM_MYSTIC_TICKET, 370 .equ ITEM_AURORA_TICKET, 371 .equ ITEM_POWDER_JAR, 372 @@ -3597,7 +3597,6 @@ .equ ITEM_SAPPHIRE, 374 .equ ITEM_X_SP_DEF, 375 - @;New TMs .equ ITEM_TM51, 376 .equ ITEM_TM52, 377 diff --git a/assembly/overworld_scripts/celadon_city.s b/assembly/overworld_scripts/celadon_city.s index ade5fc557..879305db1 100644 --- a/assembly/overworld_scripts/celadon_city.s +++ b/assembly/overworld_scripts/celadon_city.s @@ -13,6 +13,8 @@ .equ FLAG_CHOSESTARTER1, 0x960 .equ FLAG_CHOSESTARTER2, 0x961 .equ FLAG_CHOSESTARTER3, 0x962 +.equ FLAG_CELADONDEPT_ROOF2, 0x96C @Person ID to hide the rockets in the store +.equ FLAG_CELADON_GYMOPEN, 0x96D .equ SP_DAILY_EVENT, 0xA0 .equ SP_UPDATE_TIME_IN_VARS, 0xA1 .equ SP_GET_TIME_DIFFERENCE, 0xA2 @@ -244,19 +246,37 @@ EventScript_CeladonCity_GirlCommentary: .global EventScript_CeladonCity_RGroupClassy EventScript_CeladonCity_RGroupClassy: + checkflag FLAG_CELADONDEPT_ROOF2 + if SET _goto EventScript_CeladonCity_RGroupClassy_Angry msgbox gText_CeladonCity_RGroupAwesome MSG_FACE end + +EventScript_CeladonCity_RGroupClassy_Angry: + msgbox gText_CeladonCity_RGroupAwesome_WhatDidYouDo MSG_FACE + end .global EventScript_CeladonCity_NotStupidAboutRGroup EventScript_CeladonCity_NotStupidAboutRGroup: + checkflag FLAG_CELADONDEPT_ROOF2 + if SET _goto EventScript_CeladonCity_NotStupidAboutRGroup_Angry msgbox gText_CeladonCity_RGroupNotStupid MSG_FACE end - + +EventScript_CeladonCity_NotStupidAboutRGroup_Angry: + msgbox gText_CeladonCity_RGroupNotStupid_WhatDidYouDo MSG_FACE + end + .global EventScript_CeladonCity_GrassHint EventScript_CeladonCity_GrassHint: + checkflag FLAG_CELADONDEPT_ROOF2 + if SET _goto EventScript_CeladonCity_GrassHint_Angry msgbox gText_CeladonCity_GrassHint MSG_FACE end +EventScript_CeladonCity_GrassHint_Angry: + msgbox gText_CeladonCity_GrassHint_Angry MSG_FACE + end + .global EventScript_CeladonCity_CondominiumsSign EventScript_CeladonCity_CondominiumsSign: signmsg @@ -366,132 +386,28 @@ EventScript_CeladonCity_VoltorbFlipKid: msgbox gText_CeladonCity_MissingVoltorbFlip MSG_FACE end -.global EventScript_CeladonCity_RGroupNoEntryLeft -EventScript_CeladonCity_RGroupNoEntryLeft: - checkflag 0x966 - if SET _goto RGroupGuardLeftOopsie - msgbox gText_CeladonCity_RGroupBigShipment MSG_FACE - end - -RGroupGuardLeftOopsie: - lockall - msgbox gText_CeladonCity_OutsideDeptStore_Left MSG_FACE - trainerbattle3 0x3 9 0x0 gText_CeladonCity_OutsideDeptStore_Left_Loss - lockall - msgbox gText_CeladonCity_OutsideDeptStore_After MSG_KEEPOPEN - applymovement 0xE LookRight - waitmovement 0x0 - applymovement 0xD LookLeft - waitmovement 0x0 - msgbox gText_CeladonCity_OutsideDeptStore_GetInside MSG_NORMAL - call GuardsDoorEnter - lockall - clearflag 0x966 - showsprite 7 - movesprite 0x7 0x11 0x16 - pause 0x12 - applymovement 0x7 SibEntersDept1_FoughtLeftRocket - waitmovement 0x0 - pause 0x5 - applymovement 0xFF LookRight - checkgender - compare LASTRESULT 0x0 - if 0x1 _call EventScript_SherryGrats - compare LASTRESULT 0x1 - if 0x1 _call EventScript_BrandyGrats - applymovement 0x7 SibEntersDept2 - opendoor 0xF 0xE - waitdooranim - pause 0x8 - setflag 0x966 - hidesprite 7 - closedoor 0xF 0xE - waitdooranim - releaseall - end - -.global EventScript_CeladonCity_RGroupNoEntryRight -EventScript_CeladonCity_RGroupNoEntryRight: - checkflag 0x966 - if SET _goto RGroupGuardRightOopsie - msgbox gText_CeladonCity_RGroupBigShipment MSG_FACE - end - -RGroupGuardRightOopsie: - lockall - msgbox gText_CeladonCity_OutsideDeptStore_Right MSG_FACE - trainerbattle3 0x3 10 0x0 gText_CeladonCity_OutsideDeptStore_Right_Loss - lockall - msgbox gText_CeladonCity_OutsideDeptStore_After MSG_KEEPOPEN - applymovement 0xD LookLeft - waitmovement 0x0 - applymovement 0xE LookRight - waitmovement 0x0 - msgbox gText_CeladonCity_OutsideDeptStore_GetInside MSG_NORMAL - call GuardsDoorEnter - lockall - clearflag 0x966 - showsprite 7 - movesprite 0x7 0x09 0x16 - pause 0x12 - applymovement 0x7 SibEntersDept1_FoughtRightRocket - waitmovement 0x0 - pause 0x5 - applymovement 0xFF LookLeft - checkgender - compare LASTRESULT 0x0 - if 0x1 _call EventScript_SherryGrats - compare LASTRESULT 0x1 - if 0x1 _call EventScript_BrandyGrats - applymovement 0x7 SibEntersDept2 - opendoor 0xB 0xE - waitdooranim - pause 0x8 - setflag 0x966 - hidesprite 7 - closedoor 0xB 0xE - waitdooranim - releaseall - end - -EventScript_SherryGrats: - msgbox gText_CeladonCity_OutsideDeptStore_Sib_Sherry MSG_NORMAL - return - -EventScript_BrandyGrats: - msgbox gText_CeladonCity_OutsideDeptStore_Sib_Brandy MSG_NORMAL - return - -GuardsDoorEnter: - applymovement 0xD RocketsWalkUp - opendoor 0xF 0xE - waitdooranim - setflag 0x967 - hidesprite 13 - pause 0x8 - closedoor 0xF 0xE - waitdooranim - pause 0x5 - lockall - applymovement 0xE RocketsWalkUp - opendoor 0xB 0xE - waitdooranim - pause 0x15 - hidesprite 14 - closedoor 0xB 0xE - waitdooranim - return - .global EventScript_CeladonCity_RGroupGameCornerPromoter EventScript_CeladonCity_RGroupGameCornerPromoter: + checkflag FLAG_CELADONDEPT_ROOF2 + if SET _goto EventScript_CeladonCity_RGroupGameCornerPromoter_Angry msgbox gText_CeladonCity_RGroupGameCornerPromoter MSG_FACE end - + +EventScript_CeladonCity_RGroupGameCornerPromoter_Angry: + msgbox gText_CeladonCity_RGroupGameCornerPromoter_Angry MSG_FACE + end + .global EventScript_CeladonCity_RGroupMemberFirstOne EventScript_CeladonCity_RGroupMemberFirstOne: + checkflag FLAG_CELADONDEPT_ROOF2 + if SET _goto EventScript_CeladonCity_RGroupMemberFirstOne_Angry msgbox gText_CeladonCity_RGroupMemberFirstOne MSG_FACE end +EventScript_CeladonCity_RGroupMemberFirstOne_Angry: + msgbox gText_CeladonCity_RGroupMemberFirstOne_Angry MSG_FACE + end + .global EventScript_CeladonCity_CondominiumsInteriorSign EventScript_CeladonCity_CondominiumsInteriorSign: signmsg @@ -536,7 +452,7 @@ EventScript_CeladonCity_PrizeExchangeSign: EventScript_CeladonCity_SceptileNoises: cry SPECIES_SCEPTILE 0x0 msgbox gText_CeladonCity_BerriesSceptile MSG_FACE - applymovement 0x9 LookUp + applymovement 0x10 LookUp end .global EventScript_CeladonCity_BerriesGuy @@ -777,12 +693,155 @@ UniversalMovementScript_GymScene1: pause 0x5 msgbox gText_CeladonCity_ErikaGymSceneNPC1 MSG_KEEPOPEN return + +.global EventScript_CeladonCity_RGroupNoEntryLeft +EventScript_CeladonCity_RGroupNoEntryLeft: + checkflag 0x966 + if SET _goto RGroupGuardLeftOopsie + msgbox gText_CeladonCity_RGroupBigShipment MSG_FACE + end + +RGroupGuardLeftOopsie: + lockall + msgbox gText_CeladonCity_OutsideDeptStore_Left MSG_FACE + trainerbattle3 0x3 9 0x0 gText_CeladonCity_OutsideDeptStore_Left_Loss + lockall + msgbox gText_CeladonCity_OutsideDeptStore_After MSG_KEEPOPEN + applymovement 0xE LookRight + waitmovement 0x0 + applymovement 0xD LookLeft + waitmovement 0x0 + msgbox gText_CeladonCity_OutsideDeptStore_GetInside MSG_NORMAL + call GuardsDoorEnter + lockall + clearflag 0x966 + showsprite 7 + movesprite 0x7 0x11 0x16 + pause 0x12 + applymovement 0x7 SibEntersDept1_FoughtLeftRocket + waitmovement 0x0 + pause 0x5 + applymovement 0xFF LookRight + checkgender + compare LASTRESULT 0x0 + if 0x1 _call EventScript_SherryGrats + compare LASTRESULT 0x1 + if 0x1 _call EventScript_BrandyGrats + applymovement 0x7 SibEntersDept2 + opendoor 0xF 0xE + waitdooranim + pause 0x8 + setflag 0x966 + hidesprite 7 + closedoor 0xF 0xE + waitdooranim + releaseall + end + +.global EventScript_CeladonCity_NoLongerKnowEverything +EventScript_CeladonCity_NoLongerKnowEverything: + msgbox gText_CeladonCity_NoLongerKnowEverything1 MSG_FACE + end + +.global EventScript_CeladonCity_RGroupNoEntryRight +EventScript_CeladonCity_RGroupNoEntryRight: + checkflag 0x966 + if SET _goto RGroupGuardRightOopsie + msgbox gText_CeladonCity_RGroupBigShipment MSG_FACE + end + +RGroupGuardRightOopsie: + lockall + msgbox gText_CeladonCity_OutsideDeptStore_Right MSG_FACE + trainerbattle3 0x3 10 0x0 gText_CeladonCity_OutsideDeptStore_Right_Loss + lockall + msgbox gText_CeladonCity_OutsideDeptStore_After MSG_KEEPOPEN + applymovement 0xD LookLeft + waitmovement 0x0 + applymovement 0xE LookRight + waitmovement 0x0 + msgbox gText_CeladonCity_OutsideDeptStore_GetInside MSG_NORMAL + call GuardsDoorEnter + lockall + clearflag 0x966 + showsprite 7 + movesprite 0x7 0x09 0x16 + pause 0x12 + applymovement 0x7 SibEntersDept1_FoughtRightRocket + waitmovement 0x0 + pause 0x5 + applymovement 0xFF LookLeft + checkgender + compare LASTRESULT 0x0 + if 0x1 _call EventScript_SherryGrats + compare LASTRESULT 0x1 + if 0x1 _call EventScript_BrandyGrats + applymovement 0x7 SibEntersDept2 + opendoor 0xB 0xE + waitdooranim + pause 0x8 + setflag 0x966 + hidesprite 7 + closedoor 0xB 0xE + waitdooranim + releaseall + end + +EventScript_SherryGrats: + msgbox gText_CeladonCity_OutsideDeptStore_Sib_Sherry MSG_NORMAL + return + +EventScript_BrandyGrats: + msgbox gText_CeladonCity_OutsideDeptStore_Sib_Brandy MSG_NORMAL + return + +GuardsDoorEnter: + applymovement 0xD RocketsWalkUp + opendoor 0xF 0xE + waitdooranim + setflag 0x967 + hidesprite 13 + pause 0x8 + closedoor 0xF 0xE + waitdooranim + pause 0x5 + lockall + applymovement 0xE RocketsWalkUp + opendoor 0xB 0xE + waitdooranim + pause 0x15 + hidesprite 14 + closedoor 0xB 0xE + waitdooranim + return .global EventScript_CeladonCity_GymTrainerOutside EventScript_CeladonCity_GymTrainerOutside: + checkitem ITEM_ENERGY_DRINK 0x1 + compare 0x800D 0x1 + if 0x4 _goto ErikaGymOpen msgbox gText_CeladonCity_PleaseGoDeptStore MSG_FACE end +ErikaGymOpen: + faceplayer + sound 0x15 + applymovement 0x8 ExclaimAnim + waitmovement 0x0 + pause 0x5 + msgbox gText_CeladonCity_GymTrainer_GetsEnergyDrink1 MSG_KEEPOPEN + applymovement 0x8 GymTrainerShuffle + removeitem ITEM_ENERGY_DRINK 0x1 + msgbox gText_CeladonCity_GymTrainer_GetsEnergyDrink2 MSG_NORMAL + setflag 0x96D + applymovement 0x8 RocketsWalkUp + opendoor 0xB 0x1E + waitdooranim + pause 0x15 + hidesprite 8 + closedoor 0xB 0x1E + end + LookLeft: .byte look_left .byte 0xFE diff --git a/assembly/overworld_scripts/celadon_deptstore.s b/assembly/overworld_scripts/celadon_deptstore.s index 5a49c328f..11fc32a05 100644 --- a/assembly/overworld_scripts/celadon_deptstore.s +++ b/assembly/overworld_scripts/celadon_deptstore.s @@ -8,16 +8,32 @@ @;@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - +.equ FLAG_TAG_BATTLE, 0x908 +.equ VAR_PARTNER, 0x5011 +.equ VAR_PARTNER_BACKSPRITE, 0x5012 +.equ FLAG_CHOSESTARTER1, 0x960 +.equ FLAG_CHOSESTARTER2, 0x961 +.equ FLAG_CHOSESTARTER3, 0x962 +.equ FLAG_DEPTSIB_INTERIOR_HIDE, 0x968 @Hides sib when you get to floor 3, the gavin floor +.equ FLAG_DEPTSTORE_ROCKETEVENT, 0x969 @Set on entry to the dept. store for the first time. Hides shopkeepers and regular customers (except the floor 1 and 3 NPCs). If clear, removes the obstacle boxes and restores music to normal. +.equ FLAG_SIB_CELADONDEPT_ROOF, 0x96B @For Sib, Pelipper & Rocket Prize Master on roof, extra dialogue from sib on floor 5 if you threw +.equ FLAG_CELADONDEPT_ROOF2, 0x96C @Person ID to hide the rockets in the store +.equ FLAG_CELADON_GYMOPEN, 0x96D @Delivered the Energy Drink. Also person ID for gym trainer @;@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -.global EventScript_DeptStoreSibSprite_Floor1 -gMapScripts_DeptStoreSibSprite_Floor1: - mapscript MAP_SCRIPT_ON_TRANSITION EventScript_ChangeSibSprite_CeladonDeptFloor1 +.global EventScript_DeptStore_Floor1 +gMapScripts_DeptStore_Floor1: + mapscript MAP_SCRIPT_ON_LOAD EventScript_ChangeSibSprite_CeladonDeptFloor1 .byte MAP_SCRIPT_TERMIN EventScript_ChangeSibSprite_CeladonDeptFloor1: + checkflag FLAG_CELADON_GYMOPEN + if SET _goto CeladonDeptIsNormalNow + setflag FLAG_DEPTSTORE_ROCKETEVENT + @playsong2 0x166 @@playsong2 0x166 is supposed to be setting up music used while Team Rocket is taking over. Currently disabled until a better solution exists, as the music cuts out between floors because it is not being set on a header level + checkflag FLAG_DEPTSIB_INTERIOR_HIDE + if SET _call EventScript_Floor1RocketGotBeat checkgender compare LASTRESULT 0x0 if 0x1 _goto EventScript_SetSibNPCAsSherry_DeptFloor1 @@ -25,6 +41,19 @@ EventScript_ChangeSibSprite_CeladonDeptFloor1: if 0x1 _goto EventScript_SetSibNPCAsBrandy_DeptFloor1 end +CeladonDeptIsNormalNow: + clearflag FLAG_DEPTSTORE_ROCKETEVENT + setmaptile 0x6 0x2 0x295 0x0 + setmaptile 0x9 0x2 0x28A 0x0 + setmaptile 0x9 0x1 0x28B 0x0 + special 0x8E + hidesprite 2 + hidesprite 4 + hidesprite 5 + hidesprite 6 + hidesprite 7 + end + EventScript_SetSibNPCAsSherry_DeptFloor1: setvar 0x5028 + 0x2 7 end @@ -33,11 +62,647 @@ EventScript_SetSibNPCAsBrandy_DeptFloor1: setvar 0x5028 + 0x2 0 end +EventScript_Floor1RocketGotBeat: + spritebehave 0x3 0x8 + hidesprite 2 + hidesprite 4 + hidesprite 5 + return + +.global EventScript_DeptStore_Floor2 +gMapScripts_DeptStore_Floor2: + mapscript MAP_SCRIPT_ON_LOAD EventScript_CeladonDeptFloor2 + end + +EventScript_CeladonDeptFloor2: + checkflag FLAG_DEPTSTORE_ROCKETEVENT + if NOT_SET _goto CeladonDeptFloor2TilesNormal + @playsong2 0x166 @@playsong2 0x166 is supposed to be setting up music used while Team Rocket is taking over. Currently disabled until a better solution exists, as the music cuts out between floors because it is not being set on a header level + end + +CeladonDeptFloor2TilesNormal: + setmaptile 0x5 0x2 0x294 0x0 + setmaptile 0x8 0x2 0x28A 0x0 + setmaptile 0x8 0x1 0x28B 0x0 + setmaptile 0x5 0x3 0x281 0x0 + setmaptile 0x6 0x2 0x290 0x0 + setmaptile 0x6 0x4 0x289 0x0 + setmaptile 0x7 0x4 0x289 0x0 + setmaptile 0x5 0x5 0x2C0 0x0 + setmaptile 0x6 0x5 0x2C0 0x0 + setmaptile 0x6 0x6 0x2C0 0x0 + setmaptile 0x7 0x6 0x2C0 0x0 + setmaptile 0x8 0x6 0x2C0 0x0 + setmaptile 0x6 0x7 0x2C0 0x0 + setmaptile 0x5 0x9 0x2C0 0x0 + special 0x8E + end + +.global EventScript_DeptStore_Floor3 +gMapScripts_DeptStore_Floor3: + mapscript MAP_SCRIPT_ON_TRANSITION EventScript_CeladonDeptFloor3 + mapscript MAP_SCRIPT_ON_LOAD EventScript_CeladonDeptFloor3Floortiles + .byte MAP_SCRIPT_TERMIN + +EventScript_CeladonDeptFloor3: + @checkflag FLAG_DEPTSTORE_ROCKETEVENT + @if NOT_SET _goto NormalMusicFloor3 + @playsong2 0x166 @@playsong2 0x166 is supposed to be setting up music used while Team Rocket is taking over. Currently disabled until a better solution exists, as the music cuts out between floors because it is not being set on a header level + setflag 0x968 + hidesprite 2 + hidesprite 3 + checkgender + compare LASTRESULT 0x0 + if 0x1 _goto EventScript_SetSibNPCAsSherry_DeptFloor3 + compare LASTRESULT 0x1 + if 0x1 _goto EventScript_SetSibNPCAsBrandy_DeptFloor3 + end + +EventScript_CeladonDeptFloor3Floortiles: + checkflag FLAG_DEPTSTORE_ROCKETEVENT + if NOT_SET _goto CeladonDeptFloor3TilesNormal + end + +@NormalMusicFloor3: + @end + +CeladonDeptFloor3TilesNormal: + setmaptile 0x6 0x2 0x291 0x0 + special 0x8E + end + +EventScript_SetSibNPCAsSherry_DeptFloor3: + setvar 0x5028 + 0x3 7 + end + +EventScript_SetSibNPCAsBrandy_DeptFloor3: + setvar 0x5028 + 0x3 0 + end + +.global EventScript_DeptStore_Floor4 +gMapScripts_DeptStore_Floor4: + mapscript MAP_SCRIPT_ON_LOAD EventScript_CeladonDeptFloor4 + end + +EventScript_CeladonDeptFloor4: + checkflag FLAG_DEPTSTORE_ROCKETEVENT + if NOT_SET _goto CeladonDeptFloor4TilesNormal + @playsong2 0x166 @@playsong2 0x166 is supposed to be setting up music used while Team Rocket is taking over. Currently disabled until a better solution exists, as the music cuts out between floors because it is not being set on a header level + end + +CeladonDeptFloor4TilesNormal: + setmaptile 0x7 0x2 0x296 0x0 + setmaptile 0x5 0x2 0x294 0x0 + setmaptile 0x6 0x2 0x292 0x0 + setmaptile 0x6 0x3 0x281 0x0 + setmaptile 0x6 0x4 0x289 0x0 + setmaptile 0x5 0x5 0x2C0 0x0 + setmaptile 0x6 0x6 0x309 0x0 + setmaptile 0x8 0x8 0x2C4 0x0 + setmaptile 0xA 0xB 0x2C0 0x0 + special 0x8E + end + +.global EventScript_DeptStore_Floor5 +gMapScripts_DeptStore_Floor5: + mapscript MAP_SCRIPT_ON_LOAD EventScript_CeladonDeptFloor5 + end + +EventScript_CeladonDeptFloor5: + checkflag FLAG_DEPTSTORE_ROCKETEVENT + if NOT_SET _goto CeladonDeptFloor5TilesNormal + @playsong2 0x166 @@playsong2 0x166 is supposed to be setting up music used while Team Rocket is taking over. Currently disabled until a better solution exists, as the music cuts out between floors because it is not being set on a header level + checkgender + compare LASTRESULT 0x0 + if 0x1 _goto EventScript_SetSibNPCAsSherry_DeptFloor5 + compare LASTRESULT 0x1 + if 0x1 _goto EventScript_SetSibNPCAsBrandy_DeptFloor5 + end + +EventScript_SetSibNPCAsSherry_DeptFloor5: + setvar 0x5028 + 0x4 7 + end + +EventScript_SetSibNPCAsBrandy_DeptFloor5: + setvar 0x5028 + 0x4 0 + end + +CeladonDeptFloor5TilesNormal: + setmaptile 0x7 0x2 0x296 0x0 + setmaptile 0x5 0x3 0x281 0x0 + setmaptile 0x6 0x2 0x293 0x0 + setmaptile 0x6 0x3 0x281 0x0 + setmaptile 0x6 0x4 0x289 0x0 + setmaptile 0x7 0x4 0x289 0x0 + setmaptile 0x6 0x5 0x2C0 0x0 + setmaptile 0x6 0x6 0x2C0 0x0 + setmaptile 0x4 0x7 0x2C0 0x0 + setmaptile 0x7 0x7 0x317 0x0 + special 0x8E + end + +.global EventScript_DeptStore_RoofEvent +gMapScripts_DeptStore_RoofEvent: + mapscript MAP_SCRIPT_ON_TRANSITION EventScript_CeladonDeptRoof + mapscript MAP_SCRIPT_ON_FRAME_TABLE LevelScript_CeladonDeptRoof_RocketBattle + .byte MAP_SCRIPT_TERMIN + +EventScript_CeladonDeptRoof: + @checkflag FLAG_DEPTSTORE_ROCKETEVENT + @if SET _call MusicForTheTransition @@playsong2 0x166 is supposed to be setting up music used while Team Rocket is taking over. Currently disabled until a better solution exists, as the music cuts out between floors because it is not being set on a header level + setflag FLAG_SIB_CELADONDEPT_ROOF + hidesprite 4 + hidesprite 5 + hidesprite 6 + checkgender + compare LASTRESULT 0x0 + if 0x1 _goto EventScript_SetSibNPCAsSherry_DeptRoof + compare LASTRESULT 0x1 + if 0x1 _goto EventScript_SetSibNPCAsBrandy_DeptRoof + end + +@MusicForTheTransition: + @playsong2 0x166 @@playsong2 0x166 is supposed to be setting up music used while Team Rocket is taking over. Currently disabled until a better solution exists, as the music cuts out between floors because it is not being set on a header level + @return + +EventScript_SetSibNPCAsSherry_DeptRoof: + setvar 0x5028 + 0x4 7 + end + +EventScript_SetSibNPCAsBrandy_DeptRoof: + setvar 0x5028 + 0x4 0 + end + +LevelScript_CeladonDeptRoof_RocketBattle: + levelscript 0x4090, 0, LevelScripts_CeladonDeptRoof_RocketBattleP2 + .hword LEVEL_SCRIPT_TERMIN + +LevelScripts_CeladonDeptRoof_RocketBattleP2: + applymovement 0xFF WalkLeft3 + lockall + fadeoutbgm 1 + pause 0x20 + sound 0x9 + showsprite 4 + pause 0x8 + applymovement 0xFF LookRight + waitmovement 0x0 + pause 0x24 + applymovement 0x4 SibHop + sound 0x1C + pause 0x4 + sound 0x7 + waitmovement 0x0 + pause 0x8 + applymovement 0xFF LookLeft + applymovement 0x4 SibRoofMove + waitmovement 0x0 + special 0x113 + applymovement 0x7F WalkLeft3 + waitmovement 0x0 + msgbox gText_CeladonDeptStore_RocketsRooftop_ChieAgain MSG_NORMAL + applymovement 0x1 RocketSteppyUp + pause 0x15 + msgbox gText_CeladonDeptStore_RocketsRooftop_JamesIntro MSG_KEEPOPEN + applymovement 0x2 RocketSteppyUp + pause 0x9 + msgbox gText_CeladonDeptStore_RocketsRooftop_JessieIntro MSG_KEEPOPEN + applymovement 0x3 SibsSteppy + msgbox gText_CeladonDeptStore_RocketRooftop_ChieAgainAgain1 MSG_NORMAL + applymovement 0x3 GruntChieLeaves1 + waitmovement 0x0 + applymovement 0x3 ExclaimGeneral + sound 0x15 + pause 0x14 + msgbox gText_CeladonDeptStore_RocketRooftop_ChieAgainAgain2 MSG_NORMAL + applymovement 0x3 GruntChieLeaves2 + sound 0x91 + pause 0x20 + sound 0xBD + waitmovement 0x0 + sound 0x9 + hidesprite 3 + pause 0x20 + applymovement 0xFF WalkLeft3 + applymovement 0x4 WalkLeft3 + applymovement 0x7F WalkLeft2 + waitmovement 0x0 + pause 0x9 + checkgender + compare LASTRESULT 0x0 + if 0x1 _call EventScript_SetSibNPCAsSherry_RocketWhomst1 + compare LASTRESULT 0x1 + if 0x1 _call EventScript_SetSibNPCAsBrandy_RocketWhomst1 + pause 0x5 + applymovement 0x2 RocketSteppyUp + pause 0x9 + msgbox gText_CeladonDeptStore_JessieReveal_1 MSG_KEEPOPEN + applymovement 0x1 RocketSteppyUp + pause 0x9 + msgbox gText_CeladonDeptStore_JamesReveal_1 MSG_KEEPOPEN + applymovement 0x4 SibsSteppy + pause 0x9 + checkgender + compare LASTRESULT 0x0 + if 0x1 _call EventScript_SetSibNPCAsSherry_RocketWhomst2 + compare LASTRESULT 0x1 + if 0x1 _call EventScript_SetSibNPCAsBrandy_RocketWhomst2 + playsong 0x161 0x0 + pause 0x30 + applymovement 0x1 RocketPirouette1 + sound 0x71 + pause 0x9 + sound 0x71 + pause 0x9 + sound 0x71 + waitmovement 0x0 + msgbox gText_CeladonDeptStore_JamesReveal_2 MSG_KEEPOPEN + applymovement 0x2 RocketPirouette2 + sound 0x71 + applymovement 0x7F WalkRight + pause 0x9 + sound 0x71 + pause 0x9 + sound 0x71 + pause 0x12 + msgbox gText_CeladonDeptStore_JessieReveal_2 MSG_NORMAL + pause 0x35 + msgbox gText_CeladonDeptStore_TRMotto1 MSG_KEEPOPEN + applymovement 0x1 MottoAnimOne + applymovement 0x2 MottoAnimOne + waitmovement 0x0 + msgbox gText_CeladonDeptStore_TRMotto2 MSG_KEEPOPEN + applymovement 0xFF LookDown + applymovement 0x4 LookUp + pause 0x25 + sound 0x15 + applymovement 0xFF QuestionMark + applymovement 0x4 QuestionMark + waitmovement 0x0 + pause 0x26 + applymovement 0xFF LookLeft + applymovement 0x4 LookLeft + pause 0x10 + msgbox gText_CeladonDeptStore_TRMotto3 MSG_KEEPOPEN + applymovement 0x1 MottoAnim2_1 + applymovement 0x2 MottoAnim2_2 + waitmovement 0x0 + applymovement 0xFF LookUp + applymovement 0x4 LookUp + msgbox gText_CeladonDeptStore_TRMotto4 MSG_KEEPOPEN + applymovement 0x1 MottoAnim3_Right + applymovement 0x2 MottoAnim3_Left + waitmovement 0x0 + applymovement 0x2 WalkDown + msgbox gText_CeladonDeptStore_TRMotto5 MSG_KEEPOPEN + applymovement 0x2 MottoRetract + waitmovement 0x0 + applymovement 0x2 MottoAnim3_Right + applymovement 0x1 MottoAnim3_Left + waitmovement 0x0 + applymovement 0x1 WalkDown + waitmovement 0x0 + msgbox gText_CeladonDeptStore_TRMotto6 MSG_KEEPOPEN + applymovement 0x1 MottoRetract + waitmovement 0x0 + msgbox gText_CeladonDeptStore_TRMotto7 MSG_KEEPOPEN + msgbox gText_CeladonDeptStore_TRMotto8 MSG_NORMAL + pause 0x40 + msgbox gText_CeladonDeptStore_TRBeat MSG_KEEPOPEN + applymovement 0x1 LookRight + applymovement 0x2 LookLeft + waitmovement 0x0 + msgbox gText_CeladonDeptStore_JamesWaitNoPokemon1 MSG_KEEPOPEN + msgbox gText_CeladonDeptStore_JessieWaitNoPokemon1 MSG_KEEPOPEN + applymovement 0x1 JamesJump + sound 0x1C + msgbox gText_CeladonDeptStore_JamesWaitNoPokemon2 MSG_KEEPOPEN + msgbox gText_CeladonDeptStore_JessieWaitNoPokemon2 MSG_KEEPOPEN + applymovement 0x1 JamesJump + sound 0x1C + waitmovement 0x0 + applymovement 0x1 JamesJump + sound 0x1C + msgbox gText_CeladonDeptStore_JamesWaitNoPokemon3 MSG_KEEPOPEN + applymovement 0x2 SibsSteppy + msgbox gText_CeladonDeptStore_JessieWaitNoPokemon3 MSG_KEEPOPEN + msgbox gText_CeladonDeptStore_JamesWaitNoPokemon4 MSG_KEEPOPEN + applymovement 0x1 LookDown + applymovement 0x2 LookDown + msgbox gText_CeladonDeptStore_JessieWaitNoPokemon4 MSG_NORMAL + applymovement 0x1 LookRight + applymovement 0x2 LookLeft + sound 0x69 + checksound + sound 0x38 + checksound + sound 0x39 + checksound + pause 0x10 + sound 0x19 + pause 0x21 + sound 0x36 + pause 0x30 + showsprite 5 + applymovement 0x5 PelipperSweep + sound 0x97 + pause 0x5 + sound 0x7E + pause 0x19 + sound 0x47 + applymovement 0x1 PushedByPelipper + applymovement 0x2 PushedByPelipper + waitmovement 0x0 + pause 0x5 + applymovement 0x5 LookDown + waitmovement 0x0 + pause 0x30 + cry SPECIES_PELIPPER 0x0 + pause 0x40 + showsprite 6 + sound 0xF + applymovement 0x5 PelipperBails + pause 0x9 + sound 0x25 + pause 0x21 + hidesprite 5 + applymovement 0x2 LookDown + msgbox gText_CeladonDeptStore_BeholdThePrizeMaster1 MSG_KEEPOPEN + applymovement 0x2 LookLeft + msgbox gText_CeladonDeptStore_BeholdThePrizeMaster2 MSG_KEEPOPEN + applymovement 0x1 SibsSteppy + msgbox gText_CeladonDeptStore_JamesGachaPulls MSG_NORMAL + applymovement 0x1 Down2Gacha + applymovement 0x2 Down2Gacha + pause 0x8 + applymovement 0xFF PushedByTR + sound 0x7 + waitmovement 0x0 + pause 0x10 + sound 0x63 + checksound + pause 0x7 + sound 0x31 + checksound + applymovement 0x2 JessieInPosition + waitmovement 0x0 + applymovement 0x1 JamesInPosition1 + pause 0x16 + sound 0x63 + checksound + pause 0x7 + sound 0x31 + checksound + applymovement 0x1 JamesInPosition2 + waitmovement 0x0 + pause 0x10 + applymovement 0x1 MottoAnim3_Right + applymovement 0x2 MottoAnim3_Left + waitmovement 0x0 + msgbox gText_CeladonDeptStore_JessieReadyToGo MSG_KEEPOPEN + applymovement 0xFF LookRight + applymovement 0x4 LookLeft + waitmovement 0x0 + special 0x114 + pause 0x15 + checkgender + compare LASTRESULT 0x0 + if 0x1 _goto EventScript_SibSherryVsDeptRocketsFight + compare LASTRESULT 0x1 + if 0x1 _goto EventScript_SibBrandyVsDeptRocketsFight + end + +EventScript_SetSibNPCAsSherry_RocketWhomst1: + msgbox gText_CeladonDeptStore_RocketRooftop_SibSherry1 MSG_NORMAL + return + +EventScript_SetSibNPCAsBrandy_RocketWhomst1: + msgbox gText_CeladonDeptStore_RocketRooftop_SibBrandy1 MSG_NORMAL + return + +EventScript_SetSibNPCAsSherry_RocketWhomst2: + msgbox gText_CeladonDeptStore_RocketRooftop_SibSherry2 MSG_NORMAL + return + +EventScript_SetSibNPCAsBrandy_RocketWhomst2: + msgbox gText_CeladonDeptStore_RocketRooftop_SibBrandy2 MSG_NORMAL + return + +EventScript_SibSherryVsDeptRocketsFight: + msgbox gText_CeladonDeptStore_RocketRooftop_SibSherry3 MSG_NORMAL + applymovement 0xFF LookUp + applymovement 0x4 LookUp + waitmovement 0x0 + pause 0x15 + setflag FLAG_TAG_BATTLE + setvar VAR_PARTNER 0x1E @Sherry partner + setvar VAR_PARTNER_BACKSPRITE 0x1 @Sherry Backsprite + special 0x0 + trainerbattle3 0x3 29 0x0 gText_CeladonDeptStore_RocketsLose + goto EventScript_AfterRocketRoof + return + +EventScript_SibBrandyVsDeptRocketsFight: + msgbox gText_CeladonDeptStore_RocketRooftop_SibBrandy3 MSG_NORMAL + applymovement 0xFF LookUp + applymovement 0x4 LookUp + waitmovement 0x0 + pause 0x15 + setflag FLAG_TAG_BATTLE + setvar VAR_PARTNER 0x1F @Brandy partner + setvar VAR_PARTNER_BACKSPRITE 0x0 @Brandy Backsprite + special 0x0 + trainerbattle3 0x3 29 0x0 gText_CeladonDeptStore_RocketsLose + goto EventScript_AfterRocketRoof + return + +EventScript_AfterRocketRoof: + clearflag FLAG_TAG_BATTLE + setvar 0x4090 0x1 + msgbox gText_CeladonDeptStore_RocketsAfter MSG_KEEPOPEN + applymovement 0x1 RocketTanty + pause 0x3 + applymovement 0x2 RocketTanty + msgbox gText_CeladonDeptStore_JessieLost1 MSG_KEEPOPEN + applymovement 0x4 RocketSteppyUp + checkgender + compare LASTRESULT 0x0 + if 0x1 _call EventScript_CeladonSibSherryWhat + compare LASTRESULT 0x1 + if 0x1 _call EventScript_CeladonSibBrandyWhat + msgbox gText_CeladonDeptStore_JessieLost2 MSG_KEEPOPEN + applymovement 0x1 RocketTanty + msgbox gText_CeladonDeptStore_JamesLost2 MSG_NORMAL + applymovement 0x1 JamesShoveReady + applymovement 0x2 JessieShoveReady + waitmovement 0x0 + pause 0x17 + call RocketsShovePrize + msgbox gText_CeladonDeptStore_JamesLost3 MSG_NORMAL + call RocketsShovePrize + pause 0x31 + call RocketsShovePrize + pause 0x34 + call RocketsShovePrize + fadescreen 0x1 + pause 0x16 + setflag FLAG_CELADONDEPT_ROOF2 + hidesprite 1 + hidesprite 2 + hidesprite 6 + applymovement 0xFF LookRight + applymovement 0x4 LookRight + msgbox gText_CeladonDeptStore_FadeToBlack MSG_NORMAL + fadescreen 0x0 + pause 0x36 + applymovement 0x4 LookLeft + checkgender + compare LASTRESULT 0x0 + if 0x1 _goto EventScript_CeladonSibSherryStarterNamedrop + compare LASTRESULT 0x1 + if 0x1 _goto EventScript_CeladonSibBrandyStarterNamedrop + end + +RocketsShovePrize: + applymovement 0x1 PrizeMasterShove + applymovement 0x2 PrizeMasterShove + applymovement 0x6 PrizeMasterItselfShove + sound 0xCF + waitmovement 0x0 + return + +EventScript_CeladonSibSherryWhat: + msgbox gText_CeladonDeptStore_SherryConfused MSG_KEEPOPEN + return + +EventScript_CeladonSibBrandyWhat: + msgbox gText_CeladonDeptStore_BrandyConfused MSG_KEEPOPEN + return + +EventScript_CeladonSibSherryStarterNamedrop: + checkflag 0x940 + if SET _goto SherryRandoDialogue + checkflag FLAG_CHOSESTARTER1 + if SET _goto ChoseRelicanthSherry + checkflag FLAG_CHOSESTARTER2 + if SET _goto ChoseSigilyphSherry + checkflag FLAG_CHOSESTARTER3 + if SET _goto ChosePassimianSherry + end + +EventScript_CeladonSibBrandyStarterNamedrop: + checkflag 0x940 + if SET _goto BrandoDialogue + checkflag FLAG_CHOSESTARTER1 + if SET _goto ChoseRelicanthBrandy + checkflag FLAG_CHOSESTARTER2 + if SET _goto ChoseSigilyphBrandy + checkflag FLAG_CHOSESTARTER3 + if SET _goto ChosePassimianBrandy + end + +ChoseRelicanthSherry: + msgbox gText_CeladonDeptStore_SherryAfterLeave_PlayerChoseRelicanth MSG_KEEPOPEN + goto RocketRoofEventFinal + end + +ChoseSigilyphSherry: + msgbox gText_CeladonDeptStore_SherryAfterLeave_PlayerChoseSigilyph MSG_KEEPOPEN + goto RocketRoofEventFinal + end + +ChosePassimianSherry: + msgbox gText_CeladonDeptStore_SherryAfterLeave_PlayerChosePassimian MSG_KEEPOPEN + goto RocketRoofEventFinal + end + +ChoseRelicanthBrandy: + msgbox gText_CeladonDeptStore_BrandyAfterLeave_PlayerChoseRelicanth MSG_KEEPOPEN + goto RocketRoofEventFinal + end + +ChoseSigilyphBrandy: + msgbox gText_CeladonDeptStore_BrandyAfterLeave_PlayerChoseSigilyph MSG_KEEPOPEN + goto RocketRoofEventFinal + end + +ChosePassimianBrandy: + msgbox gText_CeladonDeptStore_BrandyAfterLeave_PlayerChosePassimian MSG_KEEPOPEN + goto RocketRoofEventFinal + end + +SherryRandoDialogue: + msgbox gText_CeladonDeptStore_SherryAfterLeave_Rando MSG_KEEPOPEN + goto RocketRoofEventFinal + end + +BrandoDialogue: + msgbox gText_CeladonDeptStore_BrandyAfterLeave_Rando MSG_KEEPOPEN + goto RocketRoofEventFinal + end + +RocketRoofEventFinal: + msgbox gText_CeladonDeptStore_SibAfterRocketRoofWin MSG_NORMAL + applymovement 0x4 WalkUp3 + waitmovement 0x0 + pause 0x15 + sound 0x63 + checksound + pause 0x10 + applymovement 0x4 WalkDown3 + waitmovement 0x0 + applymovement 0x4 LookLeft + pause 0x15 + giveitem ITEM_ENERGY_DRINK 0x1 MSG_OBTAIN + checkgender + compare LASTRESULT 0x0 + if 0x1 _call EventScript_CeladonRoofSibSherryReallyFinal + compare LASTRESULT 0x1 + if 0x1 _call EventScript_CeladonRoofSibBrandyReallyFinal + checkflag 0x940 + if NOT_SET _goto RelicanthCheck + goto ReallyReallyFinalAndLeave + end + +EventScript_CeladonRoofSibSherryReallyFinal: + msgbox gText_CeladonDeptStore_SherryAfterWinLeave1 MSG_KEEPOPEN + return + +EventScript_CeladonRoofSibBrandyReallyFinal: + msgbox gText_CeladonDeptStore_BrandyAfterWinLeave1 MSG_KEEPOPEN + return + +RelicanthCheck: + checkflag FLAG_CHOSESTARTER3 + if SET _call RelicanthDialogue + goto ReallyReallyFinalAndLeave + end + +RelicanthDialogue: + msgbox gText_CeladonDeptStore_PlayerChosePassimianSoOopsIHaveRelicanth MSG_KEEPOPEN + return + +ReallyReallyFinalAndLeave: + msgbox gText_CeladonDeptStore_SibAfterWinLeave2 MSG_NORMAL + applymovement 0x4 SibWalksOut + waitmovement 0x0 + pause 0x5 + sound 0x9 + hidesprite 4 + releaseall + end + .global EventScript_CeladonDept_Floor1CustomerService EventScript_CeladonDept_Floor1CustomerService: + checkflag 0x96D + if SET _goto EventScript_CeladonDept_Floor1CustomerService_Angry msgbox gText_CeladonDeptStore_RocketEvent_CustomerService MSG_FACE end +EventScript_CeladonDept_Floor1CustomerService_Angry: + msgbox gText_CeladonDeptStore_RocketEvent_CustomerService_Angry MSG_FACE + end + .global EventScript_CeladonDept_SherryBrandy_1F EventScript_CeladonDept_SherryBrandy_1F: checkgender @@ -57,11 +722,639 @@ EventScript_CeladonDept_Brandy_1F: .global EventScript_CeladonDept_1FRocketBattlingSib EventScript_CeladonDept_1FRocketBattlingSib: + checkflag 0x968 + if SET _goto RocketBemoaningHisFate msgbox gText_CeladonDeptStore_1FRocketBattlingSib MSG_NORMAL end + +RocketBemoaningHisFate: + faceplayer + msgbox gText_CeladonDeptStore_1FRocketBattlingSib_AfterNotSurviving MSG_KEEPOPEN + applymovement 0x3 RocketTanty + pause 0x10 + checkgender + compare LASTRESULT 0x0 + if 0x1 _goto EventScript_CeladonDept_RocketComplainSherry + compare LASTRESULT 0x1 + if 0x1 _goto EventScript_CeladonDept_RocketComplainBrandy + end -.global EventScript_CeladonDept_BattlingRocket -EventScript_CeladonDept_BattlingRocket: +EventScript_CeladonDept_RocketComplainSherry: + msgbox gText_CeladonDeptStore_1FRocketBattlingSib_LostSherry MSG_NORMAL + end + +EventScript_CeladonDept_RocketComplainBrandy: + msgbox gText_CeladonDeptStore_1FRocketBattlingSib_LostBrandy MSG_NORMAL + end + +.global EventScript_CeladonDeptStore_RocketsArctozolt +EventScript_CeladonDeptStore_RocketsArctozolt: + cry SPECIES_ARCTOZOLT 0x0 + msgbox gText_CeladonDeptStore_RocketArctozolt MSG_NORMAL + end + +.global EventScript_CeladonDeptStore_SibsPokemon +EventScript_CeladonDeptStore_SibsPokemon: + cry SPECIES_CHINGLING 0x0 + msgbox gText_CeladonDeptStore_SherrysChingling MSG_NORMAL + end + +.global EventScript_CeladonDept_1FBattlingRocket +EventScript_CeladonDept_1FBattlingRocket: trainerbattle0 0x0 22 0x0 gText_CeladonDeptStore_RocketEvent_FirstRocket_Before gText_CeladonDeptStore_RocketEvent_FirstRocket_Lose msgbox gText_CeladonDeptStore_RocketEvent_FirstRocket_After MSG_NORMAL end + +.global EventScript_CeladonDept_ElevatorClosed +EventScript_CeladonDept_ElevatorClosed: + setvar 0x408E 0x0 + lockall + applymovement 0xFF LookUp + waitmovement 0x0 + msgbox gText_CeladonDeptStore_RocketEvent_Elevator MSG_NORMAL + applymovement 0xFF WalkDown + waitmovement 0x0 + releaseall + end + +.global EventScript_CeladonDept_2FRocket_1 +EventScript_CeladonDept_2FRocket_1: + trainerbattle0 0x0 23 0x0 gText_CeladonDeptStore_RocketEvent_NextRocket_Before gText_CeladonDeptStore_RocketEvent_NextRocket_Lose + msgbox gText_CeladonDeptStore_RocketEvent_NextRocket_After MSG_NORMAL + end + +.global EventScript_CeladonDept_2FRocket_2 +EventScript_CeladonDept_2FRocket_2: + trainerbattle0 0x0 24 0x0 gText_CeladonDeptStore_RocketEvent_Rocket3_Before gText_CeladonDeptStore_RocketEvent_Rocket3_Lose + msgbox gText_CeladonDeptStore_RocketEvent_Rocket3_After MSG_NORMAL + end + +.global EventScript_CeladonDept_4FRocket_1 +EventScript_CeladonDept_4FRocket_1: + trainerbattle0 0x0 25 0x0 gText_CeladonDeptStore_DeptStoreRockets_4FRocket1_Before gText_CeladonDeptStore_DeptStoreRockets_4FRocket1_Lose + msgbox gText_CeladonDeptStore_DeptStoreRockets_4FRocket1_After MSG_NORMAL + end + +.global EventScript_CeladonDept_4FRocket_2 +EventScript_CeladonDept_4FRocket_2: + trainerbattle0 0x0 26 0x0 gText_CeladonDeptStore_DeptStoreRockets_4FRocket2_Before gText_CeladonDeptStore_DeptStoreRockets_4FRocket2_Lose + msgbox gText_CeladonDeptStore_DeptStoreRockets_4FRocket2_After MSG_NORMAL + end + +.global EventScript_CeladonDept_5FRocket_1 +EventScript_CeladonDept_5FRocket_1: + trainerbattle0 0x0 27 0x0 gText_CeladonDeptStore_DeptStoreRockets_5FRocket1_Before gText_CeladonDeptStore_DeptStoreRockets_5FRocket1_Lose + msgbox gText_CeladonDeptStore_DeptStoreRockets_5FRocket1_After MSG_NORMAL + end + +.global EventScript_CeladonDept_5FRocket_2 +EventScript_CeladonDept_5FRocket_2: + trainerbattle0 0x0 28 0x0 gText_CeladonDeptStore_DeptStoreRockets_5FRocket2_Before gText_CeladonDeptStore_DeptStoreRockets_5FRocket2_Lose + msgbox gText_CeladonDeptStore_DeptStoreRockets_5FRocket2_After MSG_NORMAL + end + +.global EventScript_CeladonDept_GavinsBigDebut1 +EventScript_CeladonDept_GavinsBigDebut1: + call GavinsBigDebutStart + applymovement 0xFF PlayerWalkToGavin1 + goto GavinsBigDebutContinued + end + +.global EventScript_CeladonDept_GavinsBigDebut2 +EventScript_CeladonDept_GavinsBigDebut2: + call GavinsBigDebutStart + applymovement 0xFF PlayerWalkToGavin2 + goto GavinsBigDebutContinued + end + +GavinsBigDebutStart: + sound 0x9 + lockall + showsprite 2 + applymovement 0x2 WalkLeft + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavinIntro1 MSG_KEEPOPEN + applymovement 0x2 GavinMove1 + waitmovement 0x0 + return + +GavinsBigDebutContinued: + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavinIntro2 MSG_KEEPOPEN + applymovement 0x2 GavinMove2 + waitmovement 0x0 + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavinIntro3 MSG_KEEPOPEN + applymovement 0x2 GavinNotice + pause 0x2 + sound 0x15 + pause 0x10 + applymovement 0x2 GavinsMadDash + waitmovement 0x0 + applymovement 0xFF LookLeft + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavinNext MSG_NORMAL + showsprite 3 + sound 0x9 + applymovement 0x3 WalkLeft + pause 0x5 + checkgender + compare LASTRESULT 0x0 + if 0x1 _call SherryLine1 + compare LASTRESULT 0x1 + if 0x1 _call BrandyLine1 + applymovement 0x2 GavinsSteppy + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavin3 MSG_KEEPOPEN + applymovement 0x3 QuestionMark + sound 0x15 + pause 0x9 + checkgender + compare LASTRESULT 0x0 + if 0x1 _call SherryLine2 + compare LASTRESULT 0x1 + if 0x1 _call BrandyLine2 + applymovement 0x2 GavinsSteppy + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavin4 MSG_NORMAL + applymovement 0x2 WalkRight + waitmovement 0x0 + trainerbattle3 0x3 8 0x0 gText_CeladonCity_DeptStoreRockets_GarchompGavin_Loss + applymovement 0x2 GavinsJumps + sound 0x1C + waitmovement 0x0 + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavin_After MSG_KEEPOPEN + applymovement 0x3 WalkLeft2 + waitmovement 0x0 + checkgender + compare LASTRESULT 0x0 + if 0x1 _call SherryLine3 + compare LASTRESULT 0x1 + if 0x1 _call BrandyLine3 + applymovement 0x2 GavinsSteppy + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavin_After2 MSG_KEEPOPEN + applymovement 0x3 SibsSteppy + checkgender + compare LASTRESULT 0x0 + if 0x1 _call SherryLine4 + compare LASTRESULT 0x1 + if 0x1 _call BrandyLine4 + msgbox gText_CeladonCity_DeptStoreRockets_GarchompGavin_Revenge MSG_NORMAL + applymovement 0x2 GavinLeavesTheWayHeCame + waitmovement 0x0 + sound 0x9 + hidesprite 2 + pause 0x30 + checkgender + compare LASTRESULT 0x0 + if 0x1 _call SherryLine5 + compare LASTRESULT 0x1 + if 0x1 _call BrandyLine5 + applymovement 0x3 SibGoesToFloor4 + waitmovement 0x0 + sound 0x9 + hidesprite 3 + setvar 0x408F 0x1 + releaseall + end + +SherryLine1: + msgbox gText_CeladonCity_DeptStoreRockets_GavinSherry1 MSG_KEEPOPEN + return + +BrandyLine1: + msgbox gText_CeladonCity_DeptStoreRockets_GavinBrandy1 MSG_KEEPOPEN + return + +SherryLine2: + msgbox gText_CeladonCity_DeptStoreRockets_GavinSherry2 MSG_KEEPOPEN + return + +BrandyLine2: + msgbox gText_CeladonCity_DeptStoreRockets_GavinBrandy2 MSG_KEEPOPEN + return + +SherryLine3: + msgbox gText_CeladonCity_DeptStoreRockets_GavinSherry3 MSG_KEEPOPEN + return + +BrandyLine3: + msgbox gText_CeladonCity_DeptStoreRockets_GavinBrandy3 MSG_KEEPOPEN + return + +SherryLine4: + msgbox gText_CeladonCity_DeptStoreRockets_GavinSherry4 MSG_KEEPOPEN + return + +BrandyLine4: + msgbox gText_CeladonCity_DeptStoreRockets_GavinBrandy4 MSG_KEEPOPEN + return + +SherryLine5: + msgbox gText_CeladonCity_DeptStoreRockets_GavinSherry5 MSG_NORMAL + return + +BrandyLine5: + msgbox gText_CeladonCity_DeptStoreRockets_GavinBrandy5 MSG_NORMAL + return + +.global EventScript_CeladonDept_3FAttendant +EventScript_CeladonDept_3FAttendant: + checkflag 0x96D + if SET _goto EventScript_CeladonDept_3FAttendant_GamerRage + msgbox gText_CeladonCity_DeptStoreRockets_TVGameShopCounter MSG_FACE + end + +EventScript_CeladonDept_3FAttendant_GamerRage: + msgbox gText_CeladonCity_DeptStoreRockets_TVGameShopCounter_Angry MSG_FACE + end + +.global EventScript_CeladonDept_SibChilling5F +EventScript_CeladonDept_SibChilling5F: + checkgender + compare LASTRESULT 0x0 + if 0x1 _goto EventScript_CeladonDept_SibChilling5F_Sherry + compare LASTRESULT 0x1 + if 0x1 _goto EventScript_CeladonDept_SibChilling5F_Brandy + end + +EventScript_CeladonDept_SibChilling5F_Sherry: + checkflag FLAG_SIB_CELADONDEPT_ROOF + if 0x1 _goto SherryThinksYouThrew + msgbox gText_CeladonDeptStore_SibFloor5_Sherry MSG_FACE + end + +EventScript_CeladonDept_SibChilling5F_Brandy: + checkflag FLAG_SIB_CELADONDEPT_ROOF + if 0x1 _goto BrandyThinksYouThrew + msgbox gText_CeladonDeptStore_SibFloor5_Brandy MSG_FACE + end + +SherryThinksYouThrew: + msgbox gText_CeladonDeptStore_SibFloor5_Sherry_YouThrew MSG_FACE + end + +BrandyThinksYouThrew: + msgbox gText_CeladonDeptStore_SibFloor5_Brandy_YouThrew MSG_FACE + end + +.global EventScript_CeladonDept_ShamedRocket +EventScript_CeladonDept_ShamedRocket: + msgbox gText_CeladonDeptStore_ShamedRocket MSG_NORMAL + end + +.global EventScript_CeladonDept_Floor1_RegularNPC1 +EventScript_CeladonDept_Floor1_RegularNPC1: + msgbox gText_CeladonDept_Floor1_RegularNPC1 MSG_FACE + end + +.global EventScript_CeladonDept_Floor2_RegularNPC1 +EventScript_CeladonDept_Floor2_RegularNPC1: + msgbox gText_CeladonDept_Floor2_RegularNPC1 MSG_FACE + end + +.global EventScript_CeladonDept_Floor2_RegularNPC2 +EventScript_CeladonDept_Floor2_RegularNPC2: + msgbox gText_CeladonDept_Floor2_RegularNPC2 MSG_FACE + end + +.global EventScript_CeladonDept_Floor4_RegularNPC1 +EventScript_CeladonDept_Floor4_RegularNPC1: + msgbox gText_CeladonDept_Floor4_RegularNPC1 MSG_FACE + end + + +.global EventScript_CeladonDept_Roof_RegularNPC1 +EventScript_CeladonDept_Roof_RegularNPC1: + msgbox gText_CeladonDept_Roof_RegularNPC1_TwerpMode MSG_FACE + end + +LookUp: + .byte look_up + .byte 0xFE + +LookDown: + .byte look_down + .byte 0xFE + +LookLeft: + .byte look_left + .byte 0xFE + +LookRight: + .byte look_right + .byte 0xFE + +WalkUp3: + .byte walk_up + .byte walk_up + .byte walk_up + .byte 0xFE + +WalkDown: + .byte walk_down + .byte 0xFE + +WalkDown3: + .byte walk_down + .byte walk_down + .byte walk_down + .byte 0xFE + +WalkRight: + .byte walk_right + .byte 0xFE + +WalkLeft: + .byte walk_left + .byte 0xFE + +WalkLeft2: + .byte walk_left + .byte walk_left + .byte 0xFE + +WalkLeft3: + .byte walk_left + .byte walk_left + .byte walk_left + .byte 0xFE + +WalkRight2: + .byte walk_right + .byte walk_right + .byte 0xFE + +WalkRight3: + .byte walk_right + .byte walk_right + .byte walk_right + .byte 0xFE + +QuestionMark: + .byte 0x63 + .byte 0xFE + +GavinMove1: + .byte walk_left + .byte walk_down + .byte 0xFE + +GavinMove2: + .byte 0x4C + .byte walk_up + .byte 0x4D + .byte 0xFE + +PlayerWalkToGavin1: + .byte walk_right + .byte 0xFE + +PlayerWalkToGavin2: + .byte walk_right + .byte walk_up + .byte walk_right + .byte 0xFE + +GavinNotice: + .byte look_left + .byte 0x19 + .byte exclaim + .byte 0xFE + +ExclaimGeneral: + .byte exclaim + .byte 0xFE + +GavinsMadDash: + .byte 0x31 + .byte 0x33 + .byte 0x33 + .byte 0x33 + .byte 0x33 + .byte 0x33 + .byte 0x32 + .byte look_right + .byte 0xFE + +SibGoesToFloor4: + .byte walk_down + .byte walk_left + .byte walk_left + .byte walk_left + .byte walk_left + .byte walk_up + .byte walk_left + .byte 0xFE + +GavinsSteppy: + .byte 0x24 + .byte 0x24 + .byte 0xFE + +GavinsJumps: + .byte 0x54 + .byte 0xFE + +SibsSteppy: + .byte 0x27 + .byte 0x27 + .byte 0xFE + +SibHop: + .byte 0x7E + .byte 0xFE + +RocketSteppyUp: + .byte 0x26 + .byte 0x26 + .byte 0xFE + +GavinLeavesTheWayHeCame: + .byte 0x31 + .byte 0x34 + .byte 0x34 + .byte 0x34 + .byte 0x34 + .byte 0x32 + .byte 0x34 + .byte 0x34 + .byte 0xFE + +SibRoofMove: + .byte walk_left + .byte walk_down + .byte walk_left + .byte 0xFE + +GruntChieLeaves1: + .byte walk_down + .byte walk_down + .byte walk_down + .byte walk_right + .byte walk_right + .byte 0xFE + +GruntChieLeaves2: + .byte 0x2C + .byte 0x2C + .byte 0x2C + .byte 0x2C + .byte 0x2C + .byte 0x32 + .byte 0x34 + .byte 0x34 + .byte 0x34 + .byte 0x34 + .byte 0x35 + .byte 0x34 + .byte 0xFE + +RocketPirouette1: + .byte 0x97 + .byte 0x97 + .byte 0x97 + .byte 0x94 + .byte 0x94 + .byte 0x94 + .byte 0x94 + .byte look_right + .byte 0xFE + +RocketPirouette2: + .byte 0x97 + .byte 0x97 + .byte 0x97 + .byte 0x94 + .byte 0x94 + .byte 0x94 + .byte 0x97 + .byte look_right + .byte 0xFE + +MottoAnimOne: + .byte 0x97 + .byte 0x96 + .byte 0xFE + +MottoAnim2_1: + .byte 0x95 + .byte 0x95 + .byte look_down + .byte 0xFE + +MottoAnim2_2: + .byte 0x95 + .byte 0x97 + .byte look_down + .byte 0xFE + +MottoAnim3_Right: + .byte 0x97 + .byte look_down + .byte 0xFE + +MottoAnim3_Left: + .byte 0x96 + .byte look_down + .byte 0xFE + +MottoRetract: + .byte 0x4C + .byte walk_up + .byte 0x4D + .byte 0xFE + +JamesJump: + .byte 0x55 + .byte 0xFE + +PelipperSweep: + .byte 0x38 + .byte 0x38 + .byte 0x38 + .byte 0x38 + .byte 0x38 + .byte 0x38 + .byte 0x38 + .byte 0x38 + .byte 0x38 + .byte 0xFE + +PushedByPelipper: + .byte 0x97 + .byte 0x97 + .byte 0x97 + .byte look_left + .byte 0xFE + +PelipperBails: + .byte 0x35 + .byte 0x35 + .byte 0x35 + .byte 0x35 + .byte 0x35 + .byte 0x35 + .byte 0x35 + .byte 0xFE + +Down2Gacha: + .byte 0x31 + .byte 0x33 + .byte 0x33 + .byte 0x33 + .byte look_up + .byte 0xFE + +PushedByTR: + .byte 0x4C + .byte 0x37 + .byte 0x35 + .byte 0x4D + .byte 0xFE + +JessieInPosition: + .byte walk_right + .byte look_down + .byte 0xFE + +JamesInPosition1: + .byte walk_right + .byte look_up + .byte 0xFE + +JamesInPosition2: + .byte look_down + .byte 0xFE + +RocketTanty: + .byte 0x25 + .byte 0x25 + .byte 0x25 + .byte 0xFE + +JessieShoveReady: + .byte walk_left + .byte walk_up + .byte look_right + .byte 0xFE + +JamesShoveReady: + .byte walk_up + .byte look_left + .byte 0xFE + +PrizeMasterShove: + .byte 0x4C + .byte 0xF + .byte 0x4D + .byte 0xFE + +PrizeMasterItselfShove: + .byte 0x4C + .byte 0xF + .byte 0x4D + .byte 0xFE + +SibWalksOut: + .byte walk_up + .byte walk_right + .byte walk_right + .byte walk_right + .byte walk_right + .byte walk_right + .byte 0xFE diff --git a/assembly/overworld_scripts/route_16.s b/assembly/overworld_scripts/route_16.s index 4bf96f8bd..40e935555 100644 --- a/assembly/overworld_scripts/route_16.s +++ b/assembly/overworld_scripts/route_16.s @@ -33,6 +33,95 @@ EventScript_Route16_Gatehouse_FuchsiaSad: msgbox gText_Route16_Gatehouse_FuchsiaSad MSG_FACE end +.global EventScript_Route16_CynthiasRecordPlayer +EventScript_Route16_CynthiasRecordPlayer: + msgbox gText_Route16_CynthiasRecordPlayer MSG_NORMAL + end + +.global EventScript_Route16_CynthiasSink +EventScript_Route16_CynthiasSink: + msgbox gText_Route16_CynthiasSink MSG_NORMAL + end + +.global EventScript_Route16_CynthiasTV +EventScript_Route16_CynthiasTV: + msgbox gText_Route16_CynthiasTV MSG_KEEPOPEN + signmsg + msgbox gText_Route16_RoxieMsg MSG_SIGN + end + +.global EventScript_Route16_OldGuy +EventScript_Route16_OldGuy: + checkflag 0x96C + if SET _goto EventScript_Route16_OldGuyAngry + msgbox gText_Route16_OldGuyInGatehouse MSG_FACE + end + +EventScript_Route16_OldGuyAngry: + msgbox gText_Route16_OldGuyInGatehouse_Angry MSG_FACE + end + +.global EventScript_Route16_LeftBinoculars +EventScript_Route16_LeftBinoculars: + msgbox gText_Route16_LeftBinoculars MSG_NORMAL + end + +.global EventScript_Route16_RightBinoculars +EventScript_Route16_RightBinoculars: + msgbox gText_Route16_RightBinoculars MSG_NORMAL + end + +.global EventScript_Route16_CyclingRoadClosed +EventScript_Route16_CyclingRoadClosed: + call BlockCyclingRoad_1 + call BlockCyclingRoad_2 + end + +.global EventScript_Route16_CyclingRoadClosed_WalkUp1 +EventScript_Route16_CyclingRoadClosed_WalkUp1: + call BlockCyclingRoad_1 + applymovement 0xFF WalkUp1 + waitmovement 0x0 + call BlockCyclingRoad_2 + end + +.global EventScript_Route16_CyclingRoadClosed_WalkUp2 +EventScript_Route16_CyclingRoadClosed_WalkUp2: + call BlockCyclingRoad_1 + applymovement 0xFF WalkUp2 + waitmovement 0x0 + call BlockCyclingRoad_2 + end + +BlockCyclingRoad_1: + lockall + setvar 0x4001 0x0 + msgbox gText_Route16_GuardStops MSG_KEEPOPEN + applymovement 0xFF LookUp + waitmovement 0x0 + return + +BlockCyclingRoad_2: + pause 0x7 + msgbox gText_Route16_DontComeInCyclingRoad MSG_NORMAL + applymovement 0xFF WalkRight + waitmovement 0x0 + releaseall + return + +WalkRight: + .byte walk_right + .byte 0xFE + +WalkUp1: + .byte walk_up + .byte 0xFE + +WalkUp2: + .byte walk_up + .byte walk_up + .byte 0xFE + LookLeft: .byte look_left .byte 0xFE diff --git a/eventscripts b/eventscripts index 6b2c56f5a..495cfbe02 100644 --- a/eventscripts +++ b/eventscripts @@ -176,8 +176,9 @@ tile 3 5 3 EventScript_VermilionCity_RivalDisappointJog tile 3 5 4 EventScript_VermilionCity_RivalDisappointJog tile 3 5 5 EventScript_VermilionCity_RivalAndFlynn -## Route 5 -sign 3 23 0 EventScript_Route6_IcePathSign +## Route 11 +npc 3 29 0 EventScript_Route11_SnorlaxRuinManiac +npc 3 29 1 EventScript_Route11_Snorlax ## Route 6 sign 3 24 0 EventScript_Route6_IcePathSign @@ -189,25 +190,6 @@ npc 3 24 4 EventScript_Route6_BugCatcherHorace npc 3 24 5 EventScript_Route6_YoungsterMaruyama npc 3 24 6 EventScript_Route6_DexnavExplainer -## Route 7 -npc 3 25 0 EventScript_Route7_InfielderDelbert - -## Route 7 -sign 3 25 0 EventScript_Route6_IcePathSign - -## Route 8 -sign 3 26 0 EventScript_Route6_IcePathSign - -## Route 11 -npc 3 29 0 EventScript_Route11_SnorlaxRuinManiac -npc 3 29 1 EventScript_Route11_Snorlax - -## Route 16 -sign 3 34 1 EventScript_Route16_CyclingRoadSign -npc 25 2 0 EventScript_Route16_Gatehouse_TimeReminder -npc 25 2 1 EventScript_Route16_Gatehouse_FuchsiaSad -npc 25 2 2 EventScript_Route16_Gatehouse_AthletesFoot - ## Iced Path map 1 31 gMapScripts_IcedPath_CheckHideTM97 sign 1 31 7 EventScript_IcedPath_DirectionsSign @@ -221,6 +203,10 @@ npc 1 31 4 EventScript_TM97 tile 1 31 0 EventScript_IcedPath_CheckVermilionGymCutscene tile 1 31 1 EventScript_IcedPath_CheckVermilionGymCutscene +## Route 7 +npc 3 25 0 EventScript_Route7_InfielderDelbert +sign 3 25 0 EventScript_Route6_IcePathSign + ## Celadon City map 3 6 gMapScripts_CeladonCitySibSprite_Outside sign 3 6 1 EventScript_CeladonCity_PrizeExchangeSign @@ -248,11 +234,6 @@ tile 3 6 0 EventScript_CeladonCity_SibEncounter1Start_1 tile 3 6 1 EventScript_CeladonCity_SibEncounter1Start_2 tile 3 6 2 EventScript_CeladonCity_SibEncounter1Start_3 tile 3 6 3 EventScript_CeladonCity_SibEncounter1Start_4 -map 10 0 gMapScripts_DeptStoreSibSprite_Floor1 -npc 10 0 0 EventScript_CeladonDept_Floor1CustomerService -npc 10 0 1 EventScript_CeladonDept_SherryBrandy_1F -npc 10 0 2 EventScript_CeladonDept_1FRocketBattlingSib -npc 10 0 3 EventScript_CeladonDept_BattlingRocket sign 10 7 0 EventScript_CeladonCity_CondominiumsInteriorSign sign 10 7 1 EventScript_CeladonCity_CondominiumsInteriorSign npc 10 7 0 EventScript_CeladonCity_Quilladin @@ -262,6 +243,7 @@ npc 10 7 3 EventScript_CeladonCity_Manager npc 10 9 0 EventScript_CeladonCity_GameFreakNPC_0 npc 10 9 2 EventScript_CeladonCity_GameFreakNPC_2 npc 10 9 3 EventScript_CeladonCity_GameFreakNPC_3 +npc 10 11 0 EventScript_CeladonCity_NoLongerKnowEverything map 10 12 gMapScripts_CeladonCitySibSprite_InsidePokeCenter npc 10 12 1 EventScript_CeladonCity_PokecenterRimeTrickGuy npc 10 12 2 EventScript_CeladonCity_PokecenterRime @@ -283,13 +265,65 @@ npc 10 17 2 EventScript_CeladonCity_IonoSoda npc 10 17 3 EventScript_CeladonCity_HomemadePickles npc 10 19 0 EventScript_CeladonCity_HotelMatron npc 10 19 1 EventScript_CeladonCity_ScaredCozyGuy -npc 10 19 2 EventScript_CeladonCity_HotelRotomi +@npc 10 19 2 EventScript_CeladonCity_HotelRotomi @briefly dummied out due to index issues between CFRU and DPE. Will fix later + +## Celadon Dept. Store +map 10 0 gMapScripts_DeptStore_Floor1 +map 10 1 gMapScripts_DeptStore_Floor2 +map 10 2 gMapScripts_DeptStore_Floor3 +map 10 3 gMapScripts_DeptStore_Floor4 +map 10 4 gMapScripts_DeptStore_Floor5 +map 10 5 gMapScripts_DeptStore_RoofEvent +npc 10 0 0 EventScript_CeladonDept_Floor1CustomerService +npc 10 0 1 EventScript_CeladonDept_SherryBrandy_1F +npc 10 0 2 EventScript_CeladonDept_1FRocketBattlingSib +npc 10 0 3 EventScript_CeladonDept_1FBattlingRocket +npc 10 0 4 EventScript_CeladonDeptStore_SibsPokemon +npc 10 0 5 EventScript_CeladonDeptStore_RocketsArctozolt +npc 10 0 6 EventScript_CeladonDept_Floor1_RegularNPC1 +npc 10 1 2 EventScript_CeladonDept_2FRocket_1 +npc 10 1 3 EventScript_CeladonDept_2FRocket_2 +npc 10 1 4 EventScript_CeladonDept_Floor2_RegularNPC1 +npc 10 1 5 EventScript_CeladonDept_Floor2_RegularNPC2 +tile 10 2 0 EventScript_CeladonDept_GavinsBigDebut1 +tile 10 2 1 EventScript_CeladonDept_GavinsBigDebut2 +npc 10 2 0 EventScript_CeladonDept_3FAttendant +npc 10 3 0 EventScript_CeladonDept_4FRocket_2 +npc 10 3 1 EventScript_CeladonDept_4FRocket_1 +npc 10 3 3 EventScript_CeladonDept_Floor4_RegularNPC1 +npc 10 4 0 EventScript_CeladonDept_5FRocket_1 +npc 10 4 1 EventScript_CeladonDept_5FRocket_2 +npc 10 4 4 EventScript_CeladonDept_SibChilling5F +npc 10 4 5 EventScript_CeladonDept_ShamedRocket +npc 10 5 6 EventScript_CeladonDept_Roof_RegularNPC1 + +## Route 16 +sign 3 34 1 EventScript_Route16_CyclingRoadSign +sign 25 0 0 EventScript_Route16_CynthiasRecordPlayer +sign 25 0 1 EventScript_Route16_CynthiasRecordPlayer +sign 25 0 2 EventScript_Route16_CynthiasSink +sign 25 0 3 EventScript_Route16_CynthiasSink +sign 25 0 4 EventScript_Route16_CynthiasTV +tile 25 1 2 EventScript_Route16_CyclingRoadClosed +tile 25 1 3 EventScript_Route16_CyclingRoadClosed +tile 25 1 8 EventScript_Route16_CyclingRoadClosed +tile 25 1 9 EventScript_Route16_CyclingRoadClosed_WalkUp1 +tile 25 1 10 EventScript_Route16_CyclingRoadClosed_WalkUp2 +npc 25 1 1 EventScript_Route16_OldGuy +npc 25 2 0 EventScript_Route16_Gatehouse_TimeReminder +npc 25 2 1 EventScript_Route16_Gatehouse_FuchsiaSad +npc 25 2 2 EventScript_Route16_Gatehouse_AthletesFoot +sign 25 2 0 EventScript_Route16_LeftBinoculars +sign 25 2 1 EventScript_Route16_RightBinoculars ## Cerulean City sign 3 3 0 EventScript_CeruleanCity_CitySign sign 3 3 1 EventScript_GymSign_Cerulean sign 3 3 3 EventScript_TrainerTips_Nuzlocke +## Route 5 +sign 3 23 0 EventScript_Route6_IcePathSign + ## Saffron guard tiles tile 17 1 0 Guard_LooksLeftMovesUp tile 17 1 1 Guard_LooksLeftMovesUp @@ -317,6 +351,9 @@ npc 14 9 6 EventScript_SaffronCity_ThrohRanger npc 14 9 7 EventScript_SaffronCity_Throh2 npc 14 9 8 EventScript_SaffronCity_ThrohGranny +## Route 8 +sign 3 26 0 EventScript_Route6_IcePathSign + ## Lavender Town sign 3 4 1 EventScript_LavenderTown_CitySign @@ -368,4 +405,4 @@ sign 3 16 0 EventScript_FiveIsland_Sign sign 3 17 0 EventScript_SixIsland_Sign ## Seven Island -sign 3 18 0 EventScript_SevenIsland_Sign \ No newline at end of file +sign 3 18 0 EventScript_SevenIsland_Sign diff --git a/graphics/trainer_sprites/g002Whisk.png b/graphics/trainer_sprites/g002Whisk.png index f26231f821d6a22a8d1657fd14fb2987ed68130f..b8f9ec0860ec0a52722bdc7574903c6a2f0783f1 100644 GIT binary patch delta 1070 zcmV+}1kwA*O}7Y;7=H)@0001;w}I>c00E9^LqkwWLqi~Na&Km7Y-IodD3N`UyGz4R z6vn?k#3B_D9aK7GsDffa6vV-)N{e8jv=yv6nB4RsBxy)eTpR`0f`jPdYtTPHbaikQ z1VIr*+}wRFQsTKupha3QT+T0F&iT0ayMX^(VX7IN094H~GJnaqu$*5JI^Ph)AbK&1 zfXGZel}+T(c6~p<$LoEJd$sRtxw_?o$pD`~oM5_P5toUlH!Yp>5ph2&i!$*A@wh<; zB!1<(c}S)7`5ox08m1zv0006gNklcvI#{vYBfLXWv`3hK2fK>n* zN{Ikey=n;mT!5+f-q95j0D!5ZKcD)?550I8K!4%)O^)Z2CFs0R?#ub*szJok=g~>@ z_$MJTDrn)=(FUpuK!O2MVgX;Tl0iEj{Xc}{2D}NC1pe#Re<2jq6ana18o@vj{Wbxs z0s(=pCUe{7G(t_7;-AW!1aqZZ3oxmm z>VK8vwg<8N=aklXQ#av&SW#|UI02GdV@pLAn1y*;KNnyVY1Wg4dL0QDV8RN~*ibDU zhkj*n0oYaifa5P9mv#a?`UTh)AnQzoXA+nJ1x(SqkuQ$p?GbpKCD0V)$T_FVH;2Ko zxLg3!=S)C8v>>+$7a%P_(L;h`BH|msvVY(MFze$D(7AlO23Y!u+!9u#>{*~sfKbM} zsiC#(Y>IRBGr<+5_!`<829~jMRp3I)#lZ)#yI|8CQkANGwK`j>-aE3Eg$203Ik*V8 z7N#J8A@x@PuyYOQ7oi%!Tfz%aM7Xix?nYt&+il`~3WRRf`QX!S+Z`~W`$NWg>L>oE ojxYOVjlg3I&P}$S0tRlzA3%;5f_p%WZvX%Q07*qoM6N<$f`s?+)&Kwi literal 9928 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 diff --git a/graphics/trainer_sprites/g069JessieJames.png b/graphics/trainer_sprites/g069JessieJames.png index 3bb6c535648cdb980a479b34f600b5c221d3d2bb..e51754eb698db45eeb74661462dbb6ca0262f40a 100644 GIT binary patch delta 981 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 S&-WqK0m||ka&Kg;!u~H-r8y}8 diff --git a/include/constants/flags.h b/include/constants/flags.h index cb94c776d..65607b117 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -78,10 +78,12 @@ #define FLAG_SIB_CELADON_HIDE 0x966 //Person ID - Toggles visibility of sibling in Celadon City #define FLAG_DEPTROCKETS_CELADON_HIDE 0x967 //Person ID - Toggles visibility of Department Store guard Rockets -#define FLAG_DEPTSIB_INTERIOR_HIDE 0x968 //Person ID - Sib on first floor of Department Store toggle -#define FLAG_DEPTROCKETS_INTERIOR_HIDE 0x969 //Person ID - Rockets in all of Department Store +#define FLAG_DEPTSIB_INTERIOR_HIDE 0x968 //Person ID - Sib on first floor of Department Store toggle. +#define FLAG_DEPTSTORE_ISABNORMAL 0x969 //Person ID - hides the Dept. Store employees and customers. Cleared after delivering energy drink; indicates that the Department Store is back to being a store #define FLAG_SIB_CELADONPC_HIDE 0x96A //Person ID - Sib in Celadon Pokemon Center during the brief window where they heal after fight #1 - +#define FLAG_SIB_CELADONDEPT_ROOF 0x96B //Person ID - Controls Sib, Pelipper and Prize Master on Celadon Roof +#define FLAG_CELADONDEPT_ROOF2 0x96C //Person ID - Controls Jessie, James, and Chie on Celadon Roof, ends the Rocket event, indicates townspeople hate you +#define FLAG_CELADON_GYMOPEN 0x96D //Person ID - controls gym entrance woman, stops 0x969 from being set in Dept. Store so the regular shopkeepers & customers are shown #define FLAG_STARTER_CHOSEN 0x990 //Chose starter diff --git a/include/constants/items.h b/include/constants/items.h index ca657d3cd..26f7b8682 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -370,7 +370,7 @@ #define ITEM_TEACHY_TV 366 #define ITEM_TRI_PASS 367 #define ITEM_RAINBOW_PASS 368 -#define ITEM_TEA 369 +#define ITEM_ENERGY_DRINK 369 #define ITEM_MYSTIC_TICKET 370 #define ITEM_AURORA_TICKET 371 #define ITEM_POWDER_JAR 372 diff --git a/include/constants/opponents.h b/include/constants/opponents.h index 5c04c90d7..f1108c4b4 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -20,13 +20,19 @@ // Celadon Dept Store - Rocket Event #define TRAINER_DEPTSTORE_ROCKETGRUNT_1F 22 - -//Rival Battle 1 +#define TRAINER_DEPTSTORE_ROCKETGRUNT_2F_1 23 +#define TRAINER_DEPTSTORE_ROCKETGRUNT_2F_2 24 +#define TRAINER_DEPTSTORE_ROCKETGRUNT_4F_1 25 +#define TRAINER_DEPTSTORE_ROCKETGRUNT_4F_2 26 +#define TRAINER_DEPTSTORE_ROCKETGRUNT_5F_1 27 +#define TRAINER_DEPTSTORE_ROCKETGRUNT_5F_2 28 + +// Rival Battle 1 #define TRAINER_RIVALBATTLE1_PLAYER_CHOSE_RELICANTH 13 #define TRAINER_RIVALBATTLE1_PLAYER_CHOSE_SIGILYPH 14 #define TRAINER_RIVALBATTLE1_PLAYER_CHOSE_PASSIMIAN 15 -//Sibling Battle 1 +// Sibling Battle 1 #define TRAINER_BRANDYBATTLE1_PLAYER_CHOSE_RELICANTH 16 #define TRAINER_BRANDYBATTLE1_PLAYER_CHOSE_SIGILYPH 17 #define TRAINER_BRANDYBATTLE1_PLAYER_CHOSE_PASSIMIAN 18 @@ -34,5 +40,10 @@ #define TRAINER_SHERRYBATTLE1_PLAYER_CHOSE_SIGILYPH 20 #define TRAINER_SHERRYBATTLE1_PLAYER_CHOSE_PASSIMIAN 21 -//Garchomp Gavin +// Garchomp Gavin #define TRAINER_CELADON_GARCHOMPGAVIN1 8 + +// Jessie & James +#define TRAINER_CELADON_JESSIEJAMES1 29 +#define TRAINER_DEPTSTORE_SHERRYPARTNER 30 +#define TRAINER_DEPTSTORE_BRANDYPARTNER 31 diff --git a/include/constants/songs.h b/include/constants/songs.h index bcfdaa97d..3e804967f 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -19,18 +19,29 @@ #define BGM_BATTLE_LEGENDARY_BIRDS 0x154 #define BGM_BATTLE_MEWTWO 0x155 +//New Battle Music + +#define BGM_BATTLE_ROCKET_GRUNT 0x167 +#define BGM_BATTLE_RAINBOW_ROCKET 0x169 #define BGM_BATTLE_RSE_E4 0x19D #define BGM_BATTLE_SQUEETZ 0x1A0 #define BGM_VICTORY_WILD_POKE 0x137 #define BGM_VICTORY_GYM 0x138 +//Day & Night music + #define BGM_POKEMONCENTER 0x12F #define BGM_POKEMONCENTER_NIGHT 0x158 #define BGM_NETCENTER 0x148 #define BGM_POKEMART 0x1AE #define BGM_POKEMART_NIGHT 0x15C -#define BGM_POKEMART_MORN 0x15E + +//For during Cerulean Dept. Store takeover event + +#define BGM_POKEMART_DPP 0x15F +#define BGM_DD_INTROAREA 0x164 +#define BGM_DD_METALCITY 0x166 #define BGM_RANDOM_BATTLE_MUSIC 0xFEFE diff --git a/include/constants/vars.h b/include/constants/vars.h index ac6c26bae..fc2e9dc51 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -187,9 +187,9 @@ #define VAR_0x408C 0x408C // Used for rival's movements in Vermilion City #define VAR_0x408D 0x408D // Used for sibling battle in Celadon City -#define VAR_0x408E 0x408E -#define VAR_0x408F 0x408F -#define VAR_0x4090 0x4090 +#define VAR_0x408E 0x408E // Used for blocking elevator in Celadon Dept. Store during Rocket event +#define VAR_0x408F 0x408F // Used for triggering Garchomp Gavin in Celadon Dept. Store +#define VAR_0x4090 0x4090 // Dept Store Rockets roof scene #define VAR_0x4091 0x4091 #define VAR_0x4092 0x4092 #define VAR_0x4093 0x4093 diff --git a/scripts/string.py b/scripts/string.py index 64d6cf343..00eb14db6 100644 --- a/scripts/string.py +++ b/scripts/string.py @@ -19,6 +19,8 @@ "ATTACKER_ABILITY": ["FD", "18"], "TARGET_ABILITY": ["FD", "19"], "SCRIPTING_BANK_ABILITY": ["FD", "1A"], + "TRAINER1_CLASS": ["FD", "1C"], + "TRAINER1_NAME": ["FD", "1D"], "PLAYER_NAME": ["FD", "23"], "TARGET_NAME": ["FD", "3B"], "TARGET_PARTNER_NAME": ["FD", "3C"], @@ -29,6 +31,13 @@ "BUFFER2": ["FD", "03"], "BUFFER3": ["FD", "04"], "RIVAL": ["FD", "06"], + + "ARROW_UP": ["79"], + "ARROW_DOWN": ["7A"], + "ARROW_LEFT": ["7B"], + "ARROW_RIGHT": ["7C"], + + "MAIN_COLOUR": ["FC", "01"], # Takes 1 byte "WHITE": ["FC", "01", "01"], "BLACK": ["FC", "01", "02"], "GRAY": ["FC", "01", "03"], @@ -38,20 +47,20 @@ "LIGHT_GREEN": ["FC", "01", "07"], "BLUE": ["FC", "01", "08"], "LIGHT_BLUE": ["FC", "01", "09"], - "MAIN_COLOUR": ["FC", "01"], + "HIGHLIGHT": ["FC", "02"], # Same as MAIN_COLOUR "SHADOW_COLOUR": ["FC", "03"], - - "ARROW_UP": ["79"], - "ARROW_DOWN": ["7A"], - "ARROW_LEFT": ["7B"], - "ARROW_RIGHT": ["7C"], - + "COLOR_HIGHLIGHT_SHADOW": ["FC", "04"], # Takes 3 bytes + "PALETTE": ["FC", "05"], "SHRINK": ["FC", "06", "00"], + "RESET_SIZE": ["FC", "07"], "PAUSE": ["FC", "08"], "PAUSE_UNTIL_PRESS": ["FC", "09"], + "WAIT_SE": ["FC", "0A"], "PLAY_BGM": ["FC", "0B"], "ESCAPE": ["FC", "0C"], - "SHIFT_TEXT": ["FC", "0D"], + "SHIFT_RIGHT": ["FC", "0D"], + "SHIFT_DOWN": ["FC", "0E"], + "FILL_WINDOW": ["FC", "0F"], "PLAY_SE": ["FC", "10"], "CLEAR": ["FC", "11"], "SKIP": ["FC", "12"], @@ -73,12 +82,85 @@ "DPAD_UP_DOWN": ["F8", "0A"], "DPAD_LEFT_RIGHT": ["F8", "0B"], "DPAD": ["F8", "0C"], + + "UP_ARROW_2": ["F9", "00"], + "DOWN_ARROW_2": ["F9", "01"], + "LEFT_ARROW_2": ["F9", "02"], + "RIGHT_ARROW_2": ["F9", "03"], + "PLUS": ["F9", "04"], + "LV_2": ["F9", "05"], + "PP": ["F9", "06"], + "ID": ["F9", "07"], + "NO": ["F9", "08"], + "UNDERSCORE": ["F9", "09"], + "CIRCLE_1": ["F9", "0A"], + "CIRCLE_2": ["F9", "0B"], + "CIRCLE_3": ["F9", "0C"], + "CIRCLE_4": ["F9", "0D"], + "CIRCLE_5": ["F9", "0E"], + "CIRCLE_6": ["F9", "0F"], + "CIRCLE_7": ["F9", "10"], + "CIRCLE_8": ["F9", "11"], + "CIRCLE_9": ["F9", "12"], + "LEFT_PAREN": ["F9", "13"], + "RIGHT_PAREN": ["F9", "14"], + "CIRCLE_DOT": ["F9", "15"], + "TRIANGLE": ["F9", "16"], + "BIG_MULT_X": ["F9", "17"], + + "EMOJI_UNDERSCORE": ["F9", "D0"], + "EMOJI_PIPE": ["F9", "D1"], + "EMOJI_HIGHBAR": ["F9", "D2"], + "EMOJI_TILDE": ["F9", "D3"], + "EMOJI_LEFT_PAREN": ["F9", "D4"], + "EMOJI_RIGHT_PAREN": ["F9", "D5"], + "EMOJI_UNION": ["F9", "D6"], + "EMOJI_GREATER_THAN": ["F9", "D7"], + "EMOJI_LEFT_EYE": ["F9", "D8"], + "EMOJI_RIGHT_EYE": ["F9", "D9"], + "EMOJI_AT": ["F9", "DA"], + "EMOJI_SEMICOLON": ["F9", "DB"], + "EMOJI_PLUS": ["F9", "DC"], + "EMOJI_MINUS": ["F9", "DD"], + "EMOJI_EQUALS": ["F9", "DE"], + "EMOJI_SPIRAL": ["F9", "DF"], + "EMOJI_TONGUE": ["F9", "E0"], + "EMOJI_TRIANGLE_OUTLINE": ["F9", "E1"], + "EMOJI_ACUTE": ["F9", "E2"], + "EMOJI_GRAVE": ["F9", "E3"], + "EMOJI_CIRCLE": ["F9", "E4"], + "EMOJI_TRIANGLE": ["F9", "E5"], + "EMOJI_SQUARE": ["F9", "E6"], + "EMOJI_HEART": ["F9", "E7"], + "EMOJI_MOON": ["F9", "E8"], + "EMOJI_NOTE": ["F9", "E9"], + "EMOJI_BALL": ["F9", "EA"], + "EMOJI_BOLT": ["F9", "EB"], + "EMOJI_LEAF": ["F9", "EC"], + "EMOJI_FIRE": ["F9", "ED"], + "EMOJI_WATER": ["F9", "EE"], + "EMOJI_LEFT_FIST": ["F9", "EF"], + "EMOJI_RIGHT_FIST": ["F9", "F0"], + "EMOJI_BIGWHEEL": ["F9", "F1"], + "EMOJI_SMALLWHEEL": ["F9", "F2"], + "EMOJI_SPHERE": ["F9", "F3"], + "EMOJI_IRRITATED": ["F9", "F4"], + "EMOJI_MISCHIEVOUS": ["F9", "F5"], + "EMOJI_HAPPY": ["F9", "F6"], + "EMOJI_ANGRY": ["F9", "F7"], + "EMOJI_SURPRISED": ["F9", "F8"], + "EMOJI_BIGSMILE": ["F9", "F9"], + "EMOJI_EVIL": ["F9", "FA"], + "EMOJI_TIRED": ["F9", "FB"], + "EMOJI_NEUTRAL": ["F9", "FC"], + "EMOJI_SHOCKED": ["F9", "FD"], + "EMOJI_BIGANGER": ["F9", "FE"], } def StringFileConverter(fileName: str): stringToWrite = ".thumb\n.text\n.align 2\n\n" - with open(fileName, 'r', encoding="ISO-8859-1") as file: + with open(fileName, 'r', encoding="utf-8") as file: maxLength = 0 fillFF = False readingState = 0 @@ -208,7 +290,7 @@ def ProcessString(string: str, lineNum: int, maxLength=0, fillWithFF=False) -> s def PokeByteTableMaker(): dictionary = {} - with open(CharMap, 'r', encoding="ISO-8859-1") as file: + with open(CharMap, 'r', encoding="utf-8") as file: for line in file: if line.strip() != "/FF" and line.strip() != "": if line[2] == '=' and line[3] != "": diff --git a/src/Tables/music_tables.c b/src/Tables/music_tables.c index 8c99f9856..93faf635d 100644 --- a/src/Tables/music_tables.c +++ b/src/Tables/music_tables.c @@ -74,6 +74,8 @@ const u16 gClassBasedTrainerEncounterBGM[NUM_TRAINER_CLASSES] = [CLASS_RUIN_MANIAC] = BGM_EYE_BOY, [CLASS_LADY] = BGM_EYE_GIRL, [CLASS_PAINTER] = BGM_EYE_GIRL, + [CLASS_ROCKET_GRUNT] = BGM_EYE_CREEPY, + [CLASS_INFIELDER] = BGM_EYE_BOY, }; #endif @@ -82,6 +84,8 @@ const u16 gClassBasedBattleBGM[NUM_TRAINER_CLASSES] = [CLASS_CHAMPION] = BGM_BATTLE_CHAMPION, [CLASS_GYM_LEADER] = BGM_BATTLE_GYM_LEADER, [CLASS_ELITE_FOUR] = BGM_BATTLE_GYM_LEADER, + [CLASS_ROCKET_GRUNT] = BGM_BATTLE_ROCKET_GRUNT, + [CLASS_ROCKET_DUO] = BGM_BATTLE_RAINBOW_ROCKET, }; const u16 gWildSpeciesBasedBattleBGM[] = diff --git a/src/Tables/trainer_tables.c b/src/Tables/trainer_tables.c index 4f066c34d..df34db5c1 100644 --- a/src/Tables/trainer_tables.c +++ b/src/Tables/trainer_tables.c @@ -102,42 +102,6 @@ const struct TrainerMonNoItemDefaultMoves sParty_IcedPathSwimmerFrancine[] = { }, }; -const struct TrainerMonNoItemDefaultMoves sParty_IcedPathSwimmerFrancine_2[] = { - { - .iv = 6, - .lvl = 15, - .species = SPECIES_PSYDUCK, - }, - { - .iv = 3, - .lvl = 15, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 19, - .lvl = 17, - .species = SPECIES_LUVDISC, - }, -}; - -const struct TrainerMonNoItemDefaultMoves sParty_IcedPathSwimmerFrancine_3[] = { - { - .iv = 6, - .lvl = 36, - .species = SPECIES_GOLDUCK, - }, - { - .iv = 3, - .lvl = 38, - .species = SPECIES_SEAKING, - }, - { - .iv = 3, - .lvl = 39, - .species = SPECIES_LUVDISC, - }, -}; - const struct TrainerMonNoItemDefaultMoves sParty_IcedPathCamperTroy[] = { { .iv = 0, @@ -161,21 +125,6 @@ const struct TrainerMonNoItemCustomMoves sParty_IcedPathCamperRoss[] = { } }; -const struct TrainerMonNoItemCustomMoves sParty_IcedPathCamperRoss_2[] = { - { - .iv = 20, - .lvl = 47, - .species = SPECIES_KECLEON, - .moves = { - MOVE_FAKEOUT, - MOVE_ICEBEAM, - MOVE_SHADOWSNEAK, - MOVE_CAMOUFLAGE, - }, - .ability = 1, - } -}; - //Route 7 const struct TrainerMonNoItemDefaultMoves sParty_Route7InfielderDelbert[] = { @@ -202,7 +151,7 @@ const struct TrainerMonNoItemDefaultMoves sParty_BrandyBattle1_PlayerChoseRelica { .iv = 5, .lvl = 8, - .species = SPECIES_NICKIT, + .species = SPECIES_CHINGLING, }, }; @@ -215,7 +164,7 @@ const struct TrainerMonNoItemDefaultMoves sParty_BrandyBattle1_PlayerChoseSigily { .iv = 5, .lvl = 8, - .species = SPECIES_NICKIT, + .species = SPECIES_CHINGLING, }, }; @@ -228,7 +177,7 @@ const struct TrainerMonNoItemDefaultMoves sParty_BrandyBattle1_PlayerChosePassim { .iv = 5, .lvl = 8, - .species = SPECIES_NICKIT, + .species = SPECIES_CHINGLING, }, }; @@ -330,12 +279,140 @@ const struct TrainerMonNoItemCustomMoves sParty_CeladonDept_Rocket1F[] = { } }; +const struct TrainerMonNoItemDefaultMoves sParty_CeladonDept_Rocket2F_1[] = { + { + .iv = 15, + .lvl = 8, + .species = SPECIES_CHARMANDER, + }, + { + .iv = 15, + .lvl = 8, + .species = SPECIES_BULBASAUR, + }, + { + .iv = 5, + .lvl = 8, + .species = SPECIES_SQUIRTLE, + }, +}; + +const struct TrainerMonNoItemDefaultMoves sParty_CeladonDept_Rocket2F_2[] = { + { + .iv = 15, + .lvl = 10, + .species = SPECIES_PIPLUP, + }, + { + .iv = 15, + .lvl = 10, + .species = SPECIES_TEPIG, + }, +}; + +const struct TrainerMonNoItemCustomMoves sParty_CeladonDept_Rocket4F_1[] = { + { + .iv = 20, + .lvl = 8, + .species = SPECIES_GRIMER_A, + .moves = { + MOVE_SNARL, + MOVE_HARDEN, + MOVE_ACIDSPRAY, + MOVE_MEANLOOK, + }, + .ability = 0, + }, + { + .iv = 20, + .lvl = 7, + .species = SPECIES_SNEASEL, + .moves = { + MOVE_SNARL, + MOVE_QUICKATTACK, + MOVE_TAUNT, + MOVE_METALCLAW, + }, + .ability = 0, + } +}; + +const struct TrainerMonNoItemCustomMoves sParty_CeladonDept_Rocket4F_2[] = { + { + .iv = 14, + .lvl = 9, + .species = SPECIES_CARVANHA, + .moves = { + MOVE_AQUAJET, + MOVE_POISONFANG, + MOVE_FOCUSENERGY, + MOVE_SNARL, + }, + .ability = 0, + }, + { + .iv = 16, + .lvl = 8, + .species = SPECIES_CARVANHA, + .moves = { + MOVE_POISONFANG, + MOVE_PROTECT, + MOVE_LEER, + MOVE_SNARL, + }, + .ability = 0, + }, +}; + + +const struct TrainerMonNoItemCustomMoves sParty_CeladonDept_Rocket5F_1[] = { + { + .iv = 13, + .lvl = 8, + .species = SPECIES_LITLEO, + .moves = { + MOVE_TACKLE, + MOVE_EMBER, + MOVE_WORKUP, + MOVE_SNARL, + }, + .ability = 0, + }, + { + .iv = 9, + .lvl = 6, + .species = SPECIES_SPIRITOMB, + .moves = { + MOVE_SNARL, + MOVE_SHADOWSNEAK, + MOVE_CURSE, + MOVE_SPITE, + }, + .ability = 0, + } +}; + +const struct TrainerMonNoItemCustomMoves sParty_CeladonDept_Rocket5F_2[] = { + { + .iv = 17, + .lvl = 8, + .species = SPECIES_ABSOL, + .moves = { + MOVE_PERISHSONG, + MOVE_QUICKATTACK, + MOVE_FLASH, + MOVE_SNARL, + }, + .ability = 0, + }, +}; + // Celadon Dept Store - Garchomp Gavin 1 const struct TrainerMonNoItemCustomMoves sParty_CeladonDept_GarchompGavin1[] = { { .iv = 31, - .lvl = 7, + .lvl = 11, .species = SPECIES_GIBLE, .moves = { MOVE_DRAGONBREATH, @@ -347,6 +424,37 @@ const struct TrainerMonNoItemCustomMoves sParty_CeladonDept_GarchompGavin1[] = { } }; +// Celadon Dept Store - Jessie & James 1 + +const struct TrainerMonNoItemDefaultMoves sParty_CeladonDept_JessieJames1[] = { + { + .iv = 1, + .lvl = 7, + .species = SPECIES_ZUBAT, + }, + { + .iv = 1, + .lvl = 7, + .species = SPECIES_RATTATA, + } +}; + +const struct TrainerMonNoItemCustomMoves sParty_CeladonDeptRockets_SibPartner[] = { + { + .iv = 5, + .lvl = 14, + .species = SPECIES_CHINGLING, + .moves = { + MOVE_WRAP, + MOVE_YAWN, + MOVE_CONFUSION, + MOVE_ASTONISH, + }, + .ability = 0, + } +}; + + #define NO_NAME {_END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE} const struct Trainer gTrainers[] = { @@ -437,7 +545,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = sParty_BrandyBattle1_PlayerChosePassimian} }, - [TRAINER_SHERRYBATTLE1_PLAYER_CHOSE_RELICANTH] = { + [TRAINER_SHERRYBATTLE1_PLAYER_CHOSE_RELICANTH] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER, .encounterMusic = TRAINER_ENCOUNTER_MUSIC_MALE, @@ -627,6 +735,84 @@ const struct Trainer gTrainers[] = { .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, .partySize = NELEMS(sParty_CeladonDept_Rocket1F), .party = {.NoItemCustomMoves = sParty_CeladonDept_Rocket1F} + }, + + [TRAINER_DEPTSTORE_ROCKETGRUNT_2F_1] { + .partyFlags = 0, + .trainerClass = CLASS_ROCKET_GRUNT, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_A, + .trainerName = {_J, _e, _r, _e, _m, _y, _END}, + .items = {}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, + .partySize = NELEMS(sParty_CeladonDept_Rocket2F_1), + .party = {.NoItemDefaultMoves = sParty_CeladonDept_Rocket2F_1} + }, + + [TRAINER_DEPTSTORE_ROCKETGRUNT_2F_2] { + .partyFlags = 0, + .trainerClass = CLASS_ROCKET_GRUNT, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_A, + .trainerName = {_M, _o, _n, _t, _y, _END}, + .items = {}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, + .partySize = NELEMS(sParty_CeladonDept_Rocket2F_2), + .party = {.NoItemDefaultMoves = sParty_CeladonDept_Rocket2F_2} + }, + + [TRAINER_DEPTSTORE_ROCKETGRUNT_4F_1] { + .partyFlags = PARTY_FLAG_CUSTOM_MOVES, + .trainerClass = CLASS_ROCKET_GRUNT, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_B, + .trainerName = {_A, _l, _y, _END}, + .items = {}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, + .partySize = NELEMS(sParty_CeladonDept_Rocket4F_1), + .party = {.NoItemCustomMoves = sParty_CeladonDept_Rocket4F_1} + }, + + [TRAINER_DEPTSTORE_ROCKETGRUNT_4F_2] { + .partyFlags = PARTY_FLAG_CUSTOM_MOVES, + .trainerClass = CLASS_ROCKET_GRUNT, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_A, + .trainerName = {_B, _r, _a, _m, _END}, + .items = {}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_CHECK_GOOD_MOVE, + .partySize = NELEMS(sParty_CeladonDept_Rocket4F_2), + .party = {.NoItemCustomMoves = sParty_CeladonDept_Rocket4F_2} + }, + + [TRAINER_DEPTSTORE_ROCKETGRUNT_5F_1] { + .partyFlags = PARTY_FLAG_CUSTOM_MOVES, + .trainerClass = CLASS_ROCKET_GRUNT, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_A, + .trainerName = {_D, _r, _e, _w, _END}, + .items = {}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, + .partySize = NELEMS(sParty_CeladonDept_Rocket5F_1), + .party = {.NoItemCustomMoves = sParty_CeladonDept_Rocket5F_1} + }, + + [TRAINER_DEPTSTORE_ROCKETGRUNT_5F_2] { + .partyFlags = PARTY_FLAG_CUSTOM_MOVES, + .trainerClass = CLASS_ROCKET_GRUNT, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_A, + .trainerName = {_Z, _i, _n, _o, _v, _y, _END}, + .items = {}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, + .partySize = NELEMS(sParty_CeladonDept_Rocket5F_2), + .party = {.NoItemCustomMoves = sParty_CeladonDept_Rocket5F_2} }, // Celadon Dept Store - Garchomp Gavin @@ -642,5 +828,46 @@ const struct Trainer gTrainers[] = { .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_CHECK_GOOD_MOVE, .partySize = NELEMS(sParty_CeladonDept_GarchompGavin1), .party = {.NoItemCustomMoves = sParty_CeladonDept_GarchompGavin1} + }, + + // Celadon Dept Store - Jessie & James + + [TRAINER_CELADON_JESSIEJAMES1] = { + .partyFlags = 0, + .trainerClass = CLASS_ROCKET_DUO, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_JESSIE_JAMES, + .trainerName = {_J, _e, _s, _s, _i, _e, _J, _a, _m, _e, _s, _END}, + .items = {}, + .doubleBattle = TRUE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_CHECK_GOOD_MOVE, + .partySize = NELEMS(sParty_CeladonDept_JessieJames1), + .party = {.NoItemDefaultMoves = sParty_CeladonDept_JessieJames1} + }, + + [TRAINER_DEPTSTORE_SHERRYPARTNER] = { + .partyFlags = PARTY_FLAG_CUSTOM_MOVES, + .trainerClass = CLASS_PKMN_TRAINER, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SHERRY, + .trainerName = {_S, _h, _e, _r, _r, _y, _END}, + .items = {}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_CHECK_GOOD_MOVE, + .partySize = NELEMS(sParty_CeladonDeptRockets_SibPartner), + .party = {.NoItemCustomMoves = sParty_CeladonDeptRockets_SibPartner} + }, + + [TRAINER_DEPTSTORE_BRANDYPARTNER] = { + .partyFlags = PARTY_FLAG_CUSTOM_MOVES, + .trainerClass = CLASS_PKMN_TRAINER, + .encounterMusic = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRANDY, + .trainerName = {_B, _r, _a, _n, _d, _y, _END}, + .items = {}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_SEMI_SMART | AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_CHECK_GOOD_MOVE, + .partySize = NELEMS(sParty_CeladonDeptRockets_SibPartner), + .party = {.NoItemCustomMoves = sParty_CeladonDeptRockets_SibPartner} }, }; diff --git a/src/Tables/wild_encounter_tables.c b/src/Tables/wild_encounter_tables.c index 46f966b73..c8692ae95 100644 --- a/src/Tables/wild_encounter_tables.c +++ b/src/Tables/wild_encounter_tables.c @@ -168,7 +168,7 @@ const struct WildPokemonInfo gCeladonCity_LandMonsInfoNight = {21, gCeladonCity_ const struct WildPokemon gCeladonCity_WaterMons[] = { {20, 23, SPECIES_LOTAD}, - {10, 20, SPECIES_DUCKLETT}, + {10, 20, SPECIES_CHEWTLE}, {20, 25, SPECIES_DEWPIDER}, {20, 23, SPECIES_PSYDUCK}, {21, 27, SPECIES_LOTAD}, @@ -178,11 +178,11 @@ const struct WildPokemonInfo gCeladonCity_WaterMonsInfo = {4, gCeladonCity_Water const struct WildPokemon gCeladonCity_WaterMonsNight[] = { - {20, 27, SPECIES_LOTAD}, + {20, 27, SPECIES_CHEWTLE}, {10, 20, SPECIES_DEWPIDER}, {20, 25, SPECIES_DEWPIDER}, {20, 23, SPECIES_PSYDUCK}, - {21, 28, SPECIES_DUCKLETT}, + {21, 28, SPECIES_LOTAD}, }; const struct WildPokemonInfo gCeladonCity_WaterMonsInfoNight = {4, gCeladonCity_WaterMonsNight}; @@ -225,9 +225,9 @@ const struct WildPokemon gRoute6_LandMonsMorning[] = { {3, 6, SPECIES_PIDGEY}, {3, 4, SPECIES_ZIGZAGOON}, - {1, 5, SPECIES_WINGULL}, + {1, 5, SPECIES_DUCKLETT}, {3, 4, SPECIES_YAMPER}, - {2, 3, SPECIES_CRAMORANT}, + {2, 3, SPECIES_SURSKIT}, {1, 2, SPECIES_SWIRLIX}, {1, 3, SPECIES_CHINGLING}, {3, 5, SPECIES_SWIRLIX}, @@ -241,9 +241,9 @@ const struct WildPokemonInfo gRoute6_LandMonsInfoMorning = {21, gRoute6_LandMons const struct WildPokemon gRoute6_LandMonsDay[] = { - {3, 6, SPECIES_CRAMORANT}, + {3, 6, SPECIES_SURSKIT}, {3, 4, SPECIES_YAMPER}, - {1, 5, SPECIES_WINGULL}, + {1, 5, SPECIES_DUCKLETT}, {2, 3, SPECIES_ZIGZAGOON}, {2, 3, SPECIES_PIDGEY}, {1, 2, SPECIES_SWIRLIX}, @@ -264,13 +264,13 @@ const struct WildPokemon gRoute6_LandMonsEvening[] = {3, 5, SPECIES_CHINGLING}, {4, 4, SPECIES_YAMPER}, {3, 6, SPECIES_SNUBBULL}, - {2, 3, SPECIES_CRAMORANT}, + {2, 3, SPECIES_SURSKIT}, {1, 3, SPECIES_SWIRLIX}, {2, 3, SPECIES_IGGLYBUFF}, - {1, 3, SPECIES_WINGULL}, + {1, 3, SPECIES_DUCKLETT}, {1, 4, SPECIES_PATRAT}, {4, 4, SPECIES_ZIGZAGOON_G}, - {5, 6, SPECIES_CRAMORANT}, + {5, 6, SPECIES_SURSKIT}, }; const struct WildPokemonInfo gRoute6_LandMonsInfoEvening = {21, gRoute6_LandMonsEvening}; @@ -283,12 +283,12 @@ const struct WildPokemon gRoute6_LandMonsNight[] = {2, 5, SPECIES_PATRAT}, {3, 5, SPECIES_CHINGLING}, {2, 3, SPECIES_SNUBBULL}, - {1, 3, SPECIES_CRAMORANT}, + {1, 3, SPECIES_SURSKIT}, {1, 3, SPECIES_YAMPER}, {1, 3, SPECIES_PIDGEY}, {3, 3, SPECIES_ZIGZAGOON}, {1, 2, SPECIES_SWIRLIX}, - {1, 3, SPECIES_WINGULL}, + {1, 3, SPECIES_DUCKLETT}, }; const struct WildPokemonInfo gRoute6_LandMonsInfoNight = {21, gRoute6_LandMonsNight}; @@ -296,9 +296,9 @@ const struct WildPokemonInfo gRoute6_LandMonsInfoNight = {21, gRoute6_LandMonsNi const struct WildPokemon gRoute6_WaterMons[] = { {20, 30, SPECIES_PSYDUCK}, - {10, 20, SPECIES_WINGULL}, - {20, 25, SPECIES_LOTAD}, - {5, 10, SPECIES_DEWPIDER}, + {20, 23, SPECIES_DUCKLETT}, + {20, 25, SPECIES_SURSKIT}, + {20, 22, SPECIES_DEWPIDER}, {10, 27, SPECIES_SWIRLIX}, }; @@ -410,6 +410,80 @@ const struct WildPokemon gRoute7_LandMonsNight[] = const struct WildPokemonInfo gRoute7_LandMonsInfoNight = {23, gRoute7_LandMonsNight}; +// Route 16 + +const struct WildPokemon gRoute16_LandMonsMorning[] = +{ + {3, 7, SPECIES_CUTIEFLY}, + {5, 6, SPECIES_CHINGLING}, + {5, 6, SPECIES_SHINX}, + {6, 6, SPECIES_SLUGMA}, + {5, 6, SPECIES_MUNCHLAX}, + {4, 6, SPECIES_PLUSLE}, + {4, 6, SPECIES_MINUN}, + {3, 6, SPECIES_SKWOVET}, + {3, 6, SPECIES_SKWOVET}, + {4, 4, SPECIES_IMPIDIMP}, + {5, 9, SPECIES_CHINGLING}, + {4, 4, SPECIES_MURKROW}, +}; + +const struct WildPokemonInfo gRoute16_LandMonsInfoMorning = {21, gRoute16_LandMonsMorning}; + +const struct WildPokemon gRoute16_LandMonsDay[] = +{ + {3, 6, SPECIES_MUNCHLAX}, + {5, 6, SPECIES_SKWOVET}, + {5, 6, SPECIES_SHINX}, + {6, 6, SPECIES_SKWOVET}, + {5, 6, SPECIES_CUTIEFLY}, + {4, 6, SPECIES_PLUSLE}, + {4, 6, SPECIES_MINUN}, + {3, 6, SPECIES_CHINGLING}, + {3, 6, SPECIES_SKWOVET}, + {4, 6, SPECIES_IMPIDIMP}, + {4, 4, SPECIES_SLUGMA}, + {4, 4, SPECIES_MURKROW}, +}; + +const struct WildPokemonInfo gRoute16_LandMonsInfoDay = {21, gRoute16_LandMonsDay}; + +const struct WildPokemon gRoute16_LandMonsEvening[] = +{ + {3, 8, SPECIES_MUNCHLAX}, + {5, 6, SPECIES_IMPIDIMP}, + {5, 6, SPECIES_SHINX}, + {6, 6, SPECIES_SKWOVET}, + {5, 8, SPECIES_SHINX}, + {4, 6, SPECIES_MINUN}, + {4, 6, SPECIES_PLUSLE}, + {5, 9, SPECIES_MUNCHLAX}, + {3, 6, SPECIES_MURKROW}, + {4, 6, SPECIES_CUTIEFLY}, + {4, 4, SPECIES_CHINGLING}, + {4, 4, SPECIES_SLUGMA}, +}; + +const struct WildPokemonInfo gRoute16_LandMonsInfoEvening = {21, gRoute16_LandMonsEvening}; + +const struct WildPokemon gRoute16_LandMonsNight[] = +{ + {4, 8, SPECIES_MURKROW}, + {5, 6, SPECIES_SKWOVET}, + {5, 6, SPECIES_IMPIDIMP}, + {6, 6, SPECIES_MURKROW}, + {5, 6, SPECIES_SHINX}, + {4, 6, SPECIES_MINUN}, + {4, 6, SPECIES_PLUSLE}, + {3, 6, SPECIES_MUNCHLAX}, + {3, 6, SPECIES_MUNCHLAX}, + {4, 6, SPECIES_CUTIEFLY}, + {3, 4, SPECIES_CHINGLING}, + {4, 6, SPECIES_SLUGMA}, +}; + +const struct WildPokemonInfo gRoute16_LandMonsInfoNight = {21, gRoute16_LandMonsNight}; + // Iced Path const struct WildPokemon gIcedPath_LandMons[] = @@ -525,6 +599,14 @@ const struct WildPokemonHeader gWildMonMorningHeaders[] = .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, }, + { + .mapGroup = MAP_GROUP(ROUTE_16), + .mapNum = MAP_NUM(ROUTE_16), + .landMonsInfo = &gRoute16_LandMonsInfoMorning, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemonHeader gWildMonDayHeaders[] = @@ -577,6 +659,14 @@ const struct WildPokemonHeader gWildMonDayHeaders[] = .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, }, + { + .mapGroup = MAP_GROUP(ROUTE_16), + .mapNum = MAP_NUM(ROUTE_16), + .landMonsInfo = &gRoute16_LandMonsInfoDay, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemonHeader gWildMonEveningHeaders[] = @@ -629,6 +719,14 @@ const struct WildPokemonHeader gWildMonEveningHeaders[] = .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, }, + { + .mapGroup = MAP_GROUP(ROUTE_16), + .mapNum = MAP_NUM(ROUTE_16), + .landMonsInfo = &gRoute16_LandMonsInfoEvening, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemonHeader gWildMonNightHeaders[] = @@ -681,6 +779,14 @@ const struct WildPokemonHeader gWildMonNightHeaders[] = .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, }, + { + .mapGroup = MAP_GROUP(ROUTE_16), + .mapNum = MAP_NUM(ROUTE_16), + .landMonsInfo = &gRoute16_LandMonsInfoNight, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct SwarmData gSwarmTable[] = diff --git a/strings/scripts/celadoncity.string b/strings/scripts/celadoncity.string index 6ea06b5df..d767344a4 100644 --- a/strings/scripts/celadoncity.string +++ b/strings/scripts/celadoncity.string @@ -56,7 +56,7 @@ Riii-iiiime[.]! (Hey[.]\nPlease stop paying this guy[.]) #org @gText_CeladonCity_CyclingRoad_Closed -I appreciate all the work that's\ngone into beautifying Celadon.\pBut I really wish they'd fix up\nthe old [GREEN]Cycling Road[BLACK], too.\pFuschia City used to maintain it,\nbut they don't have the money\lto handle it anymore.\pWe decided it was easier to close\nthe road from Celadon's side.\lBut I miss biking[.] +I appreciate all the work that's\ngone into beautifying Celadon.\pBut I really wish they'd fix up\nthe old [GREEN]Cycling Road[BLACK], too.\pFuchsia City used to maintain it,\nbut they don't have the money\lto handle it anymore.\pWe decided it was easier to close\nthe road from Celadon's side.\lBut I miss biking[.] #org @gText_CeladonCity_TalkingAboutGirl That weird girl by the fountain\nnever stops walking.\lEven if you try to chat with her.\lNot that she[.] has much to say[.] @@ -91,14 +91,8 @@ Restaurant #org @gText_CeladonCity_HotelSign Celadon Hotel -#org @gText_CeladonCity_CondominiumsKnowitall1 -The door is locked.\nThere's a letter taped to it. - -#org @gText_CeladonCity_CondominiumsKnowitall2 -To whom it may concern:\pI just heard there's a Pok\emon\ncalled Sylveon.\pI might not know everything,\nafter all.\pWill reopen when I confirm if I\nstill know everything. - -#org @gText_CeladonCity_NoLongerKnowEverything -I[.] no longer know everything[.]\pThe world is bigger than I realized[.]\pI didn't even know Eevee could\nevolve in so many other ways[.]\lI am shaken to my core.\pTake my Eevee[.]\nMy knowledge isn't enough for it. +#org @gText_CeladonCity_NoLongerKnowEverything1 +Ah[.][PAUSE][20]\nGreetings[.]\pYou must have come because you\nread the sign on my door.\pWell, I have bad news[.] I don't\nknow everything.\lThe world is larger than I knew.\pIt turns out, there are new things\nto know about, all the time[.]\pI mean, I just found a 51st TM[.]\nCould there be even more?!\lEverything I've read is a lie!\pI need some time to myself[.]\nAnd, if it's any use to you[.]\pI wrote about the\nWireless Adapter on my chalkboard[.] #org @gText_CeladonCity_NoLongerKnowEverything_TookEevee Please[.] Treat my Eevee well[.]\nAnd, if it's any use to you[.]\pI wrote about the\nWireless Adapter on my chalkboard[.] @@ -113,7 +107,7 @@ This restaurant's pickles are\nabysmal, but I keep coming anyway.\pYou know what Hey, sorry. We're too busy\nfor more customers[.]\pSee, we're also a ghost kitchen for\n[BLUE]Iono Burger[BLACK].\pYou know, Iono? The streamer from\nthe [GREEN]Paldea[BLACK] region?\lShe has her own burger now.\pIt's got little toothpicks that\nlook like her hair clips.\pIono Burger only delivers through\nan app on your Rotom Phone.\lWe don't serve 'em in here.\p[.]What? You still have a dinky\nold Pok\edex? No phone?\lThat's rough, kid. #org @gText_CeladonCity_Restaurant_IonoSoda -Chug[.]\pI've ordered from Iono Burger\nbefore. It's not great.\pBut Iono DOES have her own\nexclusive Baja Blastoise flavor[.]\l[BLUE]Baja Blastoise: Iono Volt Switch[BLACK]!\pThey should put it in stores.\nDown with exclusivity! +Chug[.]\pI've ordered from Iono Burger\nbefore. It's not great.\pBut Iono DOES have her own\nexclusive Baja Blastoise flavor[.]\l[RED]Baja Blastoise: Iono Volt Switch[BLACK]!\pThey should put it in stores.\nDown with exclusivity! #org @gText_CeladonCity_Restaurant_MayleneInspiredSquatter Munch[.]\nSlurp[.]\pThere's a Fighting-type Gym Leader\nfrom [GREEN]Sinnoh[BLACK] who likes eating here.\pI wanna be strong too!\nSo now I stay right here and eat.\lNo one's kicked me out yet! @@ -211,6 +205,9 @@ Growlithe! #org @gText_CeladonCity_RGroupGameCornerPromoter Hey, you look like a lucky sort!\pCome on down to the\n[GREEN]R Group Game Corner[BLACK]! +#org @gText_CeladonCity_RGroupGameCornerPromoter_Angry +Hey, you look like a twerp!\pYou better stay away from the\n[GREEN]R Group Game Corner[BLACK]! + #org @gText_CeladonCity_GameCornerSign R Group Game Corner & Business HQ @@ -275,4 +272,28 @@ Hey! [RED]Sherry[BLACK]: Hey, sorry, I'm using\nthis one.\pTry upstairs, sib! #org @gText_CeladonCity_Pokecenter_Sib_Brandy -[RED]Brandy[BLACK]: Hey, sorry, I'm using\nthis one.\pTry upstairs, sib! \ No newline at end of file +[RED]Brandy[BLACK]: Hey, sorry, I'm using\nthis one.\pTry upstairs, sib! + +#org @gText_CeladonCity_GymTrainer_GetsEnergyDrink1 +Oh![PAUSE][15]\nThat's the [RED]Energy Drink[BLACK]! + +#org @gText_CeladonCity_GymTrainer_GetsEnergyDrink2 +I had a feeling you got it[.]\pThe town's abuzz with talk that\nsome "twerps\" caused trouble\lat the Department Store.\pI'm sorry about that[.]\nWe're really grateful!\pIt looks like the R Group cleared\nout of the store, too.\pI'll tell Erika what you did, and\nwe'll try to, [PAUSE][20]uh[.]\l[.][PAUSE][20]rehabilitate your image[.]\p[.]But for now, let me get this\ndrink to Erika!\pAnd please, feel free to challenge\nthe gym! + +#org @gText_CeladonCity_RGroupNotStupid_WhatDidYouDo +Aren't you one of the twerps who\nmessed with Team Rocket?\pLook, we all know the R Group is\nTeam Rocket.\pBut their money is so important\nfor Celadon!\pIf we go the way [GREEN]Fuchsia City[BLACK] did,\nit'll be because of folks like you. + +#org @gText_CeladonCity_RGroupAwesome_WhatDidYouDo +The R Group has put so much money\ninto beautifying Celadon!\pYou're a real twerp for messing\nwith them! + +#org @gText_CeladonCity_RGroupMemberFirstOne_Angry +Ey, twerp!\nGet outta Celadon! + +#org @gText_CeladonCity_GrassHint_Angry +You!\pYou're the one who messed with\nJessie & James!\pI hope a Nickit comes out of the\ngrass behind the building[.]\l[.]and steals from YOU!\lThen we'll see how YOU like it! + +#org @gText_CeladonCity_GameCorner_Welcome +Welcome to the\n[GREEN]R Group Game Corner[BLACK]! + +#org @gText_CeladonCity_GameCorner_WelcomeTwerp +Welcome to the\n[GREEN]R Group Game Corner[BLACK], twerp! \ No newline at end of file diff --git a/strings/scripts/ceruleancity.string b/strings/scripts/ceruleancity.string index fd4954c7e..db2dce066 100644 --- a/strings/scripts/ceruleancity.string +++ b/strings/scripts/ceruleancity.string @@ -6,3 +6,12 @@ Please clear the [GREEN]Nugget Bridge[BLACK]\nfor me!\pI heard the prize is a jo #org @gText_CeruleanCity_PokedexSnob Hohoho[.] What have we here?\nAre you making an encyclopedia?\lon Pok\emon?\pThat sounds so very amusing!\nI wish you best of luck, my good\nchum!\lHa!\lA Pok\emon index!\lWhat a novel idea! + +#org @gText_CeruleanCity_BajaBlastoiseWallpaper +Have you seen the new promotional\nPC wallpaper?\lIt's themed around Baja Blastoise!\pThe new mascot kid is soooo cute! + +#org @gText_CeruleanCity_BajaBlastoiseWallpaper_AlloyKnown +Have you seen the new promotional\nPC wallpaper?\lIt's themed around Baja Blastoise!\pIt looks like that promising young\ntrainer, Alloy, is the new mascot! + +#org @gText_CeruleanCity_Vikings +Have you ever seen a viking?\nIt's rare they leave Minnesota. \ No newline at end of file diff --git a/strings/scripts/deptstore.string b/strings/scripts/deptstore.string index e3c48f69b..ffbc16c31 100644 --- a/strings/scripts/deptstore.string +++ b/strings/scripts/deptstore.string @@ -2,11 +2,14 @@ [RED]Sherry[BLACK]: Haha!\nLet's goooo, Chingling! #org @gText_CeladonDeptStore_SibBattle1F_Brandy -[RED]Brandy[BLACK]: C'mon, Nickit!\nWe've got a drink to buy! +[RED]Brandy[BLACK]: C'mon, Chingling!\nWe've got a drink to buy! #org @gText_CeladonDeptStore_1FRocketBattlingSib Hey[.] C'mon, kid! Stop battlin' me!\nI've got work to do! +#org @gText_CeladonDeptStore_1FRocketBattlingSib_AfterNotSurviving +Agh[.] That kid took out all\nsix of my Pok\emon! + #org @gText_CeladonDeptStore_1FRocketBattlingSib_LostSherry Grrrr!\nI'm just so mad that kid beat me!\pI hate 'em, and I REALLY hate their\ndumb Ivysaur hat! @@ -16,6 +19,9 @@ Grrrr!\nI'm just so mad that kid beat me!\pThem and their stupid, stupid\nTepig #org @gText_CeladonDeptStore_RocketEvent_CustomerService Hello. Are you with the R Group?\nYou must be, if you got in! +#org @gText_CeladonDeptStore_RocketEvent_CustomerService_Angry +Hello, twerp!\pIf I can help you with anything,\nplease hesitate to ask. + #org @gText_CeladonDeptStore_RocketEvent_FirstRocket_Before An intruder?!\nNot now!\lTime for my awesome new Pok\emon! @@ -32,7 +38,7 @@ Looks like the elevator is not\nin service. Have you heard the latest album by\n[RED]Klefki Ring[BLACK]? Well, you won't[.]\lBecause I'M taking all the copies! #org @gText_CeladonDeptStore_RocketEvent_NextRocket_Lose -I already took all the CDs.\pThe outcome of this fight changes\lnothing. +I already took all the CDs.\pThe outcome of this fight changes\nnothing. #org @gText_CeladonDeptStore_RocketEvent_NextRocket_After I bet you've never even HEARD of\n[RED]Klefki Ring[BLACK]!\lIndie rock forever! @@ -46,20 +52,26 @@ Maybe I shoulda stuck with Zubat[.] #org @gText_CeladonDeptStore_RocketEvent_Rocket3_After It feels so good to have some\nVARIETY, for once!\pI'll raise my new Pok\emon up real\ngood for the boss!\pBut, I should go find my old Zubat\nin my PC boxes.\lSee how she's doing. -#org @gText_CeladonCity_DeptStoreRockets_GarchompGavinIntro -[RED]???[BLACK]: [.]Ahh! The world-famous\n[GREEN]Celadon Department Store[BLACK]!\lIsn't it awesome, fans?\pSo in this video, not only will I\nbe continuing my [GREEN]Nuzlocke[BLACK] run[.]\p[.]I'll be buying and unboxing the\nnew [RED]Klefki Ring[BLACK] album! +#org @gText_CeladonCity_DeptStoreRockets_GarchompGavinIntro1 +[RED]???[BLACK]: [.]Ahh! The world-famous\n[GREEN]Celadon Department Store[BLACK]!\lIsn't it awesome, fans? + +#org @gText_CeladonCity_DeptStoreRockets_GarchompGavinIntro2 +So in this video, not only will I\nbe continuing my [GREEN]Nuzlocke[BLACK] run[.] + +#org @gText_CeladonCity_DeptStoreRockets_GarchompGavinIntro3 +[.]I'll be buying and unboxing the\nnew [RED]Klefki Ring[BLACK] album! #org @gText_CeladonCity_DeptStoreRockets_GarchompGavinNext -Oho! Fans, I've locked eyes with\nanother trainer!\lEven here, guys!\pOne of the stipulations for my run\nis to fight every trainer I see! +Oho!\nNot another step, you!\pFans, I've locked eyes with\nanother trainer!\lEven here, guys!\pOne of the stipulations for my run\nis to fight every trainer I see! #org @gText_CeladonCity_DeptStoreRockets_GavinSherry1 -[RED]Sherry[BLACK]: [.]Hey, [PLAYER]!\nDo you know this guy? +[RED]Sherry[BLACK]: [.]Hey, [PLAYER]!\nSorry I took so long[.]\pThat guy I was fighting had a\nfull team of 6!\p[.]Who's this person? #org @gText_CeladonCity_DeptStoreRockets_GavinBrandy1 -[RED]Brandy[BLACK]: [.]Hey, [PLAYER]!\nDo you know this guy? +[RED]Brandy[BLACK]: [.]Hey, [PLAYER]!\nSorry I took so long[.]\pThat guy I was fighting had a\nfull team of 6!\p[.]Who's this guy? #org @gText_CeladonCity_DeptStoreRockets_GarchompGavin3 -[RED]???[BLACK]: Two challengers, huh?\nWelcome to the show, I'm\n[RED]Garchomp Gavin[BLACK].\lMaybe you've heard of my channel? +[RED]???[BLACK]: Two challengers, huh?\nWelcome to the show, I'm[.]\l[RED]Garchomp Gavin[BLACK]!\lMaybe you've heard of my channel? #org @gText_CeladonCity_DeptStoreRockets_GavinSherry2 [RED]Sherry[BLACK]: Uh[.]\n[.] [.] [.]\pYou do realize there's a situation\nin this store right now, right? @@ -68,34 +80,286 @@ Oho! Fans, I've locked eyes with\nanother trainer!\lEven here, guys!\pOne of the [RED]Brandy[BLACK]: Uh[.]\nGavin[.]\lCan I call you Gav?\pAre you[.] paying any attention to\nthe situation in here? #org @gText_CeladonCity_DeptStoreRockets_GarchompGavin4 -[RED]Gavin[BLACK]: Now now, I'll make this\nquick!\lJust wait your turn, you!\pAlright viewers, this is great!\nEasy prize money and experience\npoints! Here we go! +[RED]Gavin[BLACK]: Now now, I'll make this\nquick!\lJust wait your turn, you!\pAlright viewers, this is great!\nEasy prize money[.]\l[.]and easier experience points!\lHere we go! #org @gText_CeladonCity_DeptStoreRockets_GarchompGavin_Loss -NO!!!!\nMY PRECIOUS GIBLE!!!!! +NO!!!!\n[PAUSE][8]MY PRECIOUS GIBLE!!!!! #org @gText_CeladonCity_DeptStoreRockets_GarchompGavin_After -[RED]Gavin[BLACK]: My Gible[.]\nYou KILLED my Gible! +[RED]Gavin[BLACK]: My Gible[.]\n[PAUSE][7]You KILLED my Gible! #org @gText_CeladonCity_DeptStoreRockets_GavinSherry3 -[RED]Sherry[BLACK]: Huh? No they didn't!\nYour Gible fainted like normally!\lIt was visibly breathing!\pJust go to a Pok\emon Center,\nMr. Gavin! +[RED]Sherry[BLACK]: Huh? No they didn't!\n[PAUSE][10]Your Gible fainted like normally!\lIt was visibly breathing!\pJust go to a Pok\emon Center,\nMr. Gavin! #org @gText_CeladonCity_DeptStoreRockets_GavinBrandy3 -[RED]Brandy[BLACK]: What? No they didn't!\nYour Gible just fainted, dude!\lI saw it breathing!\pJust go to a Pok\emon Center,\nit'll be fine, Gav! +[RED]Brandy[BLACK]: What? No they didn't!\n[PAUSE][10]Your Gible just fainted, dude!\lI saw it breathing!\pJust go to a Pok\emon Center,\nit'll be fine, Gav! #org @gText_CeladonCity_DeptStoreRockets_GarchompGavin_After2 [RED]Gavin[BLACK]: You don't understand[.]\nI JUST started my [BLUE]Nuzlocke[BLACK] run[.]\pAnd in a [BLUE]Nuzlocke[BLACK] run, your\nPok\emon DIE when they faint! #org @gText_CeladonCity_DeptStoreRockets_GavinSherry4 -[RED]Sherry[BLACK]: No, you're just SAYING\nthey're dead!\pC'mon, don't lay this at our feet! +[RED]Sherry[BLACK]: No, you're just SAYING\nthey're dead!\pC'mon, don't mess around with us! #org @gText_CeladonCity_DeptStoreRockets_GavinBrandy4 [RED]Brandy[BLACK]: No? Dude, that's not part\nof it.\pC'mon, man, don't put this on us! #org @gText_CeladonCity_DeptStoreRockets_GarchompGavin_Revenge -[RED]Gavin[BLACK]: Eh, it's okay.\nI only just started this run.\lI'll just start a new one.\pBut next time you won't be so\nlucky!\pI'll see you again[.] in person, or\nin your recommended videos!\pRemember to like and subscribe to [RED]Garchomp Gavin[BLACK]! +[RED]Gavin[BLACK]: Eh, it's okay.\nI only just started this run.\lI'll just start a new one.\pBut next time you won't be so\nlucky!\pI'll see you again[.] in person, or\nin your recommended videos!\pRemember to like and subscribe to\n[RED]Garchomp Gavin[BLACK]! #org @gText_CeladonCity_DeptStoreRockets_GavinSherry5 -[RED]Sherry[BLACK]: He got over that pretty\nquickly. Let's[.] move on[.] +[RED]Sherry[BLACK]: He got over that pretty\nquickly.[PAUSE][10] Let's[.] move on[.] + +#org @gText_CeladonCity_DeptStoreRockets_GavinBrandy5 +[RED]Brandy[BLACK]: At least that guy got over \nit quickly enough.[PAUSE][10] Let's move on! + +#org @gText_CeladonCity_DeptStoreRockets_TVGameShopCounter +I'm so glad the R Group could\nprovide these retro electronics!\lAwesome! + +#org @gText_CeladonCity_DeptStoreRockets_TVGameShopCounter_Angry +You twerp!\nI saw you mess with the R Group!\pDo you know how hard it is to get\nCRTs without them these days?\pPeople need those!\pTo play old video games with\nlow input lag! + +#org @gText_CeladonDeptStore_DeptStoreRockets_4FRocket1_Before +Gahaha! We all got our own\nSnarl TMs, baby!\pThis is what's gonna put us over\nthe top! + +#org @gText_CeladonDeptStore_DeptStoreRockets_4FRocket1_Lose +You won now, but it's only a matter\nof time before Snarl is your doom! + +#org @gText_CeladonDeptStore_DeptStoreRockets_4FRocket1_After +Years ago, the Snarl TM was hidden\naway from us in a [BLUE]Lock Capsule[BLACK][.]\pIt was THIS that ruined our plans!\nNothing else! We just needed Snarl!\pThings are gonna be different now\nthat we have the power of Snarl!\pThis would have changed EVERYTHING\nin [GREEN]Johto[BLACK]! + +#org @gText_CeladonDeptStore_DeptStoreRockets_4FRocket2_Before +Stupid kid! Get outta here! + +#org @gText_CeladonDeptStore_DeptStoreRockets_4FRocket2_Lose +Ugh[.]!\nYou nosy little Grubbin! + +#org @gText_CeladonDeptStore_DeptStoreRockets_4FRocket2_After +You stink, kid!\nWe're busy! + +#org @gText_CeladonDeptStore_DeptStoreRockets_5FRocket1_Before +I don't know what you think we're\ndoing, ya intrudin' punk.\pBut it's all above board!\nThe R Group's legit, ya hear?! + +#org @gText_CeladonDeptStore_DeptStoreRockets_5FRocket1_Lose +Upstandin' and legit as I am,\n[PAUSE][10]here's ya prize money. + +#org @gText_CeladonDeptStore_DeptStoreRockets_5FRocket1_After +The R Group ain't doin' anything\nwrong!\pWe're just gettin' some TMs and\nexotic Pok\emon!\pLiftin' a big ol' green tube\nwhat got someone inside of it,\land takin' it to the basement!\lAin't no laws sayin' we can't! + +#org @gText_CeladonDeptStore_DeptStoreRockets_5FRocket2_Before +Oof[.]\nHey, could you stop intruding?\pI just had to take a big tube down\nto our basement HQ.\lMy back hurts[.] + +#org @gText_CeladonDeptStore_DeptStoreRockets_5FRocket2_Lose +If my back were alright, you'd be\ndead meat,[PAUSE][5] kid! + +#org @gText_CeladonDeptStore_DeptStoreRockets_5FRocket2_After +I don't know why the boss needs his\nbig green tube in our HQ!\pMaybe he just likes the mood\nlighting! Not my business! + +#org @gText_CeladonDeptStore_SibFloor5_Sherry +[RED]Sherry[BLACK]: Hey, sib! Gimme a second to\ncatch my breath.\pI just had a grueling fight[.]\pThat guy guarding the stairs had\na full team of 6 Pok\emon, too!\pHead upstairs and I'll be\nright behind you. + +#org @gText_CeladonDeptStore_SibFloor5_Brandy +[RED]Brandy[BLACK]: Hey, sib! Gimme a second to\ncatch my breath.\pI just had a grueling fight!\pThat guy guarding the stairs had\na full team of 6 Pok\emon, too.\pHead upstairs and I'll be\nright behind you. + +#org @gText_CeladonDeptStore_SibFloor5_Sherry_YouThrew +[RED]Sherry[BLACK]: Oh[.] hey sib[.]\nThat was embarassing[.]\pI got away before they\ncould steal my Pok\emon.\pYou weren't trying to hit my\nChingling, right?\lI must have been looking wrong[.]\p[.]Actually,[PAUSE][20] I don't wanna talk about it.\pLook.\pLet's get back up there and\npretend none of it happened.\pI'm sure those two will be happy\nto do their poem again. + +#org @gText_CeladonDeptStore_SibFloor5_Brandy_YouThrew +[RED]Brandy[BLACK]: Oh, hey sib[.]\nThat was embarassing[.]\pI ducked down here before they\ncould steal my Pok\emon.\pI was caught up in the moment and\ndidn't notice, but[.]\l[.]did you attack me, [PLAYER]?\lNo[.][PAUSE][20] no, you wouldn't.\pLet's just go back up there and\npretend none of it happened.\pI'm sure those guys will be happy\nto do their poem again. + +#org @gText_CeladonDeptStore_ShamedRocket +I can't believe that kid beat me[.]\nI deserve to be in time-out[.]\lI should be grounded[.] + +#org @gText_CeladonDeptStore_SherrysChingling +Ching, ling-inging ing! + +#org @gText_CeladonDeptStore_RocketArctozolt +Zooooolt! + +#org @gText_CeladonDeptStore_RocketsRooftop_ChieAgain +[.] I know it's bad we told 'em\nwe're Rockets!\pWe don't wanna get in trouble\nwith the boss!\lIt was an honest mistake!\pCan you guys fix this?\nCan ya take care of these kids? + +#org @gText_CeladonDeptStore_RocketsRooftop_JamesIntro +[RED]???[BLACK]: Ohoho[.]! You were right to\ncome to us.\pAs the boss's favorites, we'll get\nthis sorted out. + +#org @gText_CeladonDeptStore_RocketsRooftop_JessieIntro +[RED]???[BLACK]: Everything else has gone well!\nReally, don't sweat it, rookie.\pWe made plenty of boneheaded\nmistakes in our EARLY days.\pWe weren't always the hardened\nexperts we are now.\pJust make sure everything else\nis brought down to the hideout! + +#org @gText_CeladonDeptStore_RocketRooftop_ChieAgainAgain1 +You two are the best!\nI'll see to it, sir![PAUSE][10] And m-madam! + +#org @gText_CeladonDeptStore_RocketRooftop_ChieAgainAgain2 +Ah[.] Jessie! James!\nThe kids are HERE![PAUSE][10] Like, now!\lI-I'll leave it to you! + +#org @gText_CeladonDeptStore_RocketRooftop_SibSherry1 +[RED]Sherry[BLACK]: So, are you two in charge?\pDid YOU plant a Paras in Erika's\ngym??\lYou put everyone to sleep! + +#org @gText_CeladonDeptStore_RocketRooftop_SibBrandy1 +[RED]Brandy[BLACK]: So, you're the bosses!\pThen it's YOU who put Erika and\nher trainers to sleep! + +#org @gText_CeladonDeptStore_JessieReveal_1 +[RED]Jessie[BLACK]: Hah! No matter where we\ngo, we'll always stumble onto\la couple of twerps, hmm?\pYes, we're the scoundrels who\nstuffed those spores in the vents!\lThere's no point in hiding it! + +#org @gText_CeladonDeptStore_JamesReveal_1 +[RED]James[BLACK]: And because of our inspired\nsleep scheme[.]\p[.]our staff succeeded at stashing\nthe shipment in sheer secrecy!\lOhohoho! + +#org @gText_CeladonDeptStore_RocketRooftop_SibSherry2 +[RED]Sherry[BLACK]: Quit it!\nWho are you people?! + +#org @gText_CeladonDeptStore_RocketRooftop_SibBrandy2 +[RED]Brandy[BLACK]: Can it!\nWho the heck ARE you?! + +#org @gText_CeladonDeptStore_JamesReveal_2 +[RED]James[BLACK]: We thought[.] + +#org @gText_CeladonDeptStore_JessieReveal_2 +[RED]Jessie[BLACK]: [.]you'd never ask! + +#org @gText_CeladonDeptStore_TRMotto1 +To protect the world from\n[RED]devastation![BLACK] + +#org @gText_CeladonDeptStore_TRMotto2 +To unite all peoples within our\n[RED]nation![BLACK] + +#org @gText_CeladonDeptStore_TRMotto3 +To denounce the evils of truth and\n[RED]love![BLACK] + +#org @gText_CeladonDeptStore_TRMotto4 +To extend our reach to the stars\n[RED]above![BLACK] + +#org @gText_CeladonDeptStore_TRMotto5 +[RED]Jessie![BLACK] + +#org @gText_CeladonDeptStore_TRMotto6 +[RED]James![BLACK] + +#org @gText_CeladonDeptStore_TRMotto7 +[RED]Team Rocket[BLACK], blast off at the speed\nof [RED]light![BLACK] + +#org @gText_CeladonDeptStore_TRMotto8 +Surrender now, or prepare to\n[RED]fight![BLACK] + +#org @gText_CeladonDeptStore_TRBeat +[.] [.] [.] + +#org @gText_CeladonDeptStore_JamesWaitNoPokemon1 +[RED]James[BLACK]: (Hey, Wobbuffet didn't come\nout.[PAUSE][5] Do you not have him?) + +#org @gText_CeladonDeptStore_JessieWaitNoPokemon1 +[RED]Jessie[BLACK]: (My regularly scheduled\nPok\e Ball polishing was today!) + +#org @gText_CeladonDeptStore_JamesWaitNoPokemon2 +[RED]James[BLACK]: (So was mine!) + +#org @gText_CeladonDeptStore_JessieWaitNoPokemon2 +[RED]Jessie[BLACK]: (Okay, okay. Let's not\npanic!) + +#org @gText_CeladonDeptStore_JamesWaitNoPokemon3 +[RED]James[BLACK]: (I'm not panicking,\nyou're panicking!) + +#org @gText_CeladonDeptStore_JessieWaitNoPokemon3 +[RED]Jessie[BLACK]: (Just call in the [BLUE]Prize\nMaster[BLACK], James!) + +#org @gText_CeladonDeptStore_JamesWaitNoPokemon4 +[RED]James[BLACK]: (Ah! Clever thinking,\nold girl!) + +#org @gText_CeladonDeptStore_JessieWaitNoPokemon4 +[RED]Jessie[BLACK]: Hey, twerps!\pGet a load of this! + +#org @gText_CeladonDeptStore_BeholdThePrizeMaster1 +[RED]Jessie[BLACK]: Behold[.]\nThe [BLUE]Rocket Prize Master[BLACK]! + +#org @gText_CeladonDeptStore_BeholdThePrizeMaster2 +What do you think we'll get\ntoday, James?\pA Gyarados?\nA Machamp? + +#org @gText_CeladonDeptStore_JamesGachaPulls +[RED]James[BLACK]: Remember when I got a\nTyranitar? I love this thing!\pWe don't even need Meowth's coin\nanymore!\lLet's make our pulls! + +#org @gText_CeladonDeptStore_JessieReadyToGo +[RED]Jessie[BLACK]: Once we're done showing\noff our might[.]\pYou're gonna hand over your\nPok\emon! + +#org @gText_CeladonDeptStore_RocketRooftop_SibSherry3 +[RED]Sherry[BLACK]: Sib![PAUSE][20] I dunno if we can\nhandle these guys[.]\pBut while they were doing all that,\n[RED]I secretly healed your entire team.[BLACK]\pAm I good or what?\nI'm with you all the way!\lLet's go! + +#org @gText_CeladonDeptStore_RocketRooftop_SibBrandy3 +[RED]Brandy[BLACK]: Sib![PAUSE][20] These guys seem like\nserious business[.]\pBut while they were doing all that,\n[RED]I secretly healed your entire team.[BLACK]\pAm I good or what?\nI'm with you all the way!\lLet's go! + +#org @gText_CeladonDeptStore_RocketsLose +James: Oh, come on! Really?!\nJessie: Those were terrible pulls! + +#org @gText_CeladonDeptStore_RocketsAfter +We're blasting off agaaaaaain!\p[.] [.] [.] [.]\n[.] [.] [.] [.]\l[.][PAUSE][10] [.][PAUSE][10] [.][PAUSE][10] [.][PAUSE][10] [.][PAUSE][10] [.] + +#org @gText_CeladonDeptStore_JessieLost1 +[RED]Jessie[BLACK]: Well?! Don't you twerps\nknow how to blast us off?! + +#org @gText_CeladonDeptStore_SherryConfused +[RED]Sherry[BLACK]: [.]What? + +#org @gText_CeladonDeptStore_BrandyConfused +[RED]Brandy[BLACK]: [.]What? + +#org @gText_CeladonDeptStore_JessieLost2 +[RED]Jessie[BLACK]: Kids these days just\ndon't have any tact, James.\lThese two are rank amateurs. + +#org @gText_CeladonDeptStore_JamesLost2 +[RED]James[BLACK]: Hmmph![PAUSE][20] Let's go, Jessie. + +#org @gText_CeladonDeptStore_JamesLost3 +[RED]James[BLACK]: [.]You know, we usually don't\nhave to drag this thing back[.] + +#org @gText_CeladonDeptStore_FadeToBlack +You both watch Jessie & James\ncontinue to drag the Prize Master\ldownstairs at an agonizing pace. + +#org @gText_CeladonDeptStore_SherryAfterLeave_PlayerChoseRelicanth +[RED]Sherry[BLACK]: Sorry I couldn't help\nmore, sib.\pMy Sigilyph fainted when I was\nfighting downstairs!\pI used all my healing items on you,\nbecause I wanted to impress you[.]\lNot the smartest, huh?\pBut Chingling did great!\n[PAUSE][15]It gained so many levels in there! + +#org @gText_CeladonDeptStore_SherryAfterLeave_PlayerChoseSigilyph +[RED]Sherry[BLACK]: Sorry I couldn't help\nmore, sib.\pMy Passimian fainted when I was\nfighting downstairs!\pI used all my healing items on you,\nbecause I wanted to impress you[.]\lNot the smartest, huh?\pBut Chingling did great!\n[PAUSE][15]It gained so many levels in there! + +#org @gText_CeladonDeptStore_SherryAfterLeave_PlayerChosePassimian +[RED]Sherry[BLACK]: Sorry I couldn't help\nmore, sib.\pMy Relicanth fainted when I was\nfighting downstairs!\pI used all my healing items on you,\nbecause I wanted to impress you[.]\lNot the smartest, huh?\pBut Chingling did great!\n[PAUSE][15]It gained so many levels in there! + +#org @gText_CeladonDeptStore_SherryAfterLeave_Rando +[RED]Sherry[BLACK]: Sorry I couldn't help\nmore, sib.\pMy other Pok\emon fainted when I\n wasfighting downstairs!\pI used all my healing items on you,\nbecause I wanted to impress you[.]\lNot the smartest, huh?\pBut Chingling did great!\n[PAUSE][15]It gained so many levels in there! + +#org @gText_CeladonDeptStore_BrandyAfterLeave_PlayerChoseRelicanth +[RED]Brandy[BLACK]: Sorry I couldn't help\nmore, sib.\pMy Sigilyph fainted when I was\nfighting downstairs!\pI used all my healing items on you,\nbecause I wanted to impress you[.]\lNot the smartest, huh?\pBut Chingling did great!\n[PAUSE][15]It gained so many levels in there! + +#org @gText_CeladonDeptStore_BrandyAfterLeave_PlayerChoseSigilyph +[RED]Brandy[BLACK]: Sorry I couldn't help\nmore, sib.\pMy Passimian fainted when I was\nfighting downstairs!\pI used all my healing items on you,\nbecause I wanted to impress you[.]\lNot the smartest, huh?\pBut Chingling did great!\n[PAUSE][15]It gained so many levels in there! + +#org @gText_CeladonDeptStore_BrandyAfterLeave_PlayerChosePassimian +[RED]Brandy[BLACK]: Sorry I couldn't help\nmore, sib.\pMy Relicanth fainted when I was\nfighting downstairs!\pI used all my healing items on you,\nbecause I wanted to impress you[.]\lNot the smartest, huh?\pBut Chingling did great!\n[PAUSE][15]It gained so many levels in there! + +#org @gText_CeladonDeptStore_BrandyAfterLeave_Rando +[RED]Brandy[BLACK]: Sorry I couldn't help\nmore, sib.\pMy other Pok\emon fainted when I\n wasfighting downstairs!\pI used all my healing items on you,\nbecause I wanted to impress you[.]\lNot the smartest, huh?\pBut Chingling did great!\n[PAUSE][15]It gained so many levels in there! + +#org @gText_CeladonDeptStore_SibAfterRocketRoofWin +Now, let's get that energy drink!\pIt'll be my treat, but you gotta\ntake it down to the gym, okay? + +#org @gText_CeladonDeptStore_SherryAfterWinLeave1 +[RED]Sherry[BLACK]: I gotta prepare better[.]\pSo I think that means I need more\nPok\emon! + +#org @gText_CeladonDeptStore_BrandyAfterWinLeave1 +[RED]Brandy[BLACK]: I gotta prepare better[.]\pSo I think that means I need more\nPok\emon! + +#org @gText_CeladonDeptStore_PlayerChosePassimianSoOopsIHaveRelicanth +After all, my poor Relicanth won't\ndo so well at a Grass-type gym[.] + +#org @gText_CeladonDeptStore_SibAfterWinLeave2 +But! This was sooo cool, sib!\nI can't believe we get to do this!\pI'm sure everyone that in Celadon\nwill praise our heroism[.]!\pI'll catch you later, fellow hero!\nHeheh! + +#org @gText_CeladonDept_Floor1_RegularNPC1 +Remember when larger boxes of\ncereal would say,\l"Now 20% More Free\"?\pThey did that a LOT for a while,\nbut then they stopped.\lMaybe it was a legal thing?\lOr were people not falling for it?\p"20% more free\" doesn't make much\nsense.\pWere you getting 20% more cereal\nthan you used to?\pOr was the cereal now 20% more\nfree than before?\pI hadn't seen this marketing trick\nin years[.]\p[.]But I saw "20% more free\" on some\npainkillers just now.\pDon't let 'em manipulate you[.]\n[PAUSE][20]Ain't nothing's free. + +#org @gText_CeladonDept_Floor2_RegularNPC1 +Items items items!\nI'm getting so many items!\p[.]Hey, did all the [RED]Klefki Ring[BLACK]\nalbums sell out? + +#org @gText_CeladonDept_Floor2_RegularNPC2 +Hey, twerp!\pYou hear about the explosion at\nSilph's Max Repel factory in [GREEN]Tiksi[BLACK]?\pRepelled all the Pok\emon out of\nthe whole region, it did.\lHUGE disaster.\pAnd they all wound up here!\nThat's one of the MANY sources of\lKanto's invasive species problems[.]\pBut hey, at least it proves Repels\nwork, right, twerp? + +#org @gText_CeladonDept_Floor4_RegularNPC1 +Twerp twerp twerp twerp!\nMom says you're a twerp! -#org @gText_CeladonCity_DeptStoreRockets_GavinBrandy6 -[RED]Brandy[BLACK]: At least that guy got over \nit quickly enough. Let's move on! \ No newline at end of file +#org @gText_CeladonDept_Roof_RegularNPC1_TwerpMode +My girlfriend wants to make a trip\nto [GREEN]Groudon Beach[BLACK].\pIt's a new tourist attraction at\nthe [GREEN]Sevii Islands[BLACK].\pNot only is it a great beach,\nbut you get to meet THE Groudon!\pYou know, the one who's the\nBaja Blastoise mascot!\lNOT a run-of-the-mill Groudon!\p[.]Oh, wait, aren't you the twerp?\nShoot, uhh[.]\pDid I mention I have a [RED]GIRLFRIEND[BLACK]?\nI bet YOU don't, twerp! \ No newline at end of file diff --git a/strings/scripts/fuchsiacity.string b/strings/scripts/fuchsiacity.string new file mode 100644 index 000000000..06a03f64c --- /dev/null +++ b/strings/scripts/fuchsiacity.string @@ -0,0 +1,20 @@ +#org @gText_FuchsiaDesperateGymShill +Our gym has it all!\nThe Fuchsia City gym is:\lturn-based;\lhobby-grade battle campaign;\lmulti-mode competitive battles;\lmeta-growth, choice[.]\lplus [RED]epic Fairy-type heroes![BLACK]\pPlease. PLEASE challenge our gym! + +#org @gText_FuchsiaShillFriend_ConfusedResponse +Huh[.]? Did you say something about\nMetagross? + +#org @gText_FuchsiaShillFriend_Normal +If we could get [RED]Klefki Ring[BLACK] to\nperform here[.]\l[.]it'd change everything!\pIn what way? I don't know.\nA concert here could bomb for them.\lThey're not exactly mainstream[.] + +#org @gText_FuchsiaPalParkExplainer +Hoh, kid, this corner of town ain't\nmuch to look at anymore.\pSurely you didn't think the ol'\n[GREEN]Pal Park[BLACK] was still open?\pThis place hasn't been the [GREEN]Safari\nZone[BLACK] in a long time, neither.\pThe [GREEN]Safari Zone[BLACK] is out west, in\n[GREEN]Johto[BLACK], now.\lYou want Route 47, outta Cianwood.\pThis dusty ol' place ain't got\nmuch but memories[.]\l[.]and the people clingin to 'em. + +#org @gText_FuchsiaDelusionist +Fuchsia is due for its comeback!\pMaybe a scientist here will realize\nVenonat evolves into Butterfree!\lThey look similar, it makes sense!\lThen everyone will want a Venonat!\lAnd we have plenty!\pOr maybe[.]\la scientist here will discover[.]\lHaxorus has a 600 base stat total!\lOur reputation would go up!\lHaha ha!\lAny day, now! Ha! + +#org @gText_FuchsiaRentsCheap +This town is a dead-end bummer.\n[.]but at least rent's cheap. + +#org @gText_FuchsiaPennants +Years and years ago[.] I remember\na tourist saying the [GREEN]Safari Zone[BLACK]\ldidn't merchandise well.\p"Don't they have any pennants\npromoting the [GREEN]Safari Zone[BLACK]?\pHow about some paper lanterns?\nAren't there even any calendars?\"\pIf we had just had some pennants,\nthings wouldn't be how they are[.]! \ No newline at end of file diff --git a/strings/scripts/mtmoon.string b/strings/scripts/mtmoon.string new file mode 100644 index 000000000..061cd2e17 --- /dev/null +++ b/strings/scripts/mtmoon.string @@ -0,0 +1,2 @@ +#org @gText_MtMoon_ButtUglyBeheeyems +Have you ever heard of this old\ncartoon called [RED]Bum-Ugly Beheeyems[BLACK]?\lIt was TERRIBLE.\pIt was about three Beheeyems who\ncame to conquer the planet,\lbut they like our food & TV shows,\lso they decide to live peacefully,\land befriend three 12-year-olds.\pIt was one of those early CGI\ncartoons, so it looked REALLY bad.\pI had frequent nightmares about\nthe [RED]Bum-Ugly Beheeyems[BLACK].\lBut I wasn't, like,\lscared of them?\pIt was more like my brain THOUGHT\nI should be scared of them,\land put them in my nightmares.\pAnd in those nightmares, they were\nalways breaking into my house.\lBut only to do mundane things,\llike water my plants.\pI'd always wake up sweaty and\nafraid at first.\pBut then I'd go, "Wait, it was\nanother [RED]Bum-Ugly Beheeyems[BLACK] dream[.]\"\lAnd I'd just laugh about it.\pAnyway, you can catch Beheeyem at\n[GREEN]Mt. Moon[BLACK].\lThat's all. diff --git a/strings/scripts/openingchoices.string b/strings/scripts/openingchoices.string index f3b099ec6..67e65c2b6 100644 --- a/strings/scripts/openingchoices.string +++ b/strings/scripts/openingchoices.string @@ -1,8 +1,8 @@ #org @gText_OpeningSibEntry_Brandy -[RED]Brandy[BLACK]: There you are, sib!\nYou're just in time!\pThe Professor's aide is here! She's\njust getting stuff downstairs!\pThere's a PC behind you that lets\nyou set a bunch of options.\pCheck that out if you want, and\nthen come back here! +[RED]Brandy[BLACK]: There you are, sib!\nYou're just in time!\pThe Professor's aide is here! She's\njust getting stuff downstairs!\pThere's a PC behind you that lets\nyou set a bunch of options.\pCheck that out if you want,[PAUSE][10] and\nthen come back here! #org @gText_OpeningSibEntry_Sherry -[RED]Sherry[BLACK]: There you are, sib!\nYou're just in time!\pThe Professor's aide is here! She's\njust getting stuff downstairs!\pThere's a PC behind you that lets\nyou set a bunch of options.\pCheck that out if you want, and\nthen come back here! +[RED]Sherry[BLACK]: There you are, sib!\nYou're just in time!\pThe Professor's aide is here! She's\njust getting stuff downstairs!\pThere's a PC behind you that lets\nyou set a bunch of options.\pCheck that out if you want,[PAUSE][10] and\nthen come back here! #org @gText_OpeningOptionsScanCheck Scanning Trainer Card[.] @@ -104,13 +104,13 @@ Welcome, [PLAYER]!\lThis is the [BLUE]Indigo League Options\nService[BLACK].\pYo [RED][RIVAL][BLACK]: [.] [.]\nHello, [PLAYER].\p[.]Are you excited for our starters?\pThe aide left them on a table\nover there.\pBut she disappeared somewhere[.]\nGuess we ought to wait.\lShe'd better hurry up and get back. #org @gText_PokemonChoiceLobby_SibSherry_1 -[RED]Sherry[BLACK]: Sib!\nI'm so excited for our Pok\emon!\pOf course, if there's a Bulbasaur,\nyou gotta let me have it!\pAnd I'd let you get Tepig, of\ncourse!\pMatching outfits with your Pok\emon\nwould be so trendy!\pWell, lead the way, [PLAYER]! +[RED]Sherry[BLACK]: Sib!\nI'm so excited for our Pok\emon!\pOf course,[PAUSE][12] if there's a Bulbasaur,[PAUSE][12]\nyou gotta let me have it!\pAnd I'd let you get Tepig, of\ncourse!\pMatching outfits with your Pok\emon\nwould be so trendy!\pWell, lead the way, [PLAYER]! #org @gText_PokemonChoiceLobby_SibBrandy_1 -[RED]Brandy[BLACK]: Sib!\nI'm so excited for our Pok\emon!\pOf course, if there's a Tepig,\nyou gotta let me have it!\pAnd I'd let you get Bulbasaur, of\ncourse!\pGetting our favorites would be\nserendipitous, y'know?\pWell, you first, [PLAYER]! +[RED]Brandy[BLACK]: Sib!\nI'm so excited for our Pok\emon!\pOf course,[PAUSE][12] if there's a Tepig,[PAUSE][12]\nyou gotta let me have it!\pAnd I'd let you get Bulbasaur, of\ncourse!\pGetting our favorites would be\nserendipitous, y'know?\pWell, you first, [PLAYER]! #org @gText_PokemonChoiceLobby_Hatsumi_Introduction1 -AAAHH! I'M BACK! SORRYYYYY!\nI LEFT THE OLD RODS DOWNSTAIRS! +AAAHH![PAUSE][5] I'M BACK![PAUSE][5] SORRYYYYY![PAUSE][5]\nI LEFT THE OLD RODS DOWNSTAIRS! #org @gText_PokemonChoiceLobby_Hatsumi_Introduction2 [RED]Oak's Aide[BLACK]: (huff) (puff)\nAhh[.] Hoo[.]\lOne sec, kiddos[.] @@ -125,13 +125,13 @@ AAAHH! I'M BACK! SORRYYYYY!\nI LEFT THE OLD RODS DOWNSTAIRS! [.] [.] [.] [.] #org @gText_PokemonChoiceLobby_Whisk_Introduction1 -[RED][RIVAL][BLACK]: [.]Hey, wait, did\nyou call us "kiddos\"?!\pDon't talk down to us! +[RED][RIVAL][BLACK]: [.][PAUSE][20]Hey, wait, did\nyou call us "kiddos\"?!\pDon't talk down to us! #org @gText_PokemonChoiceLobby_Hatsumi_Introduction5 -[RED]Oak's Aide[BLACK]: Ah, sorry!\nForce of habit!\pUsually, we're doing this\nfor littler kids. +[RED]Oak's Aide[BLACK]: Ah, sorry!\n[PAUSE][20]Force of habit!\pUsually, we're doing this\nfor littler kids. #org @gText_PokemonChoiceLobby_Whisk_Introduction2 -[RED][RIVAL][BLACK]: [.] [.]\nGrgrr[.] +[RED][RIVAL][BLACK]: [.] [.]\n[PAUSE][20]Grgrr[.] #org @gText_PokemonChoiceLobby_Hatsumi_Introduction6 [RED]Oak's Aide[BLACK]: Ah! N-no offense!\nI'm not thinking straight[.]\pIt was hard work getting everything\ntogether in time for you lot!\pBut my gripes aren't important.\nToday's about YOU guys!\pI left your Pok\emon on the table.\nLet's get you all started! @@ -149,7 +149,7 @@ AAAHH! I'M BACK! SORRYYYYY!\nI LEFT THE OLD RODS DOWNSTAIRS! [RED]Sherry[BLACK]: Hmm[.] hey sib[.]\nThose Pok\e Balls look brand new,\lright?\pThey must have just caught these\nPok\emon very recently!\pWe're really getting premium\ntreatment! #org @gText_PokemonChoiceLobby_RivalIntertalk1 -[RED][RIVAL][BLACK]: [.] [.] Don't laugh at me\nfor this, [PLAYER], but, I'm[.]\p[.] [.] I'm too nervous to look at the\nstarters!\lPlease, you go first. +[RED][RIVAL][BLACK]: [.] [.] Don't laugh at me\nfor this, [PLAYER], but,[PAUSE][20] I'm[.]\p[.] [.] I'm too nervous to look at the\nstarters!\lPlease, you go first. #org @gText_PokemonChoiceLobby_HatsumiIntertalk1 [RED]Oak's Aide[BLACK]: Ah, hang on.\pI should be reading\nfrom the official Oak Labs script.\lAhem!\p"Trainers! It's time to choose your\n[RED]very own Partner Pok\emon![BLACK]\pYour very own Pok\emon adventure\nis about to begin!\pImmerse yourself in a newly\nevolved adventure!\pA world of dreams and adventures\nwith Pok\emon awaits! Let's go!\"\p[.]if you see Professor Oak, please\ntell him about how I read you that. @@ -191,7 +191,7 @@ The others choose their own\nrandom Pok\emon as well! [RED]Sherry[BLACK]: Alright, me next!\pI wanna leave [RIVAL] with the\nPok\emon weak to mine! #org @gText_PokemonChoiceLobby_RivalDestroyedOwnedBlastedSadTragic -[RED][RIVAL][BLACK]: Hey! Not cool[.]\p[.] [.] [.]\nWell, let me see who I get[.] +[RED][RIVAL][BLACK]: Hey! Not cool[.]\p[.] [.] [.]\nWell,[PAUSE][12] let me see who I get[.] #org @gText_PokemonChoiceLobby_SibChoice2Brandy [RED]Brandy[BLACK]: Ha ha ha! Sorry,\n[RIVAL], I'm just teasing!\pAt least you'll have the advantage\non [PLAYER]! @@ -224,10 +224,10 @@ B-but relax!\pRock, Flying and Fighting form a\ntype triangle!\lJust like Fire, I used to work for Professor Elm,\nand- #org @gText_PokemonChoiceLobby_RivalChoice4 -[RED][RIVAL][BLACK]: Cool.\nThanks for sharing.\pNow I know who to file a\ncomplaint about[.] +[RED][RIVAL][BLACK]: Cool.\n[PAUSE][20]Thanks for sharing.\pNow I know who to file a\ncomplaint about[.] #org @gText_PokemonChoiceLobby_HatsumiDefense5 -[RED]Hatsumi[BLACK]: A-ah haha[.]\nWell[.] Uh[.]\p[.]L-let me give you your trainer\ngear, and I'll let you go! C'mere! +[RED]Hatsumi[BLACK]: A-ah haha[.]\n[PAUSE][20]Well[.] Uh[.]\p[.]L-let me give you your trainer\ngear, and I'll let you go! C'mere! #org @gText_PokemonChoiceLobby_SibIntertalk2_Sherry [RED]Sherry[BLACK]: (Hey, sib[.])\p([RIVAL] is kind of embarassing\nus[.]) @@ -254,7 +254,7 @@ I used to work for Professor Elm,\nand- You got[.]\n[.]a TON of stuff from Hatsumi[.]! #org @gText_PokemonChoiceLobby_OthersGotStuff -[.]Oh, and so did your friends! +[.]Oh,[PAUSE][20] and so did your friends! #org @gText_PokemonChoiceLobby_HatsumiExplainStuff [RED]Hatsumi[BLACK]: Okay, so[.]\nthere's your Pok\edex, with[.]\lNational, AND New Kanto orders!\pYou've also got your DexNav,\nyour Vs. Seeker, a Town Map,\la Berry Pouch, a- @@ -275,7 +275,7 @@ You got[.]\n[.]a TON of stuff from Hatsumi[.]! [RED][RIVAL][BLACK]: [RED]WEENIE?!?!? #org @gText_PokemonChoiceLobby_HatsumiFinal1 -[RED]Hatsumi[BLACK]: H-heh ha ha[.]!\nUh[.] +[RED]Hatsumi[BLACK]: H-heh ha ha[.]!\n[PAUSE][20]Uh[.] #org @gText_PokemonChoiceLobby_HatsumiFinal2 Ah! I've been here too long!\nOh no!\pI still have so much stuff to\ndo for the professor!\lI gotta jet, kiddos!\lA-adultos!\lH-heh ha ha[.]! @@ -284,16 +284,16 @@ Ah! I've been here too long!\nOh no!\pI still have so much stuff to\ndo for the [RED][RIVAL][BLACK]: She's just out of here\nalready?! #org @gText_PokemonChoiceLobby_SibSherry_StarterHype -[RED]Sherry[BLACK]: We should get going too,\nshouldn't we?\pC'mon! I wanna go see what\nmy Pok\emon can do! +[RED]Sherry[BLACK]: We should get going too,\n[PAUSE][10]shouldn't we?\pC'mon! I wanna go see what\nmy Pok\emon can do! #org @gText_PokemonChoiceLobby_SibBrandy_StarterHype -[RED]Brandy[BLACK]: We should head out too,\ngang!\pLet's go! I wanna see how cool\nmy Pok\emon is! +[RED]Brandy[BLACK]: We should head out too,\n[PAUSE][10]gang!\pLet's go! I wanna see how cool\nmy Pok\emon is! #org @gText_PokemonChoiceLobby_RivalAngyAngy1 -[RED][RIVAL][BLACK]: Ahghghg!\nCOME BACK HERE! +[RED][RIVAL][BLACK]: Ahghghg!\n[PAUSE][20]COME BACK HERE! #org @gText_PokemonChoiceLobby_RivalAngyAngy2 AT LEAST HOLD THE ELEVATOR FOR ME! #org @gText_PokemonChoiceLobby_RivalAngyAngy3 -[.]I am NOT a weenie[.]! \ No newline at end of file +[.]I am NOT[PAUSE][5] a weenie[.]! \ No newline at end of file diff --git a/strings/scripts/route11.string b/strings/scripts/route11.string index e74341526..7ddd47159 100644 --- a/strings/scripts/route11.string +++ b/strings/scripts/route11.string @@ -2,7 +2,7 @@ Hm hm[.]\nYes[.]\lThis is indeed a Snorlax!\pI need a [BLUE]Pok\e Flute[BLACK]!\pGoodness!\nIf only someone had a [BLUE]Pok\e Flute[BLACK]!\pDoesn't anyone have a [BLUE]Pok\e Flute[BLACK]?! #org @gText_Route11_SnorlaxRuinManiac2 -That little red haired prodigy\neveryone's talking about came by.\pHe woke up the sleeping Snorlax\nwith a [BLUE]Pok\e Flute[BLACK]!\pNot only is that kid a promising\ntrainer[.]\lHe's quite the flautist, as well! +That little red haired prodigy\neveryone's talking about came by.\pHe woke up the sleeping Snorlax\nwith a [BLUE]Pok\e Flute[BLACK]!\pNot only is that kid a promising\ntrainer[.]\lHe plays a mean flute! #org @gText_Route11_SnorlaxMumbles -Snorl[.] \ No newline at end of file +Sn[SHRINK]orl[.] \ No newline at end of file diff --git a/strings/scripts/route16.string b/strings/scripts/route16.string index 3ac6ec9f7..4d8bf3a74 100644 --- a/strings/scripts/route16.string +++ b/strings/scripts/route16.string @@ -8,4 +8,37 @@ Athlete's foot is rough.\nYou'll never stop itching.\pBe sure to take care of yo [GREEN]Fuchsia City[BLACK] has been in bad shape\never since the [GREEN]Safari Zone[BLACK] closed.\pYou're better off going to [GREEN]Johto[BLACK]\nfor your eighth badge, if you can.\lThat's what everyone else does.\pThis gatehouse is still nice to\nrelax at, though! #org @gText_Route16_CyclingRoad_Sign -Cycling Road\nRESTRICTED ACCESS\lGatehouse open to guests. \ No newline at end of file +Cycling Road\nRESTRICTED ACCESS\lGatehouse open to guests. + +#org @gText_Route16_CynthiasRecordPlayer +The record player is playing a\ndramatic piano piece.\pWho left this on? + +#org @gText_Route16_CynthiasSink +It's hard to tell when the last\ntime someone cooked here was[.]\lUnlike with most sinks and stoves. + +#org @gText_Route16_CynthiasTV +The TV is off.\nBut, there's a DVD case on top[.]\lIt's a concert recording[.]\pIt's titled [RED]"Koffing and the\nToxics: Kickin' Feebas in Virbank.\"[BLACK]\lIt's autographed! + +#org @gText_Route16_RoxieMsg +"To Big C! Always fun kickin' it\nwith you in Undella Town! -Roxie\" + +#org @gText_Route16_LeftBinoculars +Let's see what the binoculars have\nto show[.]\pThat's [GREEN]Mt. Moon[BLACK], between\n[GREEN]Pewter[BLACK] and [GREEN]Cerulean[BLACK].\pYou can see a Pok\emon Center\nat the foot of the mountain! + +#org @gText_Route16_RightBinoculars +Let's see what the binoculars have\nto show[.]\pThat's [GREEN]Mt. Moon[BLACK], between\n[GREEN]Pewter[BLACK] and [GREEN]Cerulean[BLACK].\pThere's two men practicing karate\nat the foot of the mountain! + +#org @gText_Route16_OldGuyInGatehouse +Huh? Whosawhatsit?\pWhere the heck am I?\nHow'd I get here?!\lWhat even IS this place?!\lI'm not even supposed to BE here! + +#org @gText_Route16_OldGuyInGatehouse_Angry +Huh? Whosawhatsit?\pWhere the heck am I?\nHow'd I get here?!\lWho's this twerp in front of me?!\lI'm not even supposed to BE here! + +#org @gText_Route16_GuardStops +Hey, hold up there! + +#org @gText_Route16_DontComeInCyclingRoad +The old [GREEN]Cycling Road[BLACK] is closed to\nthe public. + +#org @gText_Route16_DontComeInCyclingRoad_EvenWithBike +The old [GREEN]Cycling Road[BLACK] is closed to\nthe public.\lEven IF you have a bike! \ No newline at end of file diff --git a/strings/scripts/route6.string b/strings/scripts/route6.string index fe983dbb7..c44284f53 100644 --- a/strings/scripts/route6.string +++ b/strings/scripts/route6.string @@ -11,7 +11,7 @@ I'm looking for a [GREEN]Galarian Zigzagoon[BLACK].\nThey're more common at [BLU I want a [GREEN]Hoennian Zigzagoon[BLACK].\nThey're more common in the [ORANGE]day[BLACK].\pBut you can find them [BLUE]right now,\nat night,[BLACK] if you look hard enough!\pIt's easy to check the clock on the\n[GREEN]Start Menu[BLACK]. #org @gText_Route6_BrendanFirstAppear -[RED]???[BLACK]: Ah, hey there[.]!\nMy name is [GREEN]Brendan[BLACK].\pYou look like you're itching for\na battle.\lBut, I have to turn you down.\pI'm searching for a[.] friend.\nSo I need my Pok\emon in top shape!\pHey, you haven't seen [RED]a girl with a\nred ribbon in her hair,[BLACK] have you?\pShe might be with her three, uh[.]\n[.] [.] [.] [.] [.]\l[.]identical sisters?\lJust, uh, tell me if you see her. +[RED]???[BLACK]: Ah, hey there[.]!\n[PAUSE][5]My name is [GREEN]Brendan[BLACK].\pYou look like you're itching for\na battle.\lBut, I have to turn you down.\pI'm searching for a[.][PAUSE][20] friend.\nSo I need my Pok\emon in top shape!\pHey, you haven't seen [RED]a girl with a\nred ribbon in her hair,[BLACK] have you?\pShe might be with her three, uh[.]\n[PAUSE][10][.] [.] [.] [.] [.]\l[.]identical sisters?\lJust,[PAUSE][5] uh,[PAUSE][5] tell me if you see her. #org @gText_Route6_BrendanFirstAppear_FollowUp [RED]Brendan[BLACK]: My [RED]friend[BLACK] and her, uh,\nsisters, are hard to keep up with.\pI'll be travelling until I find the\nthree of them.\pKeep an eye out for them, and if\nwe bump into each other again,\ltell me where they've been! @@ -20,16 +20,16 @@ I want a [GREEN]Hoennian Zigzagoon[BLACK].\nThey're more common in the [ORANGE]d Underground Path\n(NOTICE - OUT OF SERVICE) #org @gText_Route6_BugCatcherHorace_Before -Grass, water, a moldy bathroom[.]\nA bug lives in those! +Grass, water, a moldy bathroom[.]\n[PAUSE][10]A bug lives in those! #org @gText_Route6_BugCatcherHorace_Lose Anywhere can be home, if a bug can\ninfest it! #org @gText_Route6_BugCatcherHorace_After -I don't see any bugs around here.\nPretty lousy route! +I don't see any bugs around here.\n[PAUSE][10]Pretty lousy route! #org @gText_Route6_YoungsterMaruyama_Before -Watch out!\nComin' through!\lI'm young, and fulla chutzpah! +Watch out!\nComin' through!\lI'm young,[PAUSE][10] and fulla chutzpah! #org @gText_Route6_YoungsterMaruyama_Lose Chutzpah ain't always enough[.] diff --git a/strings/scripts/vermilioncity.string b/strings/scripts/vermilioncity.string index c69a7f2a3..331ca818c 100644 --- a/strings/scripts/vermilioncity.string +++ b/strings/scripts/vermilioncity.string @@ -20,13 +20,13 @@ Scraaaeh! Yamph! #org @gText_VermilionCityNPC_SceptileOwner -Sceptile[.]\n[.]is just the coolest ever[.] +Sceptile[.]\n[PAUSE][5][.][PAUSE][5]is just the coolest ever[.] #org @gText_VermilionCityNPC_YamperOwner My Yamper is such a darling!\pYou can actually catch a Yamper\njust north of the city, on Route 6!\lBut MINE is a true Galarian import! #org @gText_VermilionCityNPC_Pollution -We're careful about pollution here!\nStill!\pNo toxic sludge in sight in\nVermilion!\pYou'll have to head to [GREEN]Fuchsia City[BLACK]\nif you wanna see sludge. +We're careful about pollution here!\n[PAUSE][7]Still!\pNo toxic sludge in sight in\nVermilion!\pYou'll have to head to [GREEN]Fuchsia City[BLACK]\nif you wanna see sludge. #org @gText_VermilionCityNPC_NamesHater Pok\emon names these days are too\nlong.\pBack in my day[.] we kept their names\nunder 10 characters!\pIn Kanto, we still haven't adapted\nour name display systems.\pSo, you might run into Pok\emon\nwhose names look truncated.\pThat's not a typo!\nOur systems are just outdated!\lRespect Crabominable's full name! @@ -47,13 +47,13 @@ It's me! The one, the only!\nThe Fishing Guru!\pIt looks like you already have a Things are the same as ever[.]\nI'm waiting for a shakeup.\pThere's no new Pok\emon types[.]\nBoring! #org @gText_VermilionCityNPC_HighExpectations -These days you're expected to know\nso much about Pok\emon.\pI don't know what an [BLUE]EV[BLACK] or [BLUE]IV[BLACK] is!\nI'm born to jog! THAT'S my hobby.\pIf you're a new trainer, you might\nwanna look stuff up online.\lNo shame in that! +These days you're expected to know\nso much about Pok\emon.\pI don't know what an [BLUE]EV[BLACK] or [BLUE]IV[BLACK] is!\nI'm born to jog![PAUSE][5] THAT'S my hobby.\pIf you're a new trainer, you might\nwanna look stuff up online.\lNo shame in that! #org @gText_VermilionCityNPC_PaldeaSandwichCritic -Out in [GREEN]Paldea[BLACK], their trash glistens\na little bit out in the wild.\pBut here in [GREEN]Kanto[BLACK], you need to use\nan [BLUE]Itemfinder[BLACK] to get hidden items.\pCultural differences are so\ninteresting! +Out in [GREEN]Paldea[BLACK], their trash glistens\na little bit out in the wild.\pBut here in [GREEN]Kanto[BLACK], you need to use\nan [BLUE]Itemfinder[BLACK] to see hidden items.\pCultural differences are so\ninteresting! #org @gText_VermilionCityNPC_PaldeaLetter -Dear Greggy,\nI hope this letter finds you well.\pI heard the R Group is investing in\nbeautifying [GREEN]Celadon City[BLACK].\pA mining town like [GREEN]Zapapico[BLACK] doesn't\nneed to be pretty! We're rugged!\lBut, that does sound cool[.] +Dear Greggy,\n[PAUSE][10]I hope this letter finds you well.\pI heard the R Group is investing in\nbeautifying [GREEN]Celadon City[BLACK].\pA mining town like [GREEN]Zapapico[BLACK] doesn't\nneed to be pretty! We're rugged!\lBut, that does sound cool[.] #org @gText_VermilionCityNPC_EvioliteDiscovery The moment I found out Primeape can\nevolve now, I got so excited.\pBecause now my Primeape can benefit\nfrom holding [BLUE]Eviolite[BLACK]!\pShe's gonna have sooo much\nSpecial Defense.\pI hope you can find your own\n[BLUE]Eviolite[BLACK]! @@ -62,19 +62,19 @@ The moment I found out Primeape can\nevolve now, I got so excited.\pBecause now Prau rau? #org @gText_VermilionCityNPC_TeamRocketMemory -There's always going to be groups\nwho want to use Pok\emon for crime.\pBut if you ask me, none were worse\nthan Team Rocket was.\pOther teams wanted to reshape the\nworld. Change things.\lTeam Rocket[.] just wanted money. +There's always going to be groups\nwho want to use Pok\emon for crime.\pBut if you ask me, none were worse\nthan Team Rocket was.\pOther teams wanted to reshape the\nworld. Change things.\lTeam Rocket[.][PAUSE][14] just wanted money. #org @gText_VermilionCityNPC_TeamRocketMemory2 That Giovanni guy had so much\nmoney, so much power[.]\pBut all he could think to do with\nany of it was to vie for more.\pMe? I'm using my meager wealth to\nbuy my Finneon a snack.\pA buddy's smile is worth more than\nthe world. #org @gText_VermilionCityNPC_MoneySucks -Grumble mumble[.]\nHey, you.\lAre you good at counting money?\lI'm sure not. +Grumble mumble[.]\nHey, you.\lAre you good at counting money?\l[SHRINK]I'm sure not[.] #org @gText_VermilionPortSign Vermilion Port\n[ARROW_DOWN] #org @gText_VermilionCityNPC_SadTinkatonExpert -Hi[.] I'm an expert on all things\nTinkaton.\lBut I don't think anyone cares[.]\pIt's pink in color and doesn't have\nfiery attacks, or armor,\lso no one ever seems to notice it.\pWith its [BLUE]Hidden Ability[BLACK], Pickpocket,\nit can steal held items from foes.\lBut no one ever seems to care[.]\pI'd suggest that you add one to\nyour collection[.]\lBut no one will ever care. +Hi[.][PAUSE][15] I'm an expert on all things\nTinkaton.\lBut I don't think anyone cares[.]\pIt's pink in color,[PAUSE][10] and doesn't\nhave fiery attacks,[PAUSE][10] or armor,\lso no one ever seems to notice it.\pWith its [BLUE]Hidden Ability[BLACK], Pickpocket,\nit can steal held items from foes.\lBut no one ever seems to care[.]\pI'd suggest that you add one to\nyour collection[.]\lBut[PAUSE][20] no one will ever care. #org @gText_VermilionCityNPC_CoolFinally It was wonderful when they finally\nfinished that building over there.\pThere was a Machop who diligently\nprepared the construction site[.]\lEvery day! For years!\pThe town awarded that little guy\na medal for his hard work.\pWhat's the building?\nEh, some lab or something. @@ -86,16 +86,16 @@ You can nickname your Pok\emon at\nany [GREEN]Pok\emon Center[BLACK] now!\lSo co Cerise Laboratory #org @gText_VermilionCityNPC_FunnyRomhackGuy1 -Hahaha! Haaa! Hoo-ee! +Hahaha! Haaa![PAUSE][5] Hoo-ee! #org @gText_VermilionCityNPC_FunnyRomhackGuy2_FunnyRed -Oh, me?\pI'm just playing the hot new\nromhack everyone's talking about.\lIt's called [RED]Pok\emon Funny Red[BLACK].\pThey'd never say things this wacky\nin a regular game! +Oh, me?\pI'm just playing the hot new\nromhack everyone's talking about.\lIt's called[PAUSE][8] [RED]Pok\emon Funny Red[BLACK].\pThey'd never say things this wacky\nin a regular game! #org @gText_VermilionCityNPC_FunnyRomhackGuy2_LaughGreen -Oh, me?\pI'm just playing the hot new\nromhack everyone's talking about.\lIt's called [GREEN]Pok\emon Laugh Green[BLACK].\pI saw a character swear a cuss!\nThey do not do that in real games! +Oh, me?\pI'm just playing the hot new\nromhack everyone's talking about.\lIt's called[PAUSE][8] [GREEN]Pok\emon Laugh Green[BLACK].\pI saw a character swear a cuss!\nThey do not do that in real games! #org @gText_VermilionCityNPC_Water -What would we do without Pok\emon?\pWe never have to worry about clean\nwater because of Pok\emon.\pSeriously, I could drink Hydro Pump\nwater for the rest of my life. +What would we do without Pok\emon?\pWe never have to worry about clean\nwater because of Pok\emon.\pSeriously, I could drink Hydro Pump\nwater for the rest of my life.\lIt's normal! Everyone drinks it!\lIt's chemically pure H20! #org @gText_VermilionCityNPC_MagikarpFlop Ma-gi-karp[.][.] @@ -104,10 +104,10 @@ Ma-gi-karp[.][.] [RED][RIVAL][BLACK]: Okay! First things first,\n[GREEN]Diglett's Cave[BLACK]!\pA good Ground-type like Diglett\nwill SMOTHER Surge!\lGround beats Electric! #org @gText_VermilionCity_RivalCutscene1DotDotDot -[.] [.] [.] [.] [.]\nYou can hear distant hollering. +[.] [.] [.] [.] [.]\n[PAUSE][16]You can hear distant hollering. #org @gText_VermilionCity_RivalCutscene1Rival2 -[RED][RIVAL][BLACK]: [.] [.] [.]\nFreaking Snorlax[.]\pFine! I'll take Surge WITHOUT a\ntype advantage! +[RED][RIVAL][BLACK]: [.] [.] [.]\nFreaking Snorlax[.]\pFine![PAUSE][10] I'll take Surge WITHOUT a\ntype advantage! #org @gText_VermilionCity_RivalCutscene2Rival0 [RED][RIVAL][BLACK]: Hey! Hey you!\nGet off the phone,\land get out of my freaking way! @@ -134,7 +134,7 @@ Yes, yes, Lieutenant[.] I understand[.]\nIt's just, a solo operation?\pThey can' [RED][RIVAL][BLACK]: Oh! [PLAYER]!\nCan you believe this guy? #org @gText_VermilionCity_RivalCutscene2Flynn4 -[RED]Flynn[BLACK]: Lieutenant? Sir? I heard\nyour Pok\e Ball opening.\pDon't you go getting your Raichu\nto make ACTUAL signal interference! +[RED]Flynn[BLACK]: Lieutenant? Sir?[PAUSE][7] I heard\nyour Pok\e Ball opening.\pDon't you go getting your Raichu\nto make ACTUAL signal interference! #org @gText_VermilionCity_RivalCutscene2Rival4 [RED][RIVAL][BLACK]: Wait, "Lieutenant?\"\nAre you talking to[.] @@ -143,16 +143,16 @@ Yes, yes, Lieutenant[.] I understand[.]\nIt's just, a solo operation?\pThey can' [RED]Flynn[BLACK]: Look, Surge, I'm in your\ncorner!\lYou don't need to dodge me here!\lI'll make this golden!\lI'll get the Gym closed for ya! #org @gText_VermilionCity_RivalCutscene2Rival5 -[RED][RIVAL][BLACK]: Wait, huh??\nNO! Don't close the gym! +[RED][RIVAL][BLACK]: Wait, huh??\nNO![PAUSE][10] Don't close the gym! #org @gText_VermilionCity_RivalCutscene2Flynn6 -[RED]Flynn[BLACK]: I'll handle the paperwork!\nYes, I just need-\lYes! Exactly.\pSo you can get me a list of\nreplacements?\lWonderful. Wonderful! We're gold! +[RED]Flynn[BLACK]: I'll handle the paperwork!\nYes, I just need-\lYes! Exactly.\pSo you can get me a list of\nreplacements?\lWonderful.[PAUSE][8] Wonderful![PAUSE][10] We're gold! #org @gText_VermilionCity_RivalCutscene2Rival6 [RED][RIVAL][BLACK]: Stoooop!\pStop stop stop! #org @gText_VermilionCity_RivalCutscene2Flynn7_1 -[RED]Flynn[BLACK]: Stay gold, Lieutenant!\pAnd thank you for your service! +[RED]Flynn[BLACK]: Stay gold, Lieutenant!\n[PAUSE][20]And thank you for your service! #org @gText_VermilionCity_RivalCutscene2Flynn7_2 [.]Ahem. Sorry, kiddo!\nGym's closed.\l[BLUE]Indigo League[BLACK] orders! @@ -161,7 +161,7 @@ Yes, yes, Lieutenant[.] I understand[.]\nIt's just, a solo operation?\pThey can' [RED][RIVAL][BLACK]: KIDDO?! Ugh!\nI'm grown up!\pAnd I demand to know why the gym\nis closed! #org @gText_VermilionCity_RivalCutscene2Flynn8 -[RED]Flynn[BLACK]: Simple stuff, golden boy!\pCan't have a gym without\na [BLUE]Gym Leader[BLACK]!\pThe Lieutenant has, ah[.]\nimportant military business.\lSo I'm shuttin' things down! +[RED]Flynn[BLACK]: Simple stuff, golden boy!\pCan't have a gym without\na [BLUE]Gym Leader[BLACK]!\pThe Lieutenant has, ah[.][PAUSE][15]\nimportant military business.\lSo I'm shuttin' things down! #org @gText_VermilionCity_RivalCutscene2Rival8 [RED][RIVAL][BLACK]: What gives you the right?!\nThis isn't YOUR gym! @@ -188,13 +188,13 @@ Yes, yes, Lieutenant[.] I understand[.]\nIt's just, a solo operation?\pThey can' [RED]Flynn[BLACK]: Haaa[.]\nYeah, no, bucko. #org @gText_VermilionCity_RivalCutscene2Rival12 -[RED][RIVAL][BLACK]: Grgrr[.]\nNow what are we supposed to do? +[RED][RIVAL][BLACK]: Grgrr[.]\n[PAUSE][20]Now what are we supposed to do? #org @gText_VermilionCity_RivalCutscene2Flynn13 -[RED]Flynn[BLACK]: Hey, you've got plenty\nof gyms you can tackle, smallfry!\pIf you head north, up [GREEN]Route 6[BLACK], you\ncan find the old [GREEN]Underground Path[BLACK].\pIt's a little treacherous, but it\nwon't be a problem for an energetic\lkid like you!\pHatsumi must have set the two of\nyou up with everything, right?\pThen you should have a [BLUE]Town Map[BLACK]\nin your bag! Just follow that.\pYou can access [GREEN]Celadon[BLACK] or [GREEN]Cerulean[BLACK]\nthrough the Path.\lBoth great gyms!\l[GREEN]Erika[BLACK] and [GREEN]Misty[BLACK], brilliant gals!\lLove workin' with 'em!\pAnd hopefully, once you're done,\nI'll have a new Gym Leader here! +[RED]Flynn[BLACK]: Hey, you've got plenty\nof gyms you can tackle, smallfry!\pIf you head north,[PAUSE][12] up [GREEN]Route 6[BLACK],[PAUSE][12] you\ncan find the old [GREEN]Underground Path[BLACK].\pIt's a little treacherous, but it\nwon't be a problem for an energetic\lkid like you!\pHatsumi must have set the two of\nyou up with everything, right?\pThen you should have a [BLUE]Town Map[BLACK]\nin your bag![PAUSE][14] Just follow that.\pYou can access [GREEN]Celadon[BLACK] or [GREEN]Cerulean[BLACK]\nthrough the Path.\lBoth great gyms!\l[GREEN]Erika[BLACK] and [GREEN]Misty[BLACK], brilliant gals!\lLove workin' with 'em!\pAnd hopefully, once you're done,\nI'll have a new Gym Leader here! #org @gText_VermilionCity_RivalCutscene2Rival13 -[RED][RIVAL][BLACK]: Hmmph[.]! Fine!\nHey, [PLAYER]!\lGo to any gym you want[.]\lBut I'M going to [GREEN]Cerulean City[BLACK]!\pI'm gonna prove myself by beating\nthe one and only Misty!\lHa! +[RED][RIVAL][BLACK]: Hmmph[.]! Fine!\n[PAUSE][20]Hey, [PLAYER]!\lGo to any gym you want[.]\lBut I'M going to [GREEN]Cerulean City[BLACK]!\pI'm gonna prove myself by beating\nthe one and only Misty!\lHa! #org @gText_VermilionCity_RivalCutscene2Flynn14 [RED]Flynn[BLACK]: [.]Huh! Quite the character.\nGuess he's a friend of yours?\pWell, hey, good luck, and\nstay gold out there!\pI get the feeling I'll be seeing\nmore of you both. diff --git a/strings/scripts/vermilionport.string b/strings/scripts/vermilionport.string index 77b817944..52200f114 100644 --- a/strings/scripts/vermilionport.string +++ b/strings/scripts/vermilionport.string @@ -26,7 +26,7 @@ Is this TV show ENTIRELY\na tutorial slash commercial?\lFor those watches from [ It's never a problem!\pThe child prodigy and Pok\etch\nDetective Ketch Appy is here!\pI'll use the [BLUE]Stopwatch[BLACK] to time how\nlong it took the suspect to escape!\pOh, no! The [BLUE]Stopwatch[BLACK] app has yet\nto be officially distributed!\pWhat will you do, Pok\etch Detective?\nWhat's next, Pok\etch Detective?\lNext, Case File No.173:\l"The Pok\etch is Exclusive!\"\lDon't miss it! #org @gText_Lodgenet -The hotel's TV has a Nintendo 64\nbuilt in!\p[.]But it wants \$6950 for 60 minutes\nof gameplay[.]\lNot worth it!\l[.] [.] [.] [.] [.]\lBut somehow tantalizing[.] +The hotel's TV has a Nintendo 64\nbuilt in!\p[.]But it wants \$6950 for 60 minutes\nof gameplay[.]\lNot worth it!\l[.] [.] [.] [.] [.]\l[SHRINK]But somehow tantalizing[.] #org @gText_VermilionPortHotel_AlloysRoom A collection of large red bowties\ncan be found inside this dresser.\lThey're meticulously arranged. @@ -74,7 +74,7 @@ Ports are a place of coming and\ngoing.\pI don't have anywhere to go,\nthough.\p Many flyers are posted on the\ntourism board. Read them? #org @gText_VermilionPortTourismBoardText1 -Battle! Trade! Evolve!\pBook a ship to the Warrior's Lodge!\nTrain with hearty, cunning fighters,\ldeep in the frigid midwestern seas!\pThe power coursing through our land\naffects regional evolutions!\pNo need to head to Alola or Galar!\nOur techniques have you covered!\pYou can even evolve your Pok\emon\nthe Hisuian way!\pJust do your training at the lodge\nin [GRAY]Min[.]ne[.] +Battle! Trade! Evolve!\pBook a ship to the Warrior's Lodge!\nTrain with hearty, cunning fighters,\ldeep in the frigid midwestern seas!\pThe power coursing through our land\naffects regional evolutions!\pNo need to head to Alola or Galar!\nOur techniques have you covered!\pYou can even evolve your Pok\emon\nthe Hisuian way!\pJust do your training at the lodge\nin [GRAY]Min[.]n[SHRINK]e[.] #org @gText_VermilionPortTourismBoardText1_TornOffEnd It seems that someone tore the rest\nof the flyer off[.] diff --git a/test.cheats b/test.cheats index ad009db0a..55b2bede8 100644 --- a/test.cheats +++ b/test.cheats @@ -1,4 +1,3 @@ -!disabled !PARv3 # walk through walls 000014D1 000A