From 6f95d680751ee2bce12db528ddabf6e2b2a62c75 Mon Sep 17 00:00:00 2001 From: earthoul Date: Thu, 11 Sep 2025 18:54:52 +0900 Subject: [PATCH] Update labels --- src/constants/ow_object_constants.asm | 66 ++++++++-------- src/engine/bank03.asm | 106 +++++++++++++------------- src/engine/bank4c.asm | 66 ++++++++-------- src/text/text6.asm | 16 ++-- src/text/text_offsets.asm | 17 ++--- 5 files changed, 135 insertions(+), 136 deletions(-) diff --git a/src/constants/ow_object_constants.asm b/src/constants/ow_object_constants.asm index 5aec694..251109c 100644 --- a/src/constants/ow_object_constants.asm +++ b/src/constants/ow_object_constants.asm @@ -5,42 +5,42 @@ const OW_RONALD ; $03 const OW_ISHIHARA ; $04 const OW_IMAKUNI_BLACK ; $05 - const OW_TECH_1 ; $06 - const OW_TECH_2 ; $07 + const OW_SAM ; $06 + const OW_AARON ; $07 const OW_PAPPY_1 ; $08 const OW_GENE ; $09 - const OW_MANIA_1 ; $0a - const OW_YOUNGSTER_1 ; $0b - const OW_MAN_1 ; $0c + const OW_MATTHEW ; $0a + const OW_RYAN ; $0b + const OW_ANDREW ; $0c const OW_MITCH ; $0d - const OW_MANIA_2 ; $0e - const OW_MANIA_3 ; $0f - const OW_LASS3_1 ; $10 + const OW_MICHAEL ; $0e + const OW_CHRIS ; $0f + const OW_JESSICA ; $10 const OW_NIKKI ; $11 - const OW_GIRL_1 ; $12 - const OW_LASS2_1 ; $13 - const OW_LASS1_1 ; $14 + const OW_BRITTANY ; $12 + const OW_KRISTIN ; $13 + const OW_HEATHER ; $14 const OW_RICK ; $15 - const OW_TECH_3 ; $16 - const OW_TECH_4 ; $17 - const OW_TECH_5 ; $18 + const OW_DAVID ; $16 + const OW_JOSEPH ; $17 + const OW_ERIK ; $18 const OW_AMY ; $19 const OW_AMY_LOUNGE ; $1a - const OW_JOSHUA_1 ; $1b + const OW_JOSHUA ; $1b const OW_SARA ; $1c const OW_AMANDA ; $1d const OW_KEN ; $1e - const OW_LAD_1 ; $1f - const OW_SPECS_1 ; $20 - const OW_YOUNGSTER_2 ; $21 + const OW_JOHN ; $1f + const OW_ADAM ; $20 + const OW_JONATHAN ; $21 const OW_ISAAC ; $22 - const OW_GIRL_2 ; $23 - const OW_HOOD_1 ; $24 - const OW_HOOD_2 ; $25 + const OW_JENNIFER ; $23 + const OW_NICHOLAS ; $24 + const OW_BRANDON ; $25 const OW_MURRAY ; $26 - const OW_YOUNGSTER_3 ; $27 - const OW_LAD2 ; $28 - const OW_GIRL3 ; $29 + const OW_ROBERT ; $27 + const OW_DANIEL ; $28 + const OW_STEPHANIE ; $29 const OW_COURTNEY ; $2a const OW_STEVE ; $2b const OW_JACK ; $2c @@ -51,23 +51,23 @@ const OW_GR_4 ; $31 const OW_GR_5 ; $32 const OW_GR_LAD_1 ; $33 - const OW_MIDORI_1 ; $34 - const OW_MORINO_1 ; $35 - const OW_MIDORI_2 ; $36 - const OW_MORINO_2 ; $37 + const OW_MIDORI ; $34 + const OW_YUTA ; $35 + const OW_MIYUKI ; $36 + const OW_MORINO ; $37 const OW_GR_LASS_1 ; $38 const OW_RENNA ; $39 const OW_ICHIKAWA ; $3a const OW_CATHERINE ; $3b const OW_GR_GRANNY_1 ; $3c - const OW_MIYAJIMA_1 ; $3d + const OW_MIYAJIMA_ALT ; $3d const OW_JES ; $3e const OW_YUKI ; $3f const OW_SHOKO ; $40 const OW_HIDERO ; $41 const OW_SPECS_2 ; $42 - const OW_MIYAJIMA_2 ; $43 - const OW_JOSHUA_2 ; $44 + const OW_MIYAJIMA ; $43 + const OW_SENTA ; $44 const OW_AIRA ; $45 const OW_KANOKO ; $46 const OW_GODA ; $47 @@ -157,7 +157,7 @@ const OW_GR_CLERK_8 ; $9b const OW_GR_WOMAN_1 ; $9c const OW_BUTCH_1 ; $9d - const OW_CHAP_4 ; $9e + const OW_TAP ; $9e const OW_GR_CLERK_9 ; $9f const OW_YOUNGSTER_4 ; $a0 const OW_GR_CLERK_10 ; $a1 @@ -175,7 +175,7 @@ const OW_CAPTURED_SARA ; $ad const OW_CAPTURED_AMANDA ; $ae const OW_WARP_SPARKLES ; $af - const OW_LASS2_6 ; $b0 + const OW_YUI ; $b0 const OW_IMAKUNI_RED ; $b1 const OW_BUTCH_2 ; $b2 const OW_TECH_9 ; $b3 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index d69573a..e19b4c7 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -789,21 +789,21 @@ MACRO npcdata ENDM .sam - npcdata OW_TECH_1, DialogSamText, 0, 0, UNUSED_SAMS_PRACTICE_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_SAM, DialogSamText, 0, 0, UNUSED_SAMS_PRACTICE_DECK_ID, $ff, $ff, $ff, $ff .aaron - npcdata OW_TECH_2, DialogAaronText, 0, DialogTechText, AARONS_STEP1_DECK_ID, AARONS_STEP2_DECK_ID, AARONS_STEP3_DECK_ID, BRICK_WALK_DECK_ID, BENCH_TRAP_DECK_ID + npcdata OW_AARON, DialogAaronText, 0, DialogTechText, AARONS_STEP1_DECK_ID, AARONS_STEP2_DECK_ID, AARONS_STEP3_DECK_ID, BRICK_WALK_DECK_ID, BENCH_TRAP_DECK_ID .nikki npcdata OW_NIKKI, DialogNikkiText, GrassClubShortText, OpponentGrassClubMasterBracketedText, MAX_ENERGY_DECK_ID, $ff, $ff, $ff, $ff .brittany - npcdata OW_GIRL_1, DialogBrittanyText, GrassClubShortText, OpponentGrassClubMemberBracketedText, REMAINING_GREEN_DECK_ID, POISON_CURSE_DECK_ID, $ff, $ff, $ff + npcdata OW_BRITTANY, DialogBrittanyText, GrassClubShortText, OpponentGrassClubMemberBracketedText, REMAINING_GREEN_DECK_ID, POISON_CURSE_DECK_ID, $ff, $ff, $ff .kristin - npcdata OW_LASS2_1, DialogKristinText, GrassClubShortText, OpponentGrassClubMemberBracketedText, GLITTERING_SCALES_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_KRISTIN, DialogKristinText, GrassClubShortText, OpponentGrassClubMemberBracketedText, GLITTERING_SCALES_DECK_ID, $ff, $ff, $ff, $ff .heather - npcdata OW_LASS1_1, DialogHeatherText, GrassClubShortText, OpponentGrassClubMemberBracketedText, STEADY_INCREASE_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_HEATHER, DialogHeatherText, GrassClubShortText, OpponentGrassClubMemberBracketedText, STEADY_INCREASE_DECK_ID, $ff, $ff, $ff, $ff .amy npcdata OW_AMY_LOUNGE, DialogAmyText, WaterClubShortText, OpponentWaterClubMasterBracketedText, RAIN_DANCE_CONFUSION_DECK_ID, $ff, $ff, $ff, $ff .joshua - npcdata OW_JOSHUA_1, DialogJoshuaText, WaterClubShortText, OpponentWaterClubMemberBracketedText, CONSERVING_WATER_DECK_ID, ENERGY_REMOVAL_DECK_ID, $ff, $ff, $ff + npcdata OW_JOSHUA, DialogJoshuaText, WaterClubShortText, OpponentWaterClubMemberBracketedText, CONSERVING_WATER_DECK_ID, ENERGY_REMOVAL_DECK_ID, $ff, $ff, $ff .sara npcdata OW_SARA, DialogSaraText, WaterClubShortText, OpponentWaterClubMemberBracketedText, SPLASHING_ABOUT_DECK_ID, $ff, $ff, $ff, $ff .amanda @@ -811,51 +811,51 @@ ENDM .gene npcdata OW_GENE, DialogGeneText, RockClubShortText, OpponentRockClubMasterBracketedText, EVEN3_YEARS_ON_A_ROCK_DECK_ID, $ff, $ff, $ff, $ff .matthew - npcdata OW_MANIA_1, DialogMatthewText, RockClubShortText, OpponentRockClubMemberBracketedText, ROLLING_STONE_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_MATTHEW, DialogMatthewText, RockClubShortText, OpponentRockClubMemberBracketedText, ROLLING_STONE_DECK_ID, $ff, $ff, $ff, $ff .ryan - npcdata OW_YOUNGSTER_1, DialogRyanText, RockClubShortText, OpponentRockClubMemberBracketedText, GREAT_EARTHQUAKE_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_RYAN, DialogRyanText, RockClubShortText, OpponentRockClubMemberBracketedText, GREAT_EARTHQUAKE_DECK_ID, $ff, $ff, $ff, $ff .andrew - npcdata OW_MAN_1, DialogAndrewText, RockClubShortText, OpponentRockClubMemberBracketedText, AWESOME_FOSSIL_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_ANDREW, DialogAndrewText, RockClubShortText, OpponentRockClubMemberBracketedText, AWESOME_FOSSIL_DECK_ID, $ff, $ff, $ff, $ff .mitch npcdata OW_MITCH, DialogMitchText, FightingClubShortText, OpponentFightingClubMasterBracketedText, RAGING_BILLOW_OF_FISTS_DECK_ID, $ff, $ff, $ff, $ff .michael - npcdata OW_MANIA_2, DialogMichaelText, FightingClubShortText, OpponentFightingClubMemberBracketedText, YOU_CAN_DO_IT_MACHOP_DECK_ID, NEW_MACHOKE_DECK_ID, $ff, $ff, $ff + npcdata OW_MICHAEL, DialogMichaelText, FightingClubShortText, OpponentFightingClubMemberBracketedText, YOU_CAN_DO_IT_MACHOP_DECK_ID, NEW_MACHOKE_DECK_ID, $ff, $ff, $ff .chris - npcdata OW_MANIA_3, DialogChrisText, FightingClubShortText, OpponentFightingClubMemberBracketedText, SKILLED_WARRIOR_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_CHRIS, DialogChrisText, FightingClubShortText, OpponentFightingClubMemberBracketedText, SKILLED_WARRIOR_DECK_ID, $ff, $ff, $ff, $ff .jessica - npcdata OW_LASS3_1, DialogJessicaText, FightingClubShortText, OpponentFightingClubMemberBracketedText, I_LOVE_TO_FIGHT_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_JESSICA, DialogJessicaText, FightingClubShortText, OpponentFightingClubMemberBracketedText, I_LOVE_TO_FIGHT_DECK_ID, $ff, $ff, $ff, $ff .rick npcdata OW_RICK, DialogRickText, ScienceClubShortText, OpponentScienceClubMasterBracketedText, DARK_SCIENCE_DECK_ID, $ff, $ff, $ff, $ff .david - npcdata OW_TECH_3, DialogDavidText, ScienceClubShortText, OpponentScienceClubMemberBracketedText, NATURAL_SCIENCE_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_DAVID, DialogDavidText, ScienceClubShortText, OpponentScienceClubMemberBracketedText, NATURAL_SCIENCE_DECK_ID, $ff, $ff, $ff, $ff .joseph - npcdata OW_TECH_4, DialogJosephText, ScienceClubShortText, OpponentScienceClubMemberBracketedText, POISONOUS_SWAMP_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_JOSEPH, DialogJosephText, ScienceClubShortText, OpponentScienceClubMemberBracketedText, POISONOUS_SWAMP_DECK_ID, $ff, $ff, $ff, $ff .erik - npcdata OW_TECH_5, DialogErikText, ScienceClubShortText, OpponentScienceClubMemberBracketedText, GATHERING_NIDORAN_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_ERIK, DialogErikText, ScienceClubShortText, OpponentScienceClubMemberBracketedText, GATHERING_NIDORAN_DECK_ID, $ff, $ff, $ff, $ff .ken npcdata OW_KEN, DialogKenText, FireClubShortText, OpponentFireClubMasterBracketedText, GO_ARCANINE_DECK_ID, $ff, $ff, $ff, $ff .john - npcdata OW_LAD_1, DialogJohnText, FireClubShortText, OpponentFireClubMemberBracketedText, FLAME_FESTIVAL_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_JOHN, DialogJohnText, FireClubShortText, OpponentFireClubMemberBracketedText, FLAME_FESTIVAL_DECK_ID, $ff, $ff, $ff, $ff .adam - npcdata OW_SPECS_1, DialogAdamText, FireClubShortText, OpponentFireClubMemberBracketedText, ELECTRIC_CURRENT_SHOCK_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_ADAM, DialogAdamText, FireClubShortText, OpponentFireClubMemberBracketedText, ELECTRIC_CURRENT_SHOCK_DECK_ID, $ff, $ff, $ff, $ff .jonathan - npcdata OW_YOUNGSTER_2, DialogJonathanText, FireClubShortText, OpponentFireClubMemberBracketedText, IMMORTAL_FLAME_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_JONATHAN, DialogJonathanText, FireClubShortText, OpponentFireClubMemberBracketedText, IMMORTAL_FLAME_DECK_ID, $ff, $ff, $ff, $ff .isaac npcdata OW_ISAAC, DialogIsaacText, LightningClubShortText, OpponentLightningClubMasterBracketedText, SKY_SPARK_DECK_ID, ELECTRIC_SELFDESTRUCT_DECK_ID, $ff, $ff, $ff .jennifer - npcdata OW_GIRL_2, DialogJenniferText, LightningClubShortText, OpponentLightningClubMemberBracketedText, I_LOVE_PIKACHU_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_JENNIFER, DialogJenniferText, LightningClubShortText, OpponentLightningClubMemberBracketedText, I_LOVE_PIKACHU_DECK_ID, $ff, $ff, $ff, $ff .nicholas - npcdata OW_HOOD_1, DialogNicholasText, LightningClubShortText, OpponentLightningClubMemberBracketedText, OVERFLOW_DECK_ID, TRIPLE_ZAPDOS_DECK_ID, $ff, $ff, $ff + npcdata OW_NICHOLAS, DialogNicholasText, LightningClubShortText, OpponentLightningClubMemberBracketedText, OVERFLOW_DECK_ID, TRIPLE_ZAPDOS_DECK_ID, $ff, $ff, $ff .brandon - npcdata OW_HOOD_2, DialogBrandonText, LightningClubShortText, OpponentLightningClubMemberBracketedText, TEN_THOUSAND_VOLTS_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_BRANDON, DialogBrandonText, LightningClubShortText, OpponentLightningClubMemberBracketedText, TEN_THOUSAND_VOLTS_DECK_ID, $ff, $ff, $ff, $ff .murray npcdata OW_MURRAY, DialogMurrayText, PsychicClubShortText, OpponentPsychicClubMasterBracketedText, HAND_OVER_GR_DECK_ID, PSYCHIC_ELITE_DECK_ID, $ff, $ff, $ff .robert - npcdata OW_YOUNGSTER_3, DialogRobertText, PsychicClubShortText, OpponentPsychicClubMemberBracketedText, PHANTOM_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_ROBERT, DialogRobertText, PsychicClubShortText, OpponentPsychicClubMemberBracketedText, PHANTOM_DECK_ID, $ff, $ff, $ff, $ff .daniel - npcdata OW_LAD2, DialogDanielText, PsychicClubShortText, OpponentPsychicClubMemberBracketedText, PUPPET_MASTER_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_DANIEL, DialogDanielText, PsychicClubShortText, OpponentPsychicClubMemberBracketedText, PUPPET_MASTER_DECK_ID, $ff, $ff, $ff, $ff .stephanie - npcdata OW_GIRL3, DialogStephanieText, PsychicClubShortText, OpponentPsychicClubMemberBracketedText, PSYCHOKINESIS_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_STEPHANIE, DialogStephanieText, PsychicClubShortText, OpponentPsychicClubMemberBracketedText, PSYCHOKINESIS_DECK_ID, $ff, $ff, $ff, $ff .rod npcdata OW_ROD, DialogRodText, 0, OpponentGrandMasterText, GREAT_DRAGON_DECK_ID, $ff, $ff, $ff, $ff .jack @@ -865,57 +865,57 @@ ENDM .courtney npcdata OW_COURTNEY, DialogCourtneyText, 0, OpponentGrandMasterText, GRAND_FIRE_DECK_ID, $ff, $ff, $ff, $ff .morino - npcdata OW_MORINO_2, DialogMorinoText, GrassKanjiText, OpponentGRGrassFortLeaderText, MAD_PETALS_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_MORINO, DialogMorinoText, GRGrassFortShortText, OpponentGRGrassFortLeaderText, MAD_PETALS_DECK_ID, $ff, $ff, $ff, $ff .miyuki - npcdata OW_MIDORI_2, DialogMiyukiText, GrassKanjiText, OpponentGRGrassFortMemberText, STICKY_POISON_GAS_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_MIYUKI, DialogMiyukiText, GRGrassFortShortText, OpponentGRGrassFortMemberText, STICKY_POISON_GAS_DECK_ID, $ff, $ff, $ff, $ff .yuta - npcdata OW_MORINO_1, DialogYutaText, GrassKanjiText, OpponentGRGrassFortMemberText, DEMONIC_FOREST_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_YUTA, DialogYutaText, GRGrassFortShortText, OpponentGRGrassFortMemberText, DEMONIC_FOREST_DECK_ID, $ff, $ff, $ff, $ff .midori - npcdata OW_MIDORI_1, DialogMidoriText, GrassKanjiText, OpponentGRGrassFortMemberText, BUG_COLLECTING_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_MIDORI, DialogMidoriText, GRGrassFortShortText, OpponentGRGrassFortMemberText, BUG_COLLECTING_DECK_ID, $ff, $ff, $ff, $ff .catherine - npcdata OW_CATHERINE, DialogCatherineText, LightningKanjiText, OpponentGRLightningFortLeaderText, QUICK_ATTACK_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_CATHERINE, DialogCatherineText, GRLightningFortShortText, OpponentGRLightningFortLeaderText, QUICK_ATTACK_DECK_ID, $ff, $ff, $ff, $ff .ichikawa - npcdata OW_ICHIKAWA, DialogIchikawaText, LightningKanjiText, OpponentGRLightningFortMemberText, THIS_IS_THE_POWER_OF_ELECTRICITY_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_ICHIKAWA, DialogIchikawaText, GRLightningFortShortText, OpponentGRLightningFortMemberText, THIS_IS_THE_POWER_OF_ELECTRICITY_DECK_ID, $ff, $ff, $ff, $ff .renna - npcdata OW_RENNA, DialogRennaText, LightningKanjiText, OpponentGRLightningFortMemberText, CHAIN_LIGHTNING_BY_PIKACHU_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_RENNA, DialogRennaText, GRLightningFortShortText, OpponentGRLightningFortMemberText, CHAIN_LIGHTNING_BY_PIKACHU_DECK_ID, $ff, $ff, $ff, $ff .hidero - npcdata OW_HIDERO, DialogHideroText, FireKanjiText, OpponentGRFireFortLeaderText, GAZE_UPON_THE_POWER_OF_FIRE_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_HIDERO, DialogHideroText, GRFireFortShortText, OpponentGRFireFortLeaderText, GAZE_UPON_THE_POWER_OF_FIRE_DECK_ID, $ff, $ff, $ff, $ff .shoko - npcdata OW_SHOKO, DialogShokoText, FireKanjiText, OpponentGRFireFortMemberText, EEVEE_SHOWDOWN_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_SHOKO, DialogShokoText, GRFireFortShortText, OpponentGRFireFortMemberText, EEVEE_SHOWDOWN_DECK_ID, $ff, $ff, $ff, $ff .yuki - npcdata OW_YUKI, DialogYukiText, FireKanjiText, OpponentGRFireFortMemberText, FIREBALL_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_YUKI, DialogYukiText, GRFireFortShortText, OpponentGRFireFortMemberText, FIREBALL_DECK_ID, $ff, $ff, $ff, $ff .jes - npcdata OW_JES, DialogJesText, FireKanjiText, OpponentGRFireFortMemberText, COMPLETE_COMBUSTION_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_JES, DialogJesText, GRFireFortShortText, OpponentGRFireFortMemberText, COMPLETE_COMBUSTION_DECK_ID, $ff, $ff, $ff, $ff .kanoko - npcdata OW_KANOKO, DialogKanokoText, WaterKanjiText, OpponentGRWaterFortLeaderText, WATER_STREAM_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_KANOKO, DialogKanokoText, GRWaterFortShortText, OpponentGRWaterFortLeaderText, WATER_STREAM_DECK_ID, $ff, $ff, $ff, $ff .aira - npcdata OW_AIRA, DialogAiraText, WaterKanjiText, OpponentGRWaterFortMemberText, BENCH_CALL_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_AIRA, DialogAiraText, GRWaterFortShortText, OpponentGRWaterFortMemberText, BENCH_CALL_DECK_ID, $ff, $ff, $ff, $ff .senta - npcdata OW_JOSHUA_2, DialogSentaText, WaterKanjiText, OpponentGRWaterFortMemberText, PARALYZED_PARALYZED_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_SENTA, DialogSentaText, GRWaterFortShortText, OpponentGRWaterFortMemberText, PARALYZED_PARALYZED_DECK_ID, $ff, $ff, $ff, $ff .miyajima - npcdata OW_MIYAJIMA_2, DialogMiyajimaText, WaterKanjiText, OpponentGRWaterFortMemberText, WHIRLPOOL_SHOWER_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_MIYAJIMA, DialogMiyajimaText, GRWaterFortShortText, OpponentGRWaterFortMemberText, WHIRLPOOL_SHOWER_DECK_ID, $ff, $ff, $ff, $ff .kamiya - npcdata OW_KAMIYA, DialogKamiyaText, FightingKanjiText, OpponentGRFightingFortLeaderText, RUNNING_WILD_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_KAMIYA, DialogKamiyaText, GRFightingFortShortText, OpponentGRFightingFortLeaderText, RUNNING_WILD_DECK_ID, $ff, $ff, $ff, $ff .grace - npcdata OW_GRACE, DialogGraceText, FightingKanjiText, OpponentGRFightingFortMemberText, FULL_STRENGTH_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_GRACE, DialogGraceText, GRFightingFortShortText, OpponentGRFightingFortMemberText, FULL_STRENGTH_DECK_ID, $ff, $ff, $ff, $ff .gota - npcdata OW_GODA, DialogGotaText, FightingKanjiText, OpponentGRFightingFortMemberText, ROCK_BLAST_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_GODA, DialogGotaText, GRFightingFortShortText, OpponentGRFightingFortMemberText, ROCK_BLAST_DECK_ID, $ff, $ff, $ff, $ff .mami - npcdata OW_MAMI, DialogMamiText, PsychicKanjiText, OpponentGRPsychicStrongholdLeaderText, SPIRITED_AWAY_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_MAMI, DialogMamiText, GRPsychicStrongholdShortText, OpponentGRPsychicStrongholdLeaderText, SPIRITED_AWAY_DECK_ID, $ff, $ff, $ff, $ff .ryoko - npcdata OW_RYOKO, DialogRyokoText, PsychicKanjiText, OpponentGRPsychicStrongholdMemberText, POKEMON_POWER_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_RYOKO, DialogRyokoText, GRPsychicStrongholdShortText, OpponentGRPsychicStrongholdMemberText, POKEMON_POWER_DECK_ID, $ff, $ff, $ff, $ff .yosuke - npcdata OW_YOSUKE, DialogYosukeText, PsychicKanjiText, OpponentGRPsychicStrongholdMemberText, BAD_DREAM_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_YOSUKE, DialogYosukeText, GRPsychicStrongholdShortText, OpponentGRPsychicStrongholdMemberText, BAD_DREAM_DECK_ID, $ff, $ff, $ff, $ff .kevin - npcdata OW_KEVIN, DialogKevinText, PsychicKanjiText, OpponentGRPsychicStrongholdMemberText, SUPERDESTRUCTIVE_POWER_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_KEVIN, DialogKevinText, GRPsychicStrongholdShortText, OpponentGRPsychicStrongholdMemberText, SUPERDESTRUCTIVE_POWER_DECK_ID, $ff, $ff, $ff, $ff .miwa - npcdata OW_MIWA, DialogMiwaText, PsychicKanjiText, OpponentGRPsychicStrongholdMemberText, DIRECT_HIT_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_MIWA, DialogMiwaText, GRPsychicStrongholdShortText, OpponentGRPsychicStrongholdMemberText, DIRECT_HIT_DECK_ID, $ff, $ff, $ff, $ff .samejima - npcdata OW_SAMEJIMA, DialogSamejimaText, ColorlessKanjiText, OpponentColorlessAltarGuardianText, SUDDEN_GROWTH_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_SAMEJIMA, DialogSamejimaText, ColorlessAltarShortText, OpponentColorlessAltarGuardianText, SUDDEN_GROWTH_DECK_ID, $ff, $ff, $ff, $ff .ishii - npcdata OW_ISHII, DialogIshiiText, ColorlessKanjiText, OpponentColorlessAltarGuardianText, EYE_OF_THE_STORM_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_ISHII, DialogIshiiText, ColorlessAltarShortText, OpponentColorlessAltarGuardianText, EYE_OF_THE_STORM_DECK_ID, $ff, $ff, $ff, $ff .nishijima - npcdata OW_NISHIJIMA, DialogNishijimaText, ColorlessKanjiText, OpponentColorlessAltarGuardianText, SNORLAX_GUARD_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_NISHIJIMA, DialogNishijimaText, ColorlessAltarShortText, OpponentColorlessAltarGuardianText, SNORLAX_GUARD_DECK_ID, $ff, $ff, $ff, $ff .biruritchi npcdata OW_BIRURITCHI, DialogBiruritchiText, 0, OpponentGRKingText, STOP_LIFE_DECK_ID, SCORCHER_DECK_ID, TSUNAMI_STARTER_DECK_ID, SMASH_TO_MINCEMEAT_DECK_ID, $ff .rui @@ -931,7 +931,7 @@ ENDM .ishihara npcdata OW_ISHIHARA, DialogMrIshiharaText, 0, 0, VERY_RARE_CARD_DECK_ID, $ff, $ff, $ff, $ff .tap - npcdata OW_CHAP_4, DialogTapText, 0, 0, DANGEROUS_BENCH_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_TAP, DialogTapText, 0, 0, DANGEROUS_BENCH_DECK_ID, $ff, $ff, $ff, $ff .queen npcdata OW_QUEEN, DialogQueenText, 0, 0, POWERFUL_POKEMON_DECK_ID, $ff, $ff, $ff, $ff .rook @@ -949,11 +949,11 @@ ENDM .magician npcdata OW_MAGICIAN, DialogMagicianText, 0, 0, IMMORTAL_POKEMON_DECK_ID, $ff, $ff, $ff, $ff .yui - npcdata OW_LASS2_6, DialogYuiText, 0, 0, TORRENTIAL_FLOOD_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_YUI, DialogYuiText, 0, 0, TORRENTIAL_FLOOD_DECK_ID, $ff, $ff, $ff, $ff .toshiron npcdata OW_TOSHIRON, DialogToshironText, 0, 0, TRAINER_IMPRISON_DECK_ID, $ff, $ff, $ff, $ff .pierrot - npcdata OW_PIERROT, DialogPierroText, 0, 0, BLAZING_FLAME_DECK_ID, $ff, $ff, $ff, $ff + npcdata OW_PIERROT, DialogPierrotText, 0, 0, BLAZING_FLAME_DECK_ID, $ff, $ff, $ff, $ff .anna npcdata OW_ANNA, DialogAnnaText, 0, 0, DAMAGE_CHAOS_DECK_ID, $ff, $ff, $ff, $ff .dee diff --git a/src/engine/bank4c.asm b/src/engine/bank4c.asm index 6a21eec..59b01c0 100644 --- a/src/engine/bank4c.asm +++ b/src/engine/bank4c.asm @@ -76,42 +76,42 @@ Data_13005b:: dw OWSPRITE_RONALD ; OW_RONALD dw OWSPRITE_ISHIHARA ; OW_ISHIHARA dw OWSPRITE_IMAKUNI_BLACK ; OW_IMAKUNI_BLACK - dw OWSPRITE_TECH ; OW_TECH_1 - dw OWSPRITE_TECH ; OW_TECH_2 + dw OWSPRITE_TECH ; OW_SAM + dw OWSPRITE_TECH ; OW_AARON dw OWSPRITE_PAPPY ; OW_PAPPY_1 dw OWSPRITE_GENE ; OW_GENE - dw OWSPRITE_MANIA ; OW_MANIA_1 - dw OWSPRITE_YOUNGSTER ; OW_YOUNGSTER_1 - dw OWSPRITE_MAN ; OW_MAN_1 + dw OWSPRITE_MANIA ; OW_MATTHEW + dw OWSPRITE_YOUNGSTER ; OW_RYAN + dw OWSPRITE_MAN ; OW_ANDREW dw OWSPRITE_MITCH ; OW_MITCH - dw OWSPRITE_MANIA ; OW_MANIA_2 - dw OWSPRITE_MANIA ; OW_MANIA_3 - dw OWSPRITE_LASS3 ; OW_LASS3_1 + dw OWSPRITE_MANIA ; OW_MICHAEL + dw OWSPRITE_MANIA ; OW_CHRIS + dw OWSPRITE_LASS3 ; OW_JESSICA dw OWSPRITE_NIKKI ; OW_NIKKI - dw OWSPRITE_GIRL ; OW_GIRL1 - dw OWSPRITE_LASS2 ; OW_LASS2_1 - dw OWSPRITE_LASS1 ; OW_LASS3_1 + dw OWSPRITE_GIRL ; OW_BRITTANY + dw OWSPRITE_LASS2 ; OW_KRISTIN + dw OWSPRITE_LASS1 ; OW_HEATHER dw OWSPRITE_RICK ; OW_RICK - dw OWSPRITE_TECH ; OW_TECH_3 - dw OWSPRITE_TECH ; OW_TECH_4 - dw OWSPRITE_TECH ; OW_TECH_5 + dw OWSPRITE_TECH ; OW_DAVID + dw OWSPRITE_TECH ; OW_JOSEPH + dw OWSPRITE_TECH ; OW_ERIK dw OWSPRITE_AMY ; OW_AMY dw OWSPRITE_AMY_LOUNGE ; OW_AMY_LOUNGE - dw OWSPRITE_JOSHUA ; OW_JOSHUA_1 + dw OWSPRITE_JOSHUA ; OW_JOSHUA dw OWSPRITE_SARA ; OW_SARA dw OWSPRITE_AMANDA ; OW_AMANDA dw OWSPRITE_KEN ; OW_KEN - dw OWSPRITE_LAD ; OW_LAD_1 - dw OWSPRITE_SPECS ; OW_SPECS_1 - dw OWSPRITE_YOUNGSTER ; OW_YOUNGSTER_2 + dw OWSPRITE_LAD ; OW_JOHN + dw OWSPRITE_SPECS ; OW_ADAM + dw OWSPRITE_YOUNGSTER ; OW_JONATHAN dw OWSPRITE_ISAAC ; OW_ISAAC - dw OWSPRITE_GIRL ; OW_GIRL_2 - dw OWSPRITE_HOOD ; OW_HOOD_1 - dw OWSPRITE_HOOD ; OW_HOOD_2 + dw OWSPRITE_GIRL ; OW_JENNIFER + dw OWSPRITE_HOOD ; OW_NICHOLAS + dw OWSPRITE_HOOD ; OW_BRANDON dw OWSPRITE_MURRAY ; OW_MURRAY - dw OWSPRITE_YOUNGSTER ; OW_YOUNGSTER_3 - dw OWSPRITE_LAD ; OW_LAD_2 - dw OWSPRITE_GIRL ; OW_GIRL_3 + dw OWSPRITE_YOUNGSTER ; OW_ROBERT + dw OWSPRITE_LAD ; OW_DANIEL + dw OWSPRITE_GIRL ; OW_STEPHANIE dw OWSPRITE_COURTNEY ; OW_COURTNEY dw OWSPRITE_STEVE ; OW_STEVE dw OWSPRITE_JACK ; OW_JACK @@ -122,23 +122,23 @@ Data_13005b:: dw OWSPRITE_GR_4 ; OW_GR_4 dw OWSPRITE_GR_5 ; OW_GR_5 dw OWSPRITE_GR_LAD ; OW_GR_LAD_1 - dw OWSPRITE_MIDORI ; OW_MIDORI_1 - dw OWSPRITE_MORINO ; OW_MORINO_1 - dw OWSPRITE_MIDORI ; OW_MIDORI_2 - dw OWSPRITE_MORINO ; OW_MORINO_2 + dw OWSPRITE_MIDORI ; OW_MIDORI + dw OWSPRITE_MORINO ; OW_YUTA + dw OWSPRITE_MIDORI ; OW_MIYUKI + dw OWSPRITE_MORINO ; OW_MORINO dw OWSPRITE_GR_LASS ; OW_GR_LASS_1 dw OWSPRITE_RENNA ; OW_RENNA dw OWSPRITE_ICHIKAWA ; OW_ICHIKAWA dw OWSPRITE_CATHERINE ; OW_CATHERINE dw OWSPRITE_GR_GRANNY ; OW_GR_GRANNY_1 - dw OWSPRITE_MIYAJIMA ; OW_MIYAJIMA_1 + dw OWSPRITE_MIYAJIMA ; OW_MIYAJIMA_ALT dw OWSPRITE_JES ; OW_JES dw OWSPRITE_YUKI ; OW_YUKI dw OWSPRITE_SHOKO ; OW_SHOKO dw OWSPRITE_HIDERO ; OW_HIDERO dw OWSPRITE_SPECS ; OW_SPECS_2 - dw OWSPRITE_MIYAJIMA ; OW_MIYAJIMA_2 - dw OWSPRITE_JOSHUA ; OW_JOSHUA_2 + dw OWSPRITE_MIYAJIMA ; OW_MIYAJIMA + dw OWSPRITE_JOSHUA ; OW_SENTA dw OWSPRITE_AIRA ; OW_AIRA dw OWSPRITE_KANOKO ; OW_KANOKO dw OWSPRITE_GODA ; OW_GODA @@ -228,7 +228,7 @@ Data_13005b:: dw OWSPRITE_GR_CLERK ; OW_GR_CLERK_8 dw OWSPRITE_GR_WOMAN ; OW_GR_WOMAN_1 dw OWSPRITE_BUTCH ; OW_BUTCH_1 - dw OWSPRITE_CHAP ; OW_CHAP_4 + dw OWSPRITE_CHAP ; OW_TAP dw OWSPRITE_GR_CLERK ; OW_GR_CLERK_9 dw OWSPRITE_YOUNGSTER ; OW_YOUNGSTER_4 dw OWSPRITE_GR_CLERK ; OW_GR_CLERK_10 @@ -246,7 +246,7 @@ Data_13005b:: dw OWSPRITE_CAPTURED_SARA ; OW_CAPTURED_SARA dw OWSPRITE_CAPTURED_AMANDA ; OW_CAPTURED_AMANDA dw OWSPRITE_WARP_SPARKLES ; OW_WARP_SPARKLES - dw OWSPRITE_LASS2 ; OW_LASS2_6 + dw OWSPRITE_LASS2 ; OW_YUI dw OWSPRITE_IMAKUNI_RED ; OW_IMAKUNI_RED dw OWSPRITE_BUTCH ; OW_BUTCH_2 dw OWSPRITE_TECH ; OW_TECH_9 diff --git a/src/text/text6.asm b/src/text/text6.asm index 188f71d..bbd24ae 100644 --- a/src/text/text6.asm +++ b/src/text/text6.asm @@ -1166,7 +1166,7 @@ DialogToshironText: textfw "トシロン" done -DialogPierroText: +DialogPierrotText: textfw "ピエロ" done @@ -1514,31 +1514,31 @@ DialogEmceeText: textfw "しかい" done -FireKanjiText: +GRFireFortShortText: textfw "炎" done -WaterKanjiText: +GRWaterFortShortText: textfw "水" done -LightningKanjiText: +GRLightningFortShortText: textfw "雷" done -FightingKanjiText: +GRFightingFortShortText: textfw "闘" done -PsychicKanjiText: +GRPsychicStrongholdShortText: textfw "超" done -GrassKanjiText: +GRGrassFortShortText: textfw "草" done -ColorlessKanjiText: +ColorlessAltarShortText: textfw "無" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index ea7b416..73ee4f3 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -2571,7 +2571,7 @@ TextOffsets:: textpointer DialogEijiText ; 0x0a02 textpointer DialogMagicianText ; 0x0a03 textpointer DialogToshironText ; 0x0a04 - textpointer DialogPierroText ; 0x0a05 + textpointer DialogPierrotText ; 0x0a05 textpointer DialogDeeText ; 0x0a06 textpointer DialogAnnaText ; 0x0a07 textpointer DialogMasqueradeText ; 0x0a08 @@ -2658,13 +2658,13 @@ TextOffsets:: textpointer DialogClerkText ; 0x0a59 textpointer DialogReceptionistText ; 0x0a5a textpointer DialogEmceeText ; 0x0a5b - textpointer FireKanjiText ; 0x0a5c - textpointer WaterKanjiText ; 0x0a5d - textpointer LightningKanjiText ; 0x0a5e - textpointer FightingKanjiText ; 0x0a5f - textpointer PsychicKanjiText ; 0x0a60 - textpointer GrassKanjiText ; 0x0a61 - textpointer ColorlessKanjiText ; 0x0a62 + textpointer GRFireFortShortText ; 0x0a5c + textpointer GRWaterFortShortText ; 0x0a5d + textpointer GRLightningFortShortText ; 0x0a5e + textpointer GRFightingFortShortText ; 0x0a5f + textpointer GRPsychicStrongholdShortText ; 0x0a60 + textpointer GRGrassFortShortText ; 0x0a61 + textpointer ColorlessAltarShortText ; 0x0a62 textpointer RockClubShortText ; 0x0a63 textpointer LightningClubShortText ; 0x0a64 textpointer GrassClubShortText ; 0x0a65 @@ -2673,7 +2673,6 @@ TextOffsets:: textpointer PsychicClubShortText ; 0x0a68 textpointer FireClubShortText ; 0x0a69 textpointer WaterClubShortText ; 0x0a6a - ; Grass/Science and Rock/Fighting are educated guesses, could be wrong textpointer OpponentGrassClubMasterBracketedText ; 0x0a6b textpointer OpponentGrassClubMemberBracketedText ; 0x0a6c textpointer OpponentWaterClubMasterBracketedText ; 0x0a6d