diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/cable_car.s | 2 | ||||
| -rw-r--r-- | data/event_script_command_function_table.inc | 94 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/rom4.s | 4 | ||||
| -rw-r--r-- | data/text/tv.inc | 75 | ||||
| -rw-r--r-- | data/tilesets/graphics.inc (renamed from data/tilesets/tileset_graphics.inc) | 0 | ||||
| -rw-r--r-- | data/tilesets/headers.inc (renamed from data/tilesets/tilesets.inc) | 0 |
7 files changed, 127 insertions, 50 deletions
diff --git a/data/cable_car.s b/data/cable_car.s index 23b81cba7..0f3bf3e2e 100644 --- a/data/cable_car.s +++ b/data/cable_car.s @@ -86,7 +86,7 @@ gMtChimneyHikerGraphicsIDs:: @ 85CDBE6 .byte MAP_OBJ_GFX_HIKER .byte MAP_OBJ_GFX_CAMPER .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_ZIGZAGOON @ not used + .byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used .align 1 gMtChimneyHikerCoords:: @ 85CDBEA diff --git a/data/event_script_command_function_table.inc b/data/event_script_command_function_table.inc index 7cd00c37d..bef236c9a 100644 --- a/data/event_script_command_function_table.inc +++ b/data/event_script_command_function_table.inc @@ -67,18 +67,18 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_setdivewarp .4byte ScrCmd_setholewarp .4byte ScrCmd_getplayerxy - .4byte ScrCmd_countpokemon - .4byte ScrCmd_additem - .4byte ScrCmd_removeitem + .4byte ScrCmd_getpartysize + .4byte ScrCmd_giveitem + .4byte ScrCmd_takeitem .4byte ScrCmd_checkitemspace .4byte ScrCmd_checkitem .4byte ScrCmd_checkitemtype - .4byte ScrCmd_addpcitem + .4byte ScrCmd_givepcitem .4byte ScrCmd_checkpcitem - .4byte ScrCmd_adddecor - .4byte ScrCmd_removedecor - .4byte ScrCmd_hasdecor + .4byte ScrCmd_givedecoration + .4byte ScrCmd_takedecoration .4byte ScrCmd_checkdecor + .4byte ScrCmd_checkdecorspace .4byte ScrCmd_applymovement .4byte ScrCmd_applymovement_at .4byte ScrCmd_waitmovement @@ -88,12 +88,12 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_addobject .4byte ScrCmd_addobject_at .4byte ScrCmd_setobjectxy - .4byte ScrCmd_showobject - .4byte ScrCmd_hideobject + .4byte ScrCmd_showobject_at + .4byte ScrCmd_hideobject_at .4byte ScrCmd_faceplayer .4byte ScrCmd_turnobject .4byte ScrCmd_trainerbattle - .4byte ScrCmd_battlebegin + .4byte ScrCmd_dotrainerbattle .4byte ScrCmd_ontrainerbattleend .4byte ScrCmd_ontrainerbattleendgoto .4byte ScrCmd_checktrainerflag @@ -109,7 +109,7 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_lock .4byte ScrCmd_releaseall .4byte ScrCmd_release - .4byte ScrCmd_waitbutton + .4byte ScrCmd_waitbuttonpress .4byte ScrCmd_yesnobox .4byte ScrCmd_multichoice .4byte ScrCmd_multichoicedefault @@ -117,28 +117,28 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_drawbox .4byte ScrCmd_erasebox .4byte ScrCmd_drawboxtext - .4byte ScrCmd_drawpokepic - .4byte ScrCmd_erasepokepic - .4byte ScrCmd_drawcontestwinner + .4byte ScrCmd_showmonpic + .4byte ScrCmd_hidemonpic + .4byte ScrCmd_showcontestwinner .4byte ScrCmd_braillemessage - .4byte ScrCmd_givepoke + .4byte ScrCmd_givemon .4byte ScrCmd_giveegg - .4byte ScrCmd_setpokemove - .4byte ScrCmd_checkpokemove - .4byte ScrCmd_getspeciesname - .4byte ScrCmd_getfirstpartypokename - .4byte ScrCmd_getpartypokename - .4byte ScrCmd_getitemname - .4byte ScrCmd_getdecorname - .4byte ScrCmd_getmovename - .4byte ScrCmd_getnumberstring - .4byte ScrCmd_getstdstring - .4byte ScrCmd_getstring + .4byte ScrCmd_setmonmove + .4byte ScrCmd_checkpartymove + .4byte ScrCmd_bufferspeciesname + .4byte ScrCmd_bufferleadmonspeciesname + .4byte ScrCmd_bufferpartymonnick + .4byte ScrCmd_bufferitemname + .4byte ScrCmd_bufferdecorationname + .4byte ScrCmd_buffermovename + .4byte ScrCmd_buffernumberstring + .4byte ScrCmd_bufferstdstring + .4byte ScrCmd_bufferstring .4byte ScrCmd_pokemart - .4byte ScrCmd_pokemartdecor - .4byte ScrCmd_pokemartbp + .4byte ScrCmd_pokemartdecoration + .4byte ScrCmd_pokemartdecoration2 .4byte ScrCmd_playslotmachine - .4byte ScrCmd_plantberrytree + .4byte ScrCmd_setberrytree .4byte ScrCmd_choosecontestpkmn .4byte ScrCmd_startcontest .4byte ScrCmd_showcontestresults @@ -152,21 +152,21 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_updatemoneybox .4byte ScrCmd_getpricereduction .4byte ScrCmd_fadescreen - .4byte ScrCmd_fadescreendelay - .4byte ScrCmd_setdarklevel - .4byte ScrCmd_animdarklevel + .4byte ScrCmd_fadescreenspeed + .4byte ScrCmd_setflashradius + .4byte ScrCmd_animateflash .4byte ScrCmd_messageautoscroll .4byte ScrCmd_dofieldeffect - .4byte ScrCmd_setfieldeffect + .4byte ScrCmd_setfieldeffectarg .4byte ScrCmd_waitfieldeffect - .4byte ScrCmd_sethealplace + .4byte ScrCmd_setrespawn .4byte ScrCmd_checkplayergender - .4byte ScrCmd_playpokecry - .4byte ScrCmd_setmaptile + .4byte ScrCmd_playmoncry + .4byte ScrCmd_setmetatile .4byte ScrCmd_resetweather .4byte ScrCmd_setweather .4byte ScrCmd_doweather - .4byte ScrCmd_tileeffect + .4byte ScrCmd_setstepcallback .4byte ScrCmd_setmaplayoutindex .4byte ScrCmd_setobjectpriority .4byte ScrCmd_resetobjectpriority @@ -191,26 +191,26 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_vcall_if .4byte ScrCmd_vmessage .4byte ScrCmd_vloadword - .4byte ScrCmd_vgetstring + .4byte ScrCmd_vbufferstring .4byte ScrCmd_showcoinsbox .4byte ScrCmd_hidecoinsbox .4byte ScrCmd_updatecoinsbox .4byte ScrCmd_incrementgamestat .4byte ScrCmd_setescapewarp - .4byte ScrCmd_waitpokecry - .4byte ScrCmd_getboxname + .4byte ScrCmd_waitmoncry + .4byte ScrCmd_bufferboxname .4byte ScrCmd_nop1 .4byte ScrCmd_nop1 .4byte ScrCmd_nop1 .4byte ScrCmd_nop1 .4byte ScrCmd_nop1 .4byte ScrCmd_nop1 - .4byte ScrCmd_setpokeobedient - .4byte ScrCmd_checkpokeobedience + .4byte ScrCmd_setmonobedient + .4byte ScrCmd_checkmonobedience .4byte ScrCmd_cmdCF .4byte ScrCmd_nop1 .4byte ScrCmd_warpD1 - .4byte ScrCmd_setpokemetlocation + .4byte ScrCmd_setmonmetlocation .4byte ScrCmd_mossdeepgym1 .4byte ScrCmd_mossdeepgym2 .4byte ScrCmd_mossdeepgym3 @@ -221,9 +221,9 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_cmdDA .4byte ScrCmd_cmdDB .4byte ScrCmd_fadescreenswapbuffers - .4byte ScrCmd_gettrainerclass - .4byte ScrCmd_gettrainername + .4byte ScrCmd_buffertrainerclassname + .4byte ScrCmd_buffertrainername .4byte ScrCmd_pokenavcall .4byte ScrCmd_warpE0 - .4byte ScrCmd_getcontesttype - .4byte ScrCmd_getitemnameplural + .4byte ScrCmd_buffercontesttype + .4byte ScrCmd_bufferitemnameplural diff --git a/data/event_scripts.s b/data/event_scripts.s index ad1216b91..2383907ee 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,7 @@ .include "asm/macros.inc" + .include "asm/macros/event.inc" .include "constants/constants.inc" + .include "constants/variables.inc" .section script_data, "aw", %progbits diff --git a/data/rom4.s b/data/rom4.s index aa57174d9..15c3459eb 100644 --- a/data/rom4.s +++ b/data/rom4.s @@ -25,13 +25,13 @@ gUnknown_08339E00:: @ 8339E00 .incbin "baserom.gba", 0x339e00, 0x8 @ 8339E08 - .include "data/tilesets/tileset_graphics.inc" + .include "data/tilesets/graphics.inc" @ 83960F0 .include "data/tilesets/metatiles.inc" @ 83DF704 - .include "data/tilesets/tilesets.inc" + .include "data/tilesets/headers.inc" @ 83DFE14 .incbin "baserom.gba", 0x3dfe14, 0xa1fc0 diff --git a/data/text/tv.inc b/data/text/tv.inc index fa2d0ac73..6d461e906 100644 --- a/data/text/tv.inc +++ b/data/text/tv.inc @@ -63,6 +63,7 @@ gTVBravoTrainerText07:: @ 0827F65C gTVBravoTrainerText08:: @ 0827F6E6 .string "Introducing the TRAINER’s {STR_VAR_1}!$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F704:: @ 0827F704 .string "Hello! You’re the TRAINER who just had\n" .string "a battle, right?\p" .string "I’m gathering interviews with TRAINERS\n" @@ -70,6 +71,7 @@ gTVBravoTrainerText08:: @ 0827F6E6 .string "May I get a few words from you about\n" .string "your impressions on battling?$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F7BA:: @ 0827F7BA .string "You will? Really?\n" .string "Thank you!\l" .string "Then, uh…\p" @@ -78,37 +80,44 @@ gTVBravoTrainerText08:: @ 0827F6E6 .string "Were you satisfied with the battle?\n" .string "Or are you unhappy?$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F84C:: @ 0827F84C .string "Oh…\n" .string "Sorry we disturbed you.\p" .string "Please give us an interview the next\n" .string "time you visit the BATTLE TOWER.$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F8AE:: @ 0827F8AE .string "Well, of course!\p" .string "That unmistakable look of satisfaction\n" .string "on your face…\p" .string "It’s obvious that you’ve had a great\n" .string "battle.$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F921:: @ 0827F921 .string "Oh, I see…\p" .string "Well, it certainly is difficult to make a\n" .string "battle turn out exactly as planned.$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F97A:: @ 0827F97A .string "Oh, oh, may I ask one more question?\p" .string "If you were to describe your\n" .string "impressions about this battle with\l" .string "one saying, what would it be?$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F9FD:: @ 0827F9FD .string "Oh, that is stunningly cool!\p" .string "That’s a great line!\n" .string "I hope you’ll do great next time, too.\p" .string "I hope to see you again!$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27FA6F:: @ 0827FA6F .string "Oh, I see…\p" .string "Still, being the silent type is also\n" .string "cool, isn’t it?\p" .string "I hope you’ll give me the opportunity\n" .string "to share your thoughts again!$" +BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27FAF3:: @ 0827FAF3 .string "I’ll be looking forward to your\n" .string "next battle!$" @@ -215,6 +224,7 @@ gTVBravoTrainerBattleTowerText14:: @ 082801E6 .string "That’s all the time we have!\n" .string "Until next time, see you!$" +SlateportCity_PokemonFanClub_Text_280270: @ 08280270 .string "Wow!\p" .string "It’s plain to see that you lavish your\n" .string "love on your {STR_VAR_1}.\p" @@ -225,30 +235,36 @@ gTVBravoTrainerBattleTowerText14:: @ 082801E6 .string "Would you be willing to answer a few\n" .string "simple questions for me?$" +SlateportCity_PokemonFanClub_Text_28034F: @ 0828034F .string "Great! Thank you!\p" .string "Okay, here goes.\n" .string "I just need quick answers, okay?$" +SlateportCity_PokemonFanClub_Text_280393: @ 08280393 .string "When you first met {STR_VAR_1},\n" .string "what did you feel?\p" .string "How would you describe your feelings\n" .string "at the time?$" +SlateportCity_PokemonFanClub_Text_2803EF: @ 082803EF .string "Your {STR_VAR_1} is cared for lovingly.\p" .string "If you were to liken it to something\n" .string "that you like, what would it be?$" +SlateportCity_PokemonFanClub_Text_280454: @ 08280454 .string "This question also relates to your\n" .string "beloved {STR_VAR_1}.\p" .string "What was it about {STR_VAR_1} that\n" .string "attracted you?$" +SlateportCity_PokemonFanClub_Text_2804AC: @ 082804AC .string "Okay, that makes sense.\p" .string "The next question might be a little\n" .string "on the tough side.\p" .string "Here goes…\p" .string "What do POKéMON mean to you?$" +SlateportCity_PokemonFanClub_Text_280523: @ 08280523 .string "I see!\p" .string "Hmhm…\p" .string "Okay!\n" @@ -260,13 +276,16 @@ gTVBravoTrainerBattleTowerText14:: @ 082801E6 .string "Okay, that’s all.\n" .string "Bye-bye!$" +SlateportCity_PokemonFanClub_Text_2805E2: @ 082805E2 .string "Oh, okay…\p" .string "Well, if you get the urge to tell me\n" .string "about POKéMON, I’ll be here!$" +SlateportCity_PokemonFanClub_Text_28062E: @ 0828062E .string "I enjoy this job--you get to learn\n" .string "about POKéMON by doing interviews.$" +SlateportCity_PokemonFanClub_Text_280674: @ 08280674 .string "Hi, you seem to be very close to your\n" .string "{STR_VAR_1}.\p" .string "Do you know what?\n" @@ -276,10 +295,12 @@ gTVBravoTrainerBattleTowerText14:: @ 082801E6 .string "I’m wondering if you’d be willing to tell\n" .string "me a little about your {STR_VAR_1}?$" +SlateportCity_PokemonFanClub_Text_28073B: @ 0828073B .string "Wow, thank you!\p" .string "Okay, then, please tell me anything\n" .string "you’d like about your {STR_VAR_1}.$" +SlateportCity_PokemonFanClub_Text_280789: @ 08280789 .string "Wow…\n" .string "That’s an interesting account.\p" .string "You really are tight with {STR_VAR_1},\n" @@ -413,6 +434,7 @@ gTVFanClubText07:: @ 082810E7 .string "A-whoops, will you look at the time?\n" .string "Time to say good-bye until next time!$" +SlateportCity_OceanicMuseum_1F_Text_2811A0: @ 082811A0 .string "Oh?\n" .string "Do you perhaps like POKéMON?\p" .string "I’m on assignment with the TV network.\p" @@ -421,27 +443,32 @@ gTVFanClubText07:: @ 082810E7 .string "If you don’t mind, could you tell me\n" .string "something about yourself?$" +SlateportCity_OceanicMuseum_1F_Text_28126D: @ 0828126D .string "I’m gathering stories on POKéMON and\n" .string "TRAINERS that occurred recently.\p" .string "If you don’t mind, could you tell me\n" .string "something about yourself?$" +SlateportCity_OceanicMuseum_1F_Text_2812F2: @ 082812F2 .string "Oh, you will?\n" .string "Thank you!\p" .string "Then, please, tell me anything of\n" .string "interest that you experienced recently\l" .string "involving POKéMON.$" +SlateportCity_OceanicMuseum_1F_Text_281367: @ 08281367 .string "Oh, I see…\p" .string "Well, if you do have an interesting\n" .string "story to tell, please let me know.$" +SlateportCity_OceanicMuseum_1F_Text_2813B9: @ 082813B9 .string "Oh, what an uplifting story!\p" .string "I’ll be sure to get your story told\n" .string "on television.\p" .string "It should be aired sometime, I think,\n" .string "so please look forward to it.$" +SlateportCity_OceanicMuseum_1F_Text_28144D: @ 0828144D .string "Hmmm…\n" .string "I’ve got a good story for a TV program.\p" .string "I’d better write it up in a hurry!$" @@ -540,35 +567,44 @@ gTV3CheersForPokeblocksText05:: @ 08281B93 .string "Tune in next time!\n" .string "Our slogan is “3 CHEERS FOR {POKEBLOCK}S!”$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281BCB:: @ 8281BCB .string "Hi, there!\p" .string "I’m a big fan of {STR_VAR_1}.\n" .string "What’s your opinion of {STR_VAR_1}?$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C06:: @ 8281C06 .string "I see, I see. That’s what you think\n" .string "about the TRAINER.$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C3D:: @ 8281C3D .string "Have you completely forgotten\n" .string "about {STR_VAR_1}?$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C65:: @ 8281C65 .string "I’m a big fan of {STR_VAR_1}.\n" .string "What’s your opinion of {STR_VAR_1}?$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C95:: @ 8281C95 .string "How strong would you rate {STR_VAR_1}\n" .string "on a scale of one hundred?$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281CCD:: @ 8281CCD .string "Have you completely forgotten\n" .string "about {STR_VAR_1}?$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281CF5:: @ 8281CF5 .string "Oh, I see!\n" .string "You should meet {STR_VAR_1} sometime.\l" .string "I’m sure you’ll become a fan, too!$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281D40:: @ 8281D40 .string "I see, I see.\p" .string "Thank you!\n" .string "That’s very useful to know.\p" .string "I’ll share this information with other\n" .string "{STR_VAR_1} fans and discuss it.$" +LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281DB4:: @ 8281DB4 .string "There’s going to be a TV special on\n" .string "{STR_VAR_1} very soon.\p" .string "I hope you catch it!$" @@ -2613,19 +2649,25 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26 .string "This concludes this episode of\n" .string "“POKéMON BATTLE UPDATE!”$" +Route111_Text_28AF05: @ 0828AF05 .string "GABBY: Oh! We’ve just spotted a tough-\n" .string "looking TRAINER here of all places!\p" .string "Okay, roll camera!\n" .string "Let’s get this interview.$" +Route111_Text_28AF7D: @ 0828AF7D +Route118_Text_28AF7D: @ 0828AF7D +Route120_Text_28AF7D: @ 0828AF7D .string "GABBY: Oh! You’re {PLAYER}! Hi!\n" .string "Do you remember us from last time?\p" .string "Can you show us how much stronger\n" .string "you’ve become? Okay, cue interview!$" +Route111_Text_28B000: @ 0828B000 .string "GABBY: My eyes didn’t lie!\n" .string "I did discover an astonishing TRAINER!$" +Route111_Text_28B042: @ 0828B042 .string "GABBY: Awesome! Awesome!\n" .string "Who are you?!\p" .string "I knew we were onto something wild\n" @@ -2636,16 +2678,19 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26 .string "So, would you give us a bit of your time\n" .string "for an interview?$" +Route111_Text_28B137: @ 0828B137 .string "GABBY: “{STR_VAR_1}!”\p" .string "Remember? That’s the quote you gave\n" .string "us as the battle clincher last time.\p" .string "I never, ever forget stuff like that!$" +Route111_Text_28B1B3: @ 0828B1B3 .string "The last time we battled, you stomped\n" .string "us before we could brace ourselves…\p" .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" +Route111_Text_28B23D: @ 0828B23D .string "The last time we battled, didn’t you\n" .string "throw a POKé BALL at us?\p" .string "We were shocked! So we told everyone,\n" @@ -2653,25 +2698,30 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26 .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" +Route111_Text_28B2FA: @ 0828B2FA .string "The last time we battled, your item\n" .string "skills cleverly did us in.\p" .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" +Route111_Text_28B379: @ 0828B379 .string "The last time we battled, we managed\n" .string "to look respectable.\p" .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" +Route111_Text_28B3F3: @ 0828B3F3 .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" +Route111_Text_28B433: @ 0828B433 .string "You will?\n" .string "Thank you!\p" .string "Okay, I need you to describe your\n" .string "feelings about our battle, but it\l" .string "has to be short and sweet. Go!$" +Route111_Text_28B4AB: @ 0828B4AB .string "GABBY: Mmm, yeah!\n" .string "That’s the perfect clincher!\p" .string "I get the feeling that this will make\n" @@ -2681,16 +2731,24 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26 .string "Okay!\n" .string "We’ll be seeing you!$" +Route111_Text_28B577: @ 0828B577 .string "GABBY: Oh…\p" .string "Okay, but don’t give up!\n" .string "We’ll be keeping an eye out for you!$" +Route111_Text_28B5C0: @ 0828B5C0 +Route118_Text_28B5C0: @ 0828B5C0 +Route120_Text_28B5C0: @ 0828B5C0 .string "GABBY: We’ll be keeping an eye out\n" .string "for you!$" +Route111_Text_28B5EC: @ 0828B5EC +Route118_Text_28B5EC: @ 0828B5EC +Route120_Text_28B5EC: @ 0828B5EC .string "GABBY: Is there a strong TRAINER\n" .string "anywhere with a lot of POKéMON?$" +Route111_Text_28B62D: @ 0828B62D .string "GABBY: Wow, you are something!\p" .string "You’ve gotten a lot stronger--a lot--\n" .string "since we last battled.\p" @@ -2700,29 +2758,46 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26 .string "Are you willing to give us an interview\l" .string "this time?$" +Route111_Text_28B719: @ 0828B719 +Route118_Text_28B719: @ 0828B719 +Route120_Text_28B719: @ 0828B719 .string "GABBY: That was an intense battle!\n" .string "Did you get all that on camera?$" +Route111_Text_28B75C: @ 0828B75C .string "TY: Hey, lookie here! A tough-looking\n" .string "TRAINER here, of all places!\l" .string "Camera’s rolling!$" +Route111_Text_28B7B1: @ 0828B7B1 +Route118_Text_28B7B1: @ 0828B7B1 +Route120_Text_28B7B1: @ 0828B7B1 .string "TY: Hey, lookie here!\n" .string "I remember you!\p" .string "I’ll get this battle all on this\n" .string "here camera!$" +Route111_Text_28B805: @ 0828B805 +Route118_Text_28B805: @ 0828B805 +Route120_Text_28B805: @ 0828B805 .string "TY: You’re a natural!\n" .string "Got me some prime footage right here!$" +Route111_Text_28B841: @ 0828B841 +Route118_Text_28B841: @ 0828B841 +Route120_Text_28B841: @ 0828B841 .string "TY: Do you only have the one POKéMON\n" .string "and that’s it?\p" .string "If you had more POKéMON, it’d make for\n" .string "better footage, but…$" +Route111_Text_28B8B1: @ 0828B8B1 .string "TY: Yep, we sure spotted a hot TRAINER.\n" .string "This is a huge scoop for us!$" +Route111_Text_28B8F6: @ 0828B8F6 +Route118_Text_28B8F6: @ 0828B8F6 +Route120_Text_28B8F6: @ 0828B8F6 .string "TY: Yep, I got it all.\n" .string "That whole battle’s on camera.$" diff --git a/data/tilesets/tileset_graphics.inc b/data/tilesets/graphics.inc index 2d1ddb1f9..2d1ddb1f9 100644 --- a/data/tilesets/tileset_graphics.inc +++ b/data/tilesets/graphics.inc diff --git a/data/tilesets/tilesets.inc b/data/tilesets/headers.inc index a342dc973..a342dc973 100644 --- a/data/tilesets/tilesets.inc +++ b/data/tilesets/headers.inc |